cvs: php-src(PHP_5_0) / NEWS /ext/soap php_sdl.c

dmitry Mon Oct 24 03:45:50 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/soap php_sdl.c Log: Fixed bug #34950 (Unable to get WSDL through proxy) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.504&r2=1.1760.2.505&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.504 php-src/NEWS:1.1760.2.505 --- php-src/NEWS:1.1760.2.504 Sun Oct 23 14:35:19 2005 +++ php-src/NEWS Mon Oct 24 03:45:48 2005 @@ -4,6 +4,7 @@ - Fixed an error in mysqli_fetch_fields (returned NULL instead of an array when row number > field_count). (Georg) - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- 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 #34856 (configure fails to detect libiconv's type). (Tony) http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.12&r2=1.70.2.13&ty=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.70.2.12 php-src/ext/soap/php_sdl.c:1.70.2.13 --- php-src/ext/soap/php_sdl.c:1.70.2.12 Fri Jul 8 05:36:42 2005 +++ php-src/ext/soap/php_sdl.c Mon Oct 24 03:45:49 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_sdl.c,v 1.70.2.12 2005/07/08 09:36:42 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.70.2.13 2005/10/24 07:45:49 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -2230,6 +2230,7 @@ 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); @@ -2239,6 +2240,11 @@ 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); }