From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 8 Nov 2010 11:34:32 +0000 (+0000)
Subject: Fixed WSDL loading using https through proxy
X-Git-Tag: php-5.3.4RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b01b2e6d0b75463a3c06065c84276c994d3e06b1;p=php

Fixed WSDL loading using https through proxy
---

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 93ea595195..bce3066bf1 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -3250,10 +3250,13 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
 		php_stream_context_set_option(context, "http", "proxy", str_proxy);
 		zval_ptr_dtor(&str_proxy);
 
-		MAKE_STD_ZVAL(str_proxy);
-		ZVAL_BOOL(str_proxy, 1);
-		php_stream_context_set_option(context, "http", "request_fulluri", str_proxy);
-		zval_ptr_dtor(&str_proxy);
+		if (uri_len < sizeof("https://")-1 ||
+		    strncasecmp(uri, "https://", sizeof("https://")-1) != 0) {
+			MAKE_STD_ZVAL(str_proxy);
+			ZVAL_BOOL(str_proxy, 1);
+			php_stream_context_set_option(context, "http", "request_fulluri", str_proxy);
+			zval_ptr_dtor(&str_proxy);
+		}
 
 		proxy_authentication(this_ptr, &headers TSRMLS_CC);
 	}