dsp Tue May 20 13:15:02 2008 UTC
Modified files:
/php-src/ext/soap soap.c
Log:
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.244&r2=1.245&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.244 php-src/ext/soap/soap.c:1.245
--- php-src/ext/soap/soap.c:1.244 Tue Mar 4 12:47:36 2008
+++ php-src/ext/soap/soap.c Tue May 20 13:15:01 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.244 2008/03/04 12:47:36 dmitry Exp $ */
+/* $Id: soap.c,v 1.245 2008/05/20 13:15:01 dsp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2758,8 +2758,8 @@
} else {
client->proxy_host =
soap_unicode_to_string(Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp) TSRMLS_CC);
}
- if (zend_ascii_hash_find(ht, "proxy_port",
sizeof("proxy_port"), (void**)&tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_LONG) {
+ if (zend_ascii_hash_find(ht, "proxy_port",
sizeof("proxy_port"), (void**)&tmp) == SUCCESS) {
+ convert_to_long(*tmp);
client->proxy_port = Z_LVAL_PP(tmp);
}
if (zend_ascii_hash_find(ht, "proxy_login",
sizeof("proxy_login"), (void**)&tmp) == SUCCESS &&
@@ -2849,9 +2849,10 @@
client->features = Z_LVAL_PP(tmp);
}
- if (zend_ascii_hash_find(ht, "connection_timeout",
sizeof("connection_timeout"), (void**)&tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_LONG && Z_LVAL_PP(tmp) >= 0) {
- client->connection_timeout = Z_LVAL_PP(tmp);
+ if (zend_ascii_hash_find(ht, "connection_timeout",
sizeof("connection_timeout"), (void**)&tmp) == SUCCESS) {
+ convert_to_long(*tmp);
+ if(Z_LVAL_PP(tmp) >= 0)
+ client->connection_timeout = Z_LVAL_PP(tmp);
}
if (context) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
