cvs: php-src(PHP_5_2) /ext/soap soap.c /ext/soap/tests bug46760.phpt

From: Date: Mon, 05 Jan 2009 22:16:58 +0000
Subject: cvs: php-src(PHP_5_2) /ext/soap soap.c /ext/soap/tests bug46760.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-55371@lists.php.net to get a copy of this message
felipe Mon Jan 5 22:16:58 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests bug46760.phpt Modified files: /php-src/ext/soap soap.c Log: - Fixed bug #46760 (SoapClient doRequest fails when proxy is used) [only in this branch] http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.41&r2=1.156.2.28.2.42&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.28.2.41 php-src/ext/soap/soap.c:1.156.2.28.2.42 --- php-src/ext/soap/soap.c:1.156.2.28.2.41 Wed Dec 31 11:17:43 2008 +++ php-src/ext/soap/soap.c Mon Jan 5 22:16:58 2009 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.156.2.28.2.41 2008/12/31 11:17:43 sebastian Exp $ */ +/* $Id: soap.c,v 1.156.2.28.2.42 2009/01/05 22:16:58 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2381,8 +2381,8 @@ if (zend_hash_find(ht, "proxy_host", sizeof("proxy_host"), (void**)&tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_STRING) { add_property_stringl(this_ptr, "_proxy_host", Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1); - if (zend_hash_find(ht, "proxy_port", sizeof("proxy_port"), (void**)&tmp) == SUCCESS && - Z_TYPE_PP(tmp) == IS_LONG) { + if (zend_hash_find(ht, "proxy_port", sizeof("proxy_port"), (void**)&tmp) == SUCCESS) { + convert_to_long(*tmp); add_property_long(this_ptr, "_proxy_port", Z_LVAL_PP(tmp)); } if (zend_hash_find(ht, "proxy_login", sizeof("proxy_login"), (void**)&tmp) == SUCCESS && http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bug46760.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bug46760.phpt +++ php-src/ext/soap/tests/bug46760.phpt

« previous php.cvs (#55371) next »