dmitry          Fri May 21 10:50:19 2004 EDT

  Modified files:              
    /php-src    NEWS 
    /php-src/ext/soap   php_packet_soap.c 
  Log:
  Fixed bug #28239 (No results returned on SOAP call, no error given)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1709&r2=1.1710&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1709 php-src/NEWS:1.1710
--- php-src/NEWS:1.1709 Fri May 14 17:10:02 2004
+++ php-src/NEWS        Fri May 21 10:50:19 2004
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5 Release Candidate 3
+- Fixed bug #28239 (No results returned on SOAP call, no error given). (Dmitry)
 - Added ability to refer to existing .ini variables from within .ini files, as
   in:
     open_basedir = ${open_basedir} ":/new/dir"
http://cvs.php.net/diff.php/php-src/ext/soap/php_packet_soap.c?r1=1.35&r2=1.36&ty=u
Index: php-src/ext/soap/php_packet_soap.c
diff -u php-src/ext/soap/php_packet_soap.c:1.35 php-src/ext/soap/php_packet_soap.c:1.36
--- php-src/ext/soap/php_packet_soap.c:1.35     Thu Apr  1 09:05:55 2004
+++ php-src/ext/soap/php_packet_soap.c  Fri May 21 10:50:19 2004
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_packet_soap.c,v 1.35 2004/04/01 14:05:55 dmitry Exp $ */
+/* $Id: php_packet_soap.c,v 1.36 2004/05/21 14:50:19 dmitry Exp $ */
 
 #include "php_soap.h"
 
@@ -268,11 +268,16 @@
                                                        val = cur;
                                                } else {
                                                        val = get_node(cur->children, 
param->paramName);
-                                                       if (val == NULL && res_count 
== 1) {
-                                                               val = 
get_node(cur->children, "return");
-                                                       }
-                                                       if (val == NULL && res_count 
== 1) {
-                                                               val = 
get_node(cur->children, "result");
+                                                       if (res_count == 1) {
+                                                               if (val == NULL) {
+                                                                       val = 
get_node(cur->children, "return");
+                                                               }
+                                                               if (val == NULL) {
+                                                                       val = 
get_node(cur->children, "result");
+                                                               }
+                                                               if (val == NULL && 
cur->children && cur->children->next == NULL) {
+                                                                       val = 
cur->children;                                                              
+                                                               }
                                                        }
                                                }
                                        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to