cvs: php-src(PHP_5_0) /ext/soap soap.c /ext/soap/tests/bugs bug34643.phpt
| From: | Dmitry Stogov | Date: | Mon, 03 Oct 2005 09:53:33 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/soap soap.c /ext/soap/tests/bugs bug34643.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34245@lists.php.net to get a copy of this message | ||
dmitry Mon Oct 3 05:53:33 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugs bug34643.phpt
Log:
MFH (Bug #34643 wsdl default value)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.44&r2=1.110.2.45&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.44 php-src/ext/soap/soap.c:1.110.2.45
--- php-src/ext/soap/soap.c:1.110.2.44 Tue Sep 27 11:26:25 2005
+++ php-src/ext/soap/soap.c Mon Oct 3 05:53:32 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.110.2.44 2005/09/27 15:26:25 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.45 2005/10/03 09:53:32 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4008,7 +4008,7 @@
if (param != NULL) {
enc = param->encode;
- if (val == NULL || Z_TYPE_P(val) == IS_NULL) {
+ if (val == NULL) {
if (param->element) {
if (param->element->fixed) {
ZVAL_STRING(&defval, param->element->fixed, 0);
http://cvs.php.net/diff.php/php-src/ext/soap/tests/bugs/bug34643.phpt?r1=1.1.4.2&r2=1.1.4.3&ty=u
Index: php-src/ext/soap/tests/bugs/bug34643.phpt
diff -u php-src/ext/soap/tests/bugs/bug34643.phpt:1.1.4.2
php-src/ext/soap/tests/bugs/bug34643.phpt:1.1.4.3
--- php-src/ext/soap/tests/bugs/bug34643.phpt:1.1.4.2 Tue Sep 27 11:26:25 2005
+++ php-src/ext/soap/tests/bugs/bug34643.phpt Mon Oct 3 05:53:33 2005
@@ -36,6 +36,7 @@
print_r($cl->__getFunctions());
echo $cl->get_it("aaa")."\n";
echo $cl->get_it()."\n";
+var_dump($cl->get_it(null));
?>
--EXPECT--
Array
@@ -44,3 +45,4 @@
)
aaa
zzz
+NULL