X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=42ef30fe5a59078274c33b7d1df705a19196b202;hp=2d853a2b91265a135f767dbb261625f08556a254;hb=09e6d980d8f2a33bbdb21e174557f8a5718a7340;hpb=12937258a4daf4f8a94b4b0acb48b98e92f41afe

diff --git a/http_request_api.c b/http_request_api.c
index 2d853a2..42ef30f 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -181,6 +181,10 @@ PHP_MINIT_FUNCTION(http_request)
 
 #if HTTP_CURL_VERSION(7,15,2)
 	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4", CURLPROXY_SOCKS4);
+#endif
+#if HTTP_CURL_VERSION(7,18,0)
+	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4A", CURLPROXY_SOCKS4A);
+	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5_HOSTNAME);
 #endif
 	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5", CURLPROXY_SOCKS5);
 	HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP", CURLPROXY_HTTP);
@@ -316,8 +320,8 @@ PHP_HTTP_API void _http_request_dtor(http_request *request)
 {
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
-	http_curl_free(&request->ch);
 	http_request_reset(request);
+	http_curl_free(&request->ch);
 	
 	phpstr_dtor(&request->_cache.cookies);
 	zend_hash_destroy(&request->_cache.options);
@@ -474,6 +478,11 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_HTTP_TRANSFER_DECODING, 0L);
 #endif
 		HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
+#if HTTP_CURL_VERSION(7,19,1)
+		HTTP_CURL_OPT(CURLOPT_POSTREDIR, 0L);
+#elif HTTP_CURL_VERSION(7,17,1)
+		HTTP_CURL_OPT(CURLOPT_POST301, 0L);
+#endif
 		HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
 		HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")");
@@ -500,6 +509,15 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0L);
 		HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0L);
 		HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL);
+#if HTTP_CURL_VERSION(7,19,0)
+		HTTP_CURL_OPT(CURLOPT_ISSUERCERT, NULL);
+	#if defined(HTTP_HAVE_OPENSSL)
+		HTTP_CURL_OPT(CURLOPT_CRLFILE, NULL);
+	#endif
+#endif
+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL)
+		HTTP_CURL_OPT(CURLOPT_CERTINFO, NULL);
+#endif
 #ifdef HTTP_CURL_CAINFO
 		HTTP_CURL_OPT(CURLOPT_CAINFO, HTTP_CURL_CAINFO);
 #else
@@ -661,6 +679,13 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	if ((zoption = http_request_option(request, options, "port", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_PORT, Z_LVAL_P(zoption));
 	}
+	
+	/* RFC4007 zone_id */
+#if HTTP_CURL_VERSION(7,19,0)
+	if ((zoption = http_request_option(request, options, "address_scope", IS_LONG))) {
+		HTTP_CURL_OPT(CURLOPT_ADDRESS_SCOPE, Z_LVAL_P(zoption));
+	}
+#endif
 
 	/* auth */
 	if ((zoption = http_request_option(request, options, "httpauth", IS_STRING)) && Z_STRLEN_P(zoption)) {
@@ -677,6 +702,15 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) {
 			HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
 		}
+#if HTTP_CURL_VERSION(7,17,1)
+		if ((zoption = http_request_option(request, options, "postredir", IS_BOOL))) {
+#	if HTTP_CURL_VERSION(7,19,1)
+			HTTP_CURL_OPT(CURLOPT_POSTREDIR, Z_BVAL_P(zoption) ? 1L : 0L);
+#	else
+			HTTP_CURL_OPT(CURLOPT_POST301, Z_BVAL_P(zoption) ? 1L : 0L);
+#	endif
+		}
+#endif
 	}
 	
 	/* retries, defaults to 0 */
@@ -772,14 +806,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 			if (header_key.type == HASH_KEY_IS_STRING) {
 				char header[1024];
 				
-				ZVAL_ADDREF(*header_val);
 				convert_to_string_ex(header_val);
 				if (!strcasecmp(header_key.str, "range")) {
 					range_req = 1;
 				}
 				snprintf(header, sizeof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
 				request->_cache.headers = curl_slist_append(request->_cache.headers, header);
-				zval_ptr_dtor(header_val);
 			}
 		}
 	}
@@ -924,6 +956,15 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 				HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1);
 				HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1);
 				HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1);
+#if HTTP_CURL_VERSION(7,19,0)
+				HTTP_CURL_OPT_STRING(CURLOPT_ISSUERCERT, -3, 1);
+	#if defined(HTTP_HAVE_OPENSSL)
+				HTTP_CURL_OPT_STRING(CURLOPT_CRLFILE, -3, 1);
+	#endif
+#endif
+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL)
+				HTTP_CURL_OPT_LONG(CURLOPT_CERTINFO, -3);
+#endif
 			}
 		}
 	}