X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=e56f8d416b6a6e1701922f504945d1e09a2bcd41;hb=9d607c62df6393665a82f4997eae68345395c0fc;hp=85f12b7734f4201d6c308687d52f9e471d3e8150;hpb=57e944b102006abfa4005337b0ac5901425f4289;p=m6w6%2Fext-http

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 85f12b7..e56f8d4 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -1230,7 +1230,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 
 	/* 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);
+	php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, _IS_BOOL);
 #endif
 
 	/* proxy */
@@ -1484,7 +1484,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 			ZVAL_BOOL(&opt->defval, 1);
 			opt->setter = php_http_curle_option_set_ssl_verifyhost;
 		}
-#if PHP_HTTP_CURL_VERSION(7,41,0)
+#if PHP_HTTP_CURL_VERSION(7,41,0) && (defined(PHP_HTTP_HAVE_OPENSSL) || defined(PHP_HTTP_HAVE_NSS) || defined(PHP_HTTP_HAVE_GNUTLS))
 		php_http_option_register(registry, ZEND_STRL("verifystatus"), CURLOPT_SSL_VERIFYSTATUS, _IS_BOOL);
 #endif
 		php_http_option_register(registry, ZEND_STRL("cipher_list"), CURLOPT_SSL_CIPHER_LIST, IS_STRING);
@@ -2534,6 +2534,9 @@ PHP_MINIT_FUNCTION(http_client_curl)
 	REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1, CONST_CS|CONST_PERSISTENT);
 #if PHP_HTTP_CURL_VERSION(7,33,0)
 	REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_2_0", CURL_HTTP_VERSION_2_0, CONST_CS|CONST_PERSISTENT);
+#endif
+#if PHP_HTTP_CURL_VERSION(7,47,0)
+	REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_2TLS", CURL_HTTP_VERSION_2TLS, CONST_CS|CONST_PERSISTENT);
 #endif
 	REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_ANY", CURL_HTTP_VERSION_NONE, CONST_CS|CONST_PERSISTENT);