cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c
| From: | Dmitry Stogov | Date: | Mon, 24 Oct 2005 07:44:17 +0000 |
| Subject: | cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34751@lists.php.net to get a copy of this message | ||
dmitry Mon Oct 24 03:44:17 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.2027.2.156&r2=1.2027.2.157&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.156 php-src/NEWS:1.2027.2.157
--- php-src/NEWS:1.2027.2.156 Mon Oct 24 02:58:39 2005
+++ php-src/NEWS Mon Oct 24 03:44:11 2005
@@ -3,6 +3,7 @@
?? 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)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.88&r2=1.88.2.1&ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88 php-src/ext/soap/php_sdl.c:1.88.2.1
--- php-src/ext/soap/php_sdl.c:1.88 Wed Aug 3 10:07:48 2005
+++ php-src/ext/soap/php_sdl.c Mon Oct 24 03:44:17 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_sdl.c,v 1.88 2005/08/03 14:07:48 sniper Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.1 2005/10/24 07:44:17 dmitry Exp $ */
#include "php_soap.h"
#include "ext/libxml/php_libxml.h"
@@ -2235,6 +2235,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);
@@ -2246,6 +2247,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);
}