X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_curl_api.c;h=6e96940daf7ad77da0c906f18286d4a0ab9a4623;hb=2d5d8aa343778897c7eedb25464a2cb0a789d748;hp=0669db4d22f6d9379f5f18872f9a288aa64b5879;hpb=c201441545e852d5d2b6d359a772211995350575;p=m6w6%2Fext-http

diff --git a/http_curl_api.c b/http_curl_api.c
index 0669db4..6e96940 100644
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -20,14 +20,10 @@
 #endif
 
 #ifdef PHP_WIN32
-#	define _WINSOCKAPI_
-#	define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 #	include <winsock2.h>
-#	include <sys/types.h>
 #endif
 
 #include <curl/curl.h>
-#include <curl/easy.h>
 
 #include "php.h"
 #include "php_http.h"
@@ -72,8 +68,6 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 		} \
 	}
 
-
-
 #define http_curl_cleanup(ch, clean_curl) \
 	http_curl_freestr(); \
 	http_curl_freebuf(); \
@@ -106,9 +100,9 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 	HTTP_G(curlbuf).size = 0;
 
 #define http_curl_copybuf(data, size) \
-	* size = HTTP_G(curlbuf).used; \
-	* data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
-	memcpy(* data, HTTP_G(curlbuf).data, * size);
+	*size = HTTP_G(curlbuf).used; \
+	*data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
+	memcpy(*data, HTTP_G(curlbuf).data, HTTP_G(curlbuf).used);
 
 #define http_curl_sizebuf(for_size) \
 	{ \
@@ -494,7 +488,7 @@ PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
 	http_curl_startup(ch, clean_curl, URL, options);
 	curl_easy_setopt(ch, CURLOPT_HTTPGET, 1);
 	http_curl_perform(ch, clean_curl);
-	
+
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}