From: Michael Wallner <mike@php.net>
Date: Tue, 24 May 2016 18:10:19 +0000 (+0200)
Subject: we need libcurl 7.21.5 for UNKNOWN_OPTION and 7.23 for ssl session
X-Git-Tag: RELEASE_2_6_0_BETA1~21
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7f176b21742b58b6934d0bb833b922ff6ca54bff;p=m6w6%2Fext-http

we need libcurl 7.21.5 for UNKNOWN_OPTION and 7.23 for ssl session
sharing
---

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 15f2ff7..d4f0517 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -1780,6 +1780,7 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_share_cookies(php_http_option_
 	return SUCCESS;
 }
 
+#if PHP_HTTP_CURL_VERSION(7,23,0)
 static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
 {
 	php_http_client_t *client = userdata;
@@ -1799,6 +1800,7 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *o
 	}
 	return SUCCESS;
 }
+#endif
 
 static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
 {
@@ -1856,10 +1858,12 @@ static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
 		opt->setter = php_http_curlm_option_set_share_cookies;
 		ZVAL_BOOL(&opt->defval, 1);
 	}
+#if PHP_HTTP_CURL_VERSION(7,23,0)
 	if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, IS_BOOL))) {
 		opt->setter = php_http_curlm_option_set_share_ssl;
 		ZVAL_BOOL(&opt->defval, 1);
 	}
+#endif
 }
 
 static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *val, void *userdata)
diff --git a/src/php_http_curl.h b/src/php_http_curl.h
index 0c533bd..7a9821c 100644
--- a/src/php_http_curl.h
+++ b/src/php_http_curl.h
@@ -19,6 +19,10 @@
 #define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
 #define PHP_HTTP_CURL_FEATURE(f) (curl_version_info(CURLVERSION_NOW)->features & (f))
 
+#if !PHP_HTTP_CURL_VERSION(7,21,5)
+# define CURLE_UNKNOWN_OPTION CURLE_FAILED_INIT
+#endif
+
 PHP_MINIT_FUNCTION(http_curl);
 PHP_MSHUTDOWN_FUNCTION(http_curl);