X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=38eadf45f24343b653faa7aae58e5d748fbc59be;hp=d94e558ec1593e04798869f82f22d3130d856fac;hb=6fc78f4b8ea8a34a40f06985648822fbaa7ffb30;hpb=34644fd4c700fb55c3a2c2ff9966d0f5e7572509

diff --git a/http_request_api.c b/http_request_api.c
index d94e558..38eadf4 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -15,28 +15,21 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #ifdef HTTP_HAVE_CURL
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_request_api.h"
 #include "php_http_request_method_api.h"
 #include "php_http_url_api.h"
+
 #ifdef ZEND_ENGINE_2
 #	include "php_http_request_object.h"
 #endif
 
-#include "phpstr/phpstr.h"
-
-#ifdef PHP_WIN32
-#	include <winsock2.h>
-#endif
-
-#include <curl/curl.h>
-
 /* {{{ cruft for thread safe SSL crypto locks */
 #if defined(ZTS) && defined(HTTP_HAVE_SSL)
 #	ifdef PHP_WIN32
@@ -381,11 +374,12 @@ PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC)
 /* }}} */
 
 /* {{{ void http_request_body_free(http_request_body *) */
-PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
+PHP_HTTP_API void _http_request_body_free(http_request_body **body TSRMLS_DC)
 {
-	if (body) {
-		http_request_body_dtor(body);
-		efree(body);
+	if (*body) {
+		http_request_body_dtor(*body);
+		efree(*body);
+		*body = NULL;
 	}
 }
 /* }}} */
@@ -426,81 +420,81 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 #endif
 
 	/* progress callback */
-	if (zoption = http_curl_getopt(options, "onprogress", 0)) {
+	if ((zoption = http_curl_getopt(options, "onprogress", 0))) {
 		HTTP_CURL_OPT(NOPROGRESS, 0);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
 		HTTP_CURL_OPT(PROGRESSDATA,  http_request_callback_data(zoption));
 	}
 
 	/* proxy */
-	if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "proxyhost", IS_STRING))) {
 		HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 		/* port */
-		if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) {
+		if ((zoption = http_curl_getopt(options, "proxyport", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
 		}
 		/* user:pass */
-		if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) {
+		if ((zoption = http_curl_getopt(options, "proxyauth", IS_STRING))) {
 			HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 		}
 #if LIBCURL_VERSION_NUM >= 0x070a07
 		/* auth method */
-		if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) {
+		if ((zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption));
 		}
 #endif
 	}
 
 	/* outgoing interface */
-	if (zoption = http_curl_getopt(options, "interface", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "interface", IS_STRING))) {
 		HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
 
 	/* another port */
-	if (zoption = http_curl_getopt(options, "port", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "port", IS_LONG))) {
 		HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption));
 	}
 
 	/* auth */
-	if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "httpauth", IS_STRING))) {
 		HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
 #if LIBCURL_VERSION_NUM >= 0x070a06
-	if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "httpauthtype", IS_LONG))) {
 		HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
 	}
 #endif
 
 	/* compress, empty string enables all supported if libcurl was build with zlib support */
 	if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
-		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0");
-#else
+#ifdef HTTP_HAVE_CURL_ZLIB
 		HTTP_CURL_OPT(ENCODING, "");
+#else
+		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
 #endif
 	}
 
 	/* redirects, defaults to 0 */
-	if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "redirect", IS_LONG))) {
 		HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
 		HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption));
-		if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) {
+		if ((zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL))) {
 			HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
 		}
 	}
 
 	/* referer */
-	if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "referer", IS_STRING))) {
 		HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
 
 	/* useragent, default "PECL::HTTP/version (PHP/version)" */
-	if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "useragent", IS_STRING))) {
 		HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
 
 	/* additional headers, array('name' => 'value') */
-	if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
+	if ((zoption = http_curl_getopt(options, "headers", IS_ARRAY))) {
 		char *header_key;
 		ulong header_idx;
 		HashPosition pos;
@@ -526,7 +520,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	}
 
 	/* cookies, array('name' => 'value') */
-	if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
+	if ((zoption = http_curl_getopt(options, "cookies", IS_ARRAY))) {
 		char *cookie_key = NULL;
 		ulong cookie_idx = 0;
 		HashPosition pos;
@@ -552,7 +546,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	}
 
 	/* session cookies */
-	if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) {
+	if ((zoption = http_curl_getopt(options, "cookiesession", IS_BOOL))) {
 		if (Z_LVAL_P(zoption)) {
 			/* accept cookies for this session */
 			HTTP_CURL_OPT(COOKIEFILE, "");
@@ -575,12 +569,12 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	}
 
 	/* maxfilesize */
-	if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "maxfilesize", IS_LONG))) {
 		HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
 	}
 
 	/* lastmodified */
-	if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "lastmodified", IS_LONG))) {
 		if (Z_LVAL_P(zoption)) {
 			if (Z_LVAL_P(zoption) > 0) {
 				HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
@@ -594,17 +588,17 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	}
 
 	/* timeout, defaults to 0 */
-	if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "timeout", IS_LONG))) {
 		HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
 	}
 
 	/* connecttimeout, defaults to 3 */
-	if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "connecttimeout", IS_LONG))) {
 		HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
 	}
 
 	/* ssl */
-	if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) {
+	if ((zoption = http_curl_getopt(options, "ssl", IS_ARRAY))) {
 		ulong idx;
 		char *key = NULL;
 		zval **param;
@@ -629,7 +623,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 				HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST);
 				HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST);
 
-
 				HTTP_CURL_OPT_STRING(CAINFO);
 #if LIBCURL_VERSION_NUM >= 0x070908
 				HTTP_CURL_OPT_STRING(CAPATH);
@@ -866,8 +859,8 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 				phpstr_append(conv->request, data, length);
 			}
 		break;
-#if 0
 		default:
+#if 0
 			fprintf(stderr, "## ", type);
 			if (!type) {
 				fprintf(stderr, "%s", data);
@@ -884,8 +877,8 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 			if (data[length-1] != 0xa) {
 				fprintf(stderr, "\n");
 			}
-		break;
 #endif
+		break;
 	}
 
 	if (type) {
@@ -1042,7 +1035,7 @@ static inline void _http_curl_defaults(CURL *ch)
 	HTTP_CURL_OPT(FOLLOWLOCATION, 0);
 	HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
 	HTTP_CURL_OPT(REFERER, NULL);
-	HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
+	HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
 	HTTP_CURL_OPT(HTTPHEADER, NULL);
 	HTTP_CURL_OPT(COOKIE, NULL);
 	HTTP_CURL_OPT(COOKIEFILE, NULL);