diff --git a/NEWS b/NEWS index 8228c9300e1..c07d6c98a2e 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP NEWS ?? Oct 2005, PHP 5.1 Release Candidate 4 - Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry) - Fixed bug #34957 (PHP doesn't respect ACLs for access checks). (Wez) +- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry) - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and leaks). (Tony) - Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia) diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 08a96fe841f..50055c5f20f 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -2235,6 +2235,7 @@ sdlPtr get_sdl(zval *this_ptr, char *uri TSRMLS_DC) smart_str_appends(&proxy,Z_STRVAL_PP(proxy_host)); smart_str_appends(&proxy,":"); smart_str_appends(&proxy,Z_STRVAL(str_port)); + smart_str_0(&proxy); zval_dtor(&str_port); MAKE_STD_ZVAL(str_proxy); ZVAL_STRING(str_proxy, proxy.c, 1); @@ -2246,6 +2247,11 @@ sdlPtr get_sdl(zval *this_ptr, char *uri 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); + proxy_authentication(this_ptr, &headers TSRMLS_CC); }