X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=3475f0cabd4cdca307d563101cb106dac9bcb154;hp=1dfeaa9eedd1ff73dacf4231424e8f88cb75c03a;hb=8ba600800bde93e1b24e5e37b07e69834f549d8b;hpb=0604e341e3aff74bba6ec31fe83218634d844ab7

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 1dfeaa9..3475f0c 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -1219,7 +1219,11 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 	}
 #endif
+#if PHP_HTTP_CURL_VERSION(7,60,0)
+	php_http_option_register(registry, ZEND_STRL("haproxy_protocol"), CURLOPT_HAPROX	YPROTOCOL, _IS_BOOL);
+#endif
 
+	/* unix sockets */
 #if PHP_HTTP_CURL_VERSION(7,40,0)
 	if (PHP_HTTP_CURL_FEATURE(CURL_VERSION_UNIX_SOCKETS)) {
 		if ((opt = php_http_option_register(registry, ZEND_STRL("unix_socket_path"), CURLOPT_UNIX_SOCKET_PATH, IS_STRING))) {
@@ -1262,6 +1266,10 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 	}
 # endif
 #endif
+#if PHP_HTTP_CURL_VERSION(7,60,0)
+	php_http_option_register(registry, ZEND_STRL("dns_shuffle_addresses"), CURLOPT_DNS_SHUFFLE_ADDRESSES, _IS_BOOL);
+#endif
+
 
 	/* limits */
 	php_http_option_register(registry, ZEND_STRL("low_speed_limit"), CURLOPT_LOW_SPEED_LIMIT, IS_LONG);
@@ -1475,7 +1483,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
 				opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 				opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
 #ifdef PHP_HTTP_CAPATH
-			ZVAL_PSTRING(&opt->defval, PHP_HTTP_CAPATH);
+				ZVAL_PSTRING(&opt->defval, PHP_HTTP_CAPATH);
 #endif
 			}
 #endif