dsp Tue May 20 13:16:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap soap.c
Log:
MFH: Allow non-long values for proxy_port, connection_timeout and convert them
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.14&r2=1.156.2.28.2.30.2.15&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.14
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.15
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.14 Mon Mar 10 22:12:35 2008
+++ php-src/ext/soap/soap.c Tue May 20 13:16:47 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.14 2008/03/10 22:12:35 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.15 2008/05/20 13:16:47 dsp 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 &&
@@ -2463,8 +2463,9 @@
add_property_long(this_ptr, "_features",
Z_LVAL_PP(tmp));
}
- if (zend_hash_find(ht, "connection_timeout",
sizeof("connection_timeout"), (void**)&tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_LONG && Z_LVAL_PP(tmp) > 0) {
+ if (zend_hash_find(ht, "connection_timeout",
sizeof("connection_timeout"), (void**)&tmp) == SUCCESS) {
+ convert_to_long(*tmp);
+ if (Z_LVAL_PP(tmp) > 0)
add_property_long(this_ptr, "_connection_timeout",
Z_LVAL_PP(tmp));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
