From: Michael Wallner <mike@php.net>
Date: Mon, 7 Sep 2015 09:32:40 +0000 (+0200)
Subject: add "path_as_is" request option (libcurl >=7.42)
X-Git-Tag: RELEASE_2_5_2~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a9b5cbfc56a4fcb52e8cf4d353a8b64a8b9acbb2;p=m6w6%2Fext-http

add "path_as_is" request option (libcurl >=7.42)
---

diff --git a/package.xml b/package.xml
index d97a99f..e04ee2f 100644
--- a/package.xml
+++ b/package.xml
@@ -37,7 +37,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
  </lead>
  <date>2015-07-28</date>
  <version>
-  <release>2.5.1</release>
+  <release>2.5.2dev</release>
   <api>2.5.0</api>
  </version>
  <stability>
@@ -46,14 +46,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed VC11 build (Jan Erhardt)
-* Fixed gh-issue #2: comparison of obsolete pointers in the header parser (xiaoyjy)
-* Fixed gh-issue #6: allow RFC1738 unsafe characters in query/fragment
-* Fixed gh-issue #7: crash with querystring and exception from error handler
-+ SSL certinfo is available for libcurl >= 7.42 with gnutls (openssl has already been since 7.19.1)
-+ Added "falsestart" SSL request option (available with libcurl >= 7.42 and darwinssl/NSS)
-+ Added "service_name" and "proxy_service_name" request options for SPNEGO (available with libcurl >= 7.43)
-+ Enabled "certinfo" transfer info on all supporting SSL backends (OpenSSL: libcurl v7.19.1, NSS: libcurl v7.34.0, GSKit: libcurl v7.39.0, GnuTLS: libcurl v7.42.0)
++ Added "path_as_is" request option (libcurl >= 7.42)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http.h b/php_http.h
index 97b3ebc..4cb4d04 100644
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_PECL_HTTP_VERSION "2.5.1"
+#define PHP_PECL_HTTP_VERSION "2.5.2dev"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 78c552a..763525f 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -1212,6 +1212,11 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 {
 	php_http_option_t *opt;
 
+	/* url options */
+#if PHP_HTTP_CURL_VERSION(7,42,0)
+	php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, IS_BOOL);
+#endif
+
 	/* proxy */
 	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyhost"), CURLOPT_PROXY, IS_STRING))) {
 		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
@@ -1511,6 +1516,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 		}
 #endif
 #if PHP_HTTP_CURL_VERSION(7,39,0)
+		/* FIXME: see http://curl.haxx.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html#AVAILABILITY */
 		if ((opt = php_http_option_register(registry, ZEND_STRL("pinned_publickey"), CURLOPT_PINNEDPUBLICKEY, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;