X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=34126d8858c52d84e06e6f9665c38e0b5e91e60e;hp=15740732bd33d3cfe48069dbbb91b3e68b4a6ee8;hb=a759e1fae5a4d0e989b9735adf8f3224ed9419d7;hpb=649aada485583ccac67928e0700cb5f1b963f4e8

diff --git a/http_request_api.c b/http_request_api.c
index 1574073..34126d8 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -304,7 +304,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
 		HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback);
 		HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
-		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
+		HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
 		HTTP_CURL_OPT(URL, NULL);
 		HTTP_CURL_OPT(NOPROGRESS, 1);
 		HTTP_CURL_OPT(PROXY, NULL);
@@ -315,7 +315,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(PORT, 0);
 		HTTP_CURL_OPT(USERPWD, NULL);
 		HTTP_CURL_OPT(HTTPAUTH, 0);
-		HTTP_CURL_OPT(ENCODING, 0);
+		HTTP_CURL_OPT(ENCODING, NULL);
 		HTTP_CURL_OPT(FOLLOWLOCATION, 0);
 		HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
 		HTTP_CURL_OPT(REFERER, NULL);
@@ -388,6 +388,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	if ((zoption = http_request_option(request, options, "onprogress", 0))) {
 		HTTP_CURL_OPT(NOPROGRESS, 0);
 		HTTP_CURL_OPT(PROGRESSDATA, request);
+		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
 		http_request_set_progress_callback(request, zoption);
 	}
 
@@ -426,15 +427,6 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
 	}
 
-	/* compress, empty string enables all supported if libcurl was build with zlib support */
-	if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-#ifdef HTTP_HAVE_CURL_ZLIB
-		HTTP_CURL_OPT(ENCODING, "gzip, deflate");
-#else
-		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
-#endif
-	}
-
 	/* redirects, defaults to 0 */
 	if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) {
 		HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
@@ -455,16 +447,15 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	}
 
 	/* additional headers, array('name' => 'value') */
+	if (request->_cache.headers) {
+		curl_slist_free_all(request->_cache.headers);
+		request->_cache.headers = NULL;
+	}
 	if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) {
 		char *header_key;
 		ulong header_idx;
 		HashPosition pos;
 
-		if (request->_cache.headers) {
-			curl_slist_free_all(request->_cache.headers);
-			request->_cache.headers = NULL;
-		}
-		
 		FOREACH_KEY(pos, zoption, header_key, header_idx) {
 			if (header_key) {
 				zval **header_val;
@@ -485,6 +476,10 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 			}
 		}
 	}
+	if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+		request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5,*;q=0.1");
+	}
+	HTTP_CURL_OPT(HTTPHEADER, request->_cache.headers);
 
 	/* cookies, array('name' => 'value') */
 	if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
@@ -831,9 +826,17 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 static inline zval *_http_request_option_ex(http_request *r, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
 {
 	zval **zoption;
+#ifdef ZEND_ENGINE_2
 	ulong h = zend_get_hash_value(key, keylen);
-
-	if (!options || (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void **) &zoption))) {
+#endif
+	
+	if (!options || 
+#ifdef ZEND_ENGINE_2
+			(SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void **) &zoption))
+#else
+			(SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption))
+#endif
+	) {
 		return NULL;
 	}
 
@@ -851,10 +854,18 @@ static inline zval *_http_request_option_ex(http_request *r, HashTable *options,
 		}
 	}
 	
-	ZVAL_ADDREF(*zoption);
-	_zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL, 
-		zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
-
+	/* cache strings */
+	if (type == IS_STRING) {
+		ZVAL_ADDREF(*zoption);
+#ifdef ZEND_ENGINE_2
+		_zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL, 
+			zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
+#else
+		zend_hash_add_or_update(&r->_cache.options, key, keylen, zoption, sizeof(zval *), NULL,
+			zend_hash_exists(&r->_cache.options, key, keylen)?HASH_UPDATE:HASH_ADD);
+#endif
+	}
+	
 	return *zoption;
 }
 /* }}} */