From: Michael Wallner <mike@php.net>
Date: Thu, 11 Apr 2013 12:01:56 +0000 (+0000)
Subject: fix usage with ancient libcurl (debian)
X-Git-Tag: RELEASE_2_1_0_RC3~10^2^2~29
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=61ab11d34fbc432f5cfc9753bdaee0f716c5e406;p=m6w6%2Fext-http

fix usage with ancient libcurl (debian)
---

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 460f62b..ca7aaeb 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -986,7 +986,9 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauth"), CURLOPT_PROXYUSERPWD, IS_STRING))) {
 		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 	}
-	php_http_option_register(registry, ZEND_STRL("proxyauthtype"), CURLOPT_PROXYAUTH, IS_LONG);
+	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauthtype"), CURLOPT_PROXYAUTH, IS_LONG))) {
+		Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
+	}
 	php_http_option_register(registry, ZEND_STRL("proxytunnel"), CURLOPT_HTTPPROXYTUNNEL, IS_BOOL);
 #if PHP_HTTP_CURL_VERSION(7,19,4)
 	php_http_option_register(registry, ZEND_STRL("noproxy"), CURLOPT_NOPROXY, IS_STRING);
@@ -1044,7 +1046,9 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 	if ((opt = php_http_option_register(registry, ZEND_STRL("httpauth"), CURLOPT_USERPWD, IS_STRING))) {
 		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 	}
-	php_http_option_register(registry, ZEND_STRL("httpauthtype"), CURLOPT_HTTPAUTH, IS_LONG);
+	if ((opt = php_http_option_register(registry, ZEND_STRL("httpauthtype"), CURLOPT_HTTPAUTH, IS_LONG))) {
+		Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
+	}
 
 	/* redirects */
 	if ((opt = php_http_option_register(registry, ZEND_STRL("redirect"), CURLOPT_FOLLOWLOCATION, IS_LONG))) {