X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_curl_api.c;h=b117d36388169457c5775db8e66484ae5619be43;hp=b40b7218fb5cb1bc1f4d9e67833dee24995f3003;hb=7038c951485d1b2afa79c9a84b8dcdcb57c9bc54;hpb=b6f1f30011e3834d4dc1ba8c93a2ece696bd6cbd

diff --git a/http_curl_api.c b/http_curl_api.c
index b40b721..b117d36 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"
@@ -49,6 +45,10 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 #	define http_curl_reset(ch)
 #endif
 
+#if LIBCURL_VERSION_NUM < 0x070c00
+#	define curl_easy_strerror(code) "unkown error"
+#endif
+
 #define http_curl_startup(ch, clean_curl, URL, options) \
 	if (!ch) { \
 		if (!(ch = curl_easy_init())) { \
@@ -62,6 +62,15 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 	http_curl_initbuf(); \
 	http_curl_setopts(ch, URL, options);
 
+#define http_curl_perform(ch, clean_curl) \
+	{ \
+		CURLcode result; \
+		if (CURLE_OK != (result = curl_easy_perform(ch))) { \
+			http_curl_cleanup(ch, clean_curl); \
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request: %s", curl_easy_strerror(result)); \
+			return FAILURE; \
+		} \
+	}
 
 #define http_curl_cleanup(ch, clean_curl) \
 	http_curl_freestr(); \
@@ -74,11 +83,15 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 #define http_curl_freestr() \
 	zend_llist_clean(&HTTP_G(to_free))
 
-#define http_curl_initbuf() http_curl_initbuf_ex(0)
+#define http_curl_initbuf() \
+	http_curl_initbuf_ex(0)
 
 #define http_curl_initbuf_ex(chunk_size) \
 	{ \
-		size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE; \
+		size_t size = chunk_size; \
+		if (size < 1) { \
+			size = HTTP_CURLBUF_SIZE; \
+		} \
 		http_curl_freebuf(); \
 		HTTP_G(curlbuf).data = emalloc(size); \
 		HTTP_G(curlbuf).free = size; \
@@ -95,9 +108,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) \
 	{ \
@@ -117,7 +130,7 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 static inline char *_http_curl_copystr(const char *str TSRMLS_DC);
 
 #define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
 
 #define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0)
 #define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1))
@@ -197,8 +210,8 @@ static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, i
 }
 /* }}} */
 
-/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
+/* {{{ static void http_curl_setopts(CURL *, char *, HashTable *) */
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
 {
 	zval *zoption;
 	zend_bool range_req = 0;
@@ -482,12 +495,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);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_cleanup(ch, clean_curl);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
+	http_curl_perform(ch, clean_curl);
 
 	if (info) {
 		http_curl_getinfo(ch, info);
@@ -507,12 +515,7 @@ PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
 
 	http_curl_startup(ch, clean_curl, URL, options);
 	curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_cleanup(ch, clean_curl);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
+	http_curl_perform(ch, clean_curl);
 
 	if (info) {
 		http_curl_getinfo(ch, info);
@@ -535,12 +538,7 @@ PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata
 	curl_easy_setopt(ch, CURLOPT_POST, 1);
 	curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
 	curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_cleanup(ch, clean_curl);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
+	http_curl_perform(ch, clean_curl);
 
 	if (info) {
 		http_curl_getinfo(ch, info);
@@ -591,12 +589,7 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL,
 	http_curl_startup(ch, clean_curl, URL, options);
 	curl_easy_setopt(ch, CURLOPT_POST, 1);
 	curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_cleanup(ch, clean_curl);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
+	http_curl_perform(ch, clean_curl);
 
 	if (info) {
 		http_curl_getinfo(ch, info);