]> granicus.if.org Git - php/commitdiff
Fixed bug #37013 (server hangs when returning circular object references)
authorDmitry Stogov <dmitry@php.net>
Mon, 2 Apr 2007 13:43:08 +0000 (13:43 +0000)
committerDmitry Stogov <dmitry@php.net>
Mon, 2 Apr 2007 13:43:08 +0000 (13:43 +0000)
17 files changed:
NEWS
ext/soap/php_encoding.c
ext/soap/php_encoding.h
ext/soap/php_soap.h
ext/soap/soap.c
ext/soap/tests/bugs/bug36999.phpt [new file with mode: 0755]
ext/soap/tests/bugs/bug36999.wsdl [new file with mode: 0755]
ext/soap/tests/bugs/bug37013.phpt [new file with mode: 0755]
ext/soap/tests/bugs/bug37013.wsdl [new file with mode: 0755]
ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt

diff --git a/NEWS b/NEWS
index 785f8a656d467bb3cf7c73fd320bdc2e2369467c..2462c6d31948942b0f1a53695e8c323eadd55572 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -146,6 +146,8 @@ PHP                                                                        NEWS
   statements in mysqli) (Stas)
 - Fixed bug #37386 (autocreating element doesn't assign value to first node).
   (Rob)
+- Fixed bug #37013 (server hangs when returning circular object references).
+  (Dmitry)
 - Fixed unallocated memory access/double free in in array_user_key_compare() 
   (MOPB-24 by Stefan Esser) (Stas)
 - Fixed wrong length calculation in unserialize S type
index beeb99a38d91a01533c2fa134bc5a22b9b9fff2c..2ae06a768a1b8627e1075801b5ca76a7343034cc 100644 (file)
@@ -270,6 +270,85 @@ static encodePtr find_encoder_by_type_name(sdlPtr sdl, const char *type)
        return NULL;
 }
 
+static zend_bool soap_check_zval_ref(zval *data, xmlNodePtr node TSRMLS_DC) {
+       xmlNodePtr *node_ptr;
+
+       if (SOAP_GLOBAL(ref_map)) {
+               if (Z_TYPE_P(data) == IS_OBJECT) {
+                       data = (zval*)zend_objects_get_address(data TSRMLS_CC);
+               }
+               if (zend_hash_index_find(SOAP_GLOBAL(ref_map), (ulong)data, (void**)&node_ptr) == SUCCESS) {
+                       xmlAttrPtr attr = (*node_ptr)->properties;
+                       char *id;
+                       smart_str prefix = {0};
+
+                       if (*node_ptr == node) {
+                               return 0;
+                       }
+                       xmlNodeSetName(node, (*node_ptr)->name);
+                       xmlSetNs(node, (*node_ptr)->ns);
+                       if (SOAP_GLOBAL(soap_version) == SOAP_1_1) {
+                               while (1) {
+                                       attr = get_attribute(attr, "id");
+                                       if (attr == NULL || attr->ns == NULL) {
+                                               break;
+                                       }
+                                       attr = attr->next;
+                               }
+                               if (attr) {
+                                       id = (char*)attr->children->content;
+                               } else {
+                                       SOAP_GLOBAL(cur_uniq_ref)++;
+                                       smart_str_appendl(&prefix, "#ref", 4);
+                                       smart_str_append_long(&prefix, SOAP_GLOBAL(cur_uniq_ref));
+                                       smart_str_0(&prefix);
+                                       id = prefix.c;
+                                       xmlSetProp((*node_ptr), BAD_CAST("id"), BAD_CAST(id+1));
+                               }
+                               xmlSetProp(node, BAD_CAST("href"), BAD_CAST(id));
+                       } else {
+                               attr = get_attribute_ex(attr, "id", SOAP_1_2_ENC_NAMESPACE);
+                               if (attr) {
+                                       id = (char*)attr->children->content;
+                               } else {
+                                       SOAP_GLOBAL(cur_uniq_ref)++;
+                                       smart_str_appendl(&prefix, "#ref", 4);
+                                       smart_str_append_long(&prefix, SOAP_GLOBAL(cur_uniq_ref));
+                                       smart_str_0(&prefix);
+                                       id = prefix.c;
+                                       set_ns_prop((*node_ptr), SOAP_1_2_ENC_NAMESPACE, "id", id+1);
+                               }
+                               set_ns_prop(node, SOAP_1_2_ENC_NAMESPACE, "ref", id);
+                       }
+                       smart_str_free(&prefix);
+                       return 1;
+               } else {
+                       zend_hash_index_update(SOAP_GLOBAL(ref_map), (ulong)data, (void**)&node, sizeof(xmlNodePtr), NULL);
+               }
+       }
+       return 0;
+}
+
+static zend_bool soap_check_xml_ref(zval **data, xmlNodePtr node TSRMLS_DC)
+{
+       zval **data_ptr;
+
+       if (SOAP_GLOBAL(ref_map)) {
+               if (zend_hash_index_find(SOAP_GLOBAL(ref_map), (ulong)node, (void**)&data_ptr) == SUCCESS) {
+                       if (*data != *data_ptr) {
+                               zval_ptr_dtor(data);
+                               *data = *data_ptr;
+                               (*data)->is_ref = 1;
+                               (*data)->refcount++;
+                               return 1;
+                       }
+               } else {
+                       zend_hash_index_update(SOAP_GLOBAL(ref_map), (ulong)node, (void**)data, sizeof(zval*), NULL);
+               }
+       }
+       return 0;
+}
+
 xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent)
 {
        xmlNodePtr node = NULL;
@@ -1303,14 +1382,20 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e
                        if (enc) {
                                zval *base;
 
-                               MAKE_STD_ZVAL(ret);
+                               ALLOC_INIT_ZVAL(ret);
+                               if (soap_check_xml_ref(&ret, data TSRMLS_CC)) {
+                                       return ret;
+                               }
 
                                object_init_ex(ret, ce);
                                base = master_to_zval_int(enc, data);
                                set_zval_property(ret, "_", base TSRMLS_CC);
                        } else {
-                               MAKE_STD_ZVAL(ret);
+                               ALLOC_INIT_ZVAL(ret);
                                FIND_XML_NULL(data, ret);
+                               if (soap_check_xml_ref(&ret, data TSRMLS_CC)) {
+                                       return ret;
+                               }
                                object_init_ex(ret, ce);
                        }
                } else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
@@ -1335,6 +1420,9 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e
                                        ret = master_to_zval_int(sdlType->encode, data);
                                }
                                FIND_XML_NULL(data, ret);
+                               if (soap_check_xml_ref(&ret, data TSRMLS_CC)) {
+                                       return ret;
+                               }
                                if (get_zval_property(ret, "any" TSRMLS_CC) != NULL) {
                                        unset_zval_property(ret, "any" TSRMLS_CC);
                                        redo_any = 1;
@@ -1346,15 +1434,21 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e
                        } else {
                                zval *base;
 
-                               MAKE_STD_ZVAL(ret);
+                               ALLOC_INIT_ZVAL(ret);
+                               if (soap_check_xml_ref(&ret, data TSRMLS_CC)) {
+                                       return ret;
+                               }
 
                                object_init_ex(ret, ce);
                                base = master_to_zval_int(sdlType->encode, data);
                                set_zval_property(ret, "_", base TSRMLS_CC);
                        }
                } else {
-                       MAKE_STD_ZVAL(ret);
+                       ALLOC_INIT_ZVAL(ret);
                        FIND_XML_NULL(data, ret);
+                       if (soap_check_xml_ref(&ret, data TSRMLS_CC)) {
+                               return ret;
+                       }
                        object_init_ex(ret, ce);
                }
                if (sdlType->model) {
@@ -1400,10 +1494,13 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e
                }
        } else {
 
-               MAKE_STD_ZVAL(ret);
+               ALLOC_INIT_ZVAL(ret);
                FIND_XML_NULL(data, ret);
-               object_init_ex(ret, ce);
+               if (soap_check_xml_ref(&ret, data TSRMLS_CC)) {
+                       return ret;
+               }
 
+               object_init_ex(ret, ce);
                trav = data->children;
 
                while (trav != NULL) {
@@ -1719,10 +1816,13 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
                        xmlAddChild(parent, xmlParam);
                }
 
+               if (soap_check_zval_ref(data, xmlParam TSRMLS_CC)) {
+                       return xmlParam;
+               }
                if (prop != NULL) {
-                 sdlTypePtr array_el;
+                       sdlTypePtr array_el;
 
-                 if (Z_TYPE_P(data) == IS_ARRAY &&
+                       if (Z_TYPE_P(data) == IS_ARRAY &&
                      !is_map(data) &&
                      sdlType->attributes == NULL &&
                      sdlType->model != NULL &&
@@ -1796,6 +1896,9 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
                xmlParam = xmlNewNode(NULL, BAD_CAST("BOGUS"));
                xmlAddChild(parent, xmlParam);
 
+               if (soap_check_zval_ref(data, xmlParam TSRMLS_CC)) {
+                       return xmlParam;
+               }
                if (prop != NULL) {
                        i = zend_hash_num_elements(prop);
                        zend_hash_internal_pointer_reset(prop);
@@ -3214,6 +3317,25 @@ void encode_reset_ns()
 {
        TSRMLS_FETCH();
        SOAP_GLOBAL(cur_uniq_ns) = 0;
+       SOAP_GLOBAL(cur_uniq_ref) = 0;
+       if (SOAP_GLOBAL(ref_map)) {
+               zend_hash_destroy(SOAP_GLOBAL(ref_map));
+       } else {
+               SOAP_GLOBAL(ref_map) = emalloc(sizeof(HashTable));
+       }
+       zend_hash_init(SOAP_GLOBAL(ref_map), 0, NULL, NULL, 0);
+}
+
+void encode_finish()
+{
+       TSRMLS_FETCH();
+       SOAP_GLOBAL(cur_uniq_ns) = 0;
+       SOAP_GLOBAL(cur_uniq_ref) = 0;
+       if (SOAP_GLOBAL(ref_map)) {
+               zend_hash_destroy(SOAP_GLOBAL(ref_map));
+               efree(SOAP_GLOBAL(ref_map));
+               SOAP_GLOBAL(ref_map) = NULL;
+       }
 }
 
 encodePtr get_conversion(int encode)
index 1c3e4dd72c47e8a7e2825cf99da9060c59717c19..2e0b94c4cd3b20cdf9fdb26e7ee864610d644011 100644 (file)
@@ -201,6 +201,7 @@ void whiteSpace_collapse(xmlChar* str);
 xmlNodePtr sdl_guess_convert_xml(encodeTypePtr enc, zval* data, int style, xmlNodePtr parent);
 zval *sdl_guess_convert_zval(encodeTypePtr enc, xmlNodePtr data);
 
+void encode_finish();
 void encode_reset_ns();
 xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns);
 
index b2da6ff35d0347089da2965efa25e1019ff2dc07..345790463c73d83d610402709ce6a4acd945da99 100644 (file)
@@ -168,6 +168,8 @@ ZEND_BEGIN_MODULE_GLOBALS(soap)
        HashTable *class_map;
        int        features;
        HashTable  wsdl_cache;
+       int        cur_uniq_ref;
+       HashTable *ref_map;
 ZEND_END_MODULE_GLOBALS(soap)
 
 #ifdef PHP_WIN32
index 9cae584e812c98aeb8644fe33c15c2106f64cbb3..8120e8880da20744eda9dd3e951920f885db3e55 100644 (file)
@@ -479,6 +479,7 @@ static void php_soap_init_globals(zend_soap_globals *soap_globals TSRMLS_DC)
        soap_globals->sdl = NULL;
        soap_globals->soap_version = SOAP_1_1;
        soap_globals->mem_cache = NULL;
+       soap_globals->ref_map = NULL;
 }
 
 PHP_MSHUTDOWN_FUNCTION(soap)
@@ -2583,7 +2584,9 @@ static void do_soap_call(zval* this_ptr,
                        xmlFreeDoc(request);
 
                        if (ret && Z_TYPE(response) == IS_STRING) {
+                               encode_reset_ns();
                                ret = parse_packet_soap(this_ptr, Z_STRVAL(response), Z_STRLEN(response), fn, NULL, return_value, output_headers TSRMLS_CC);
+                               encode_finish();
                        }
 
                        zval_dtor(&response);
@@ -2626,7 +2629,9 @@ static void do_soap_call(zval* this_ptr,
                        xmlFreeDoc(request);
 
                        if (ret && Z_TYPE(response) == IS_STRING) {
+                               encode_reset_ns();
                                ret = parse_packet_soap(this_ptr, Z_STRVAL(response), Z_STRLEN(response), NULL, function, return_value, output_headers TSRMLS_CC);
+                               encode_finish();
                        }
 
                        zval_dtor(&response);
@@ -3282,6 +3287,8 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
        xmlAttrPtr attr;
        sdlFunctionPtr function;
 
+       encode_reset_ns();
+
        /* Get <Envelope> element */
        env = NULL;
        trav = request->children;
@@ -3530,6 +3537,9 @@ ignore_header:
                func = func->children;
        }
        deserialize_parameters(func, function, num_params, parameters);
+       
+       encode_finish();
+
        return function;
 }
 
@@ -3982,6 +3992,8 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
                }
        }
 
+       encode_finish();
+
        if (function && function->responseName == NULL && 
            body->children == NULL && head == NULL) {
                xmlFreeDoc(doc);
@@ -4196,6 +4208,8 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function
                }
        }
 
+       encode_finish();
+
        return doc;
 }
 
diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt
new file mode 100755 (executable)
index 0000000..35fc61e
--- /dev/null
@@ -0,0 +1,50 @@
+--TEST--
+Bug #36999 (xsd:long values clamped to LONG_MAX instead of using double)
+--SKIPIF--
+<?php 
+  if (!extension_loaded('soap')) die('skip soap extension not available');
+?>
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+
+function echoLong($num) {
+  return $num;
+}
+
+class LocalSoapClient extends SoapClient {
+
+  function __construct($wsdl) {
+    parent::__construct($wsdl);
+    $this->server = new SoapServer($wsdl);
+    $this->server->addFunction('echoLong');
+  }
+
+  function __doRequest($request, $location, $action, $version) {
+    ob_start();
+    $this->server->handle($request);
+    $response = ob_get_contents();
+    ob_end_clean();
+    return $response;
+  }
+
+}
+
+$soap = new LocalSoapClient(dirname(__FILE__)."/bug36999.wsdl");
+
+function test($num) {
+  global $soap;
+  try {
+         printf("%s %0.0f\n", gettype($num), $num);
+         $ret = $soap->echoLong($num);
+         printf("%s %0.0f\n", gettype($ret), $ret);
+       } catch (SoapFault $ex) {
+         var_dump($ex);
+       }
+}
+test(3706790240);
+?>
+--EXPECTF--
+%s 3706790240
+%s 3706790240
diff --git a/ext/soap/tests/bugs/bug36999.wsdl b/ext/soap/tests/bugs/bug36999.wsdl
new file mode 100755 (executable)
index 0000000..80d20b0
--- /dev/null
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<definitions
+    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+    xmlns:si="http://soapinterop.org/xsd"
+    xmlns:tns="http://linuxsrv.home/~dmitry/soap/test.wsdl"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl">
+
+  <message name="echoLongRequest">
+    <part name="x" type="xsd:long" />
+  </message>
+
+  <message name="echoLongResponse">
+    <part name="x" type="xsd:long" />
+  </message>
+
+  <portType name="TestServicePortType">
+    <operation name="echoLong">
+      <input message="tns:echoLongRequest" />
+      <output message="tns:echoLongResponse" />
+    </operation>
+  </portType>
+
+  <binding name="TestServiceBinding" type="tns:TestServicePortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
+    <operation name="echoLong">
+      <soap:operation style="rpc" />
+      <input>
+        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </input>
+      <output>
+        <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </output>
+    </operation>
+  </binding>
+
+  <service name="TestService">
+    <port name="TestServicePort" binding="tns:TestServiceBinding">
+      <soap:address location="test://" />
+    </port>
+  </service>
+
+</definitions>
diff --git a/ext/soap/tests/bugs/bug37013.phpt b/ext/soap/tests/bugs/bug37013.phpt
new file mode 100755 (executable)
index 0000000..45f3142
--- /dev/null
@@ -0,0 +1,58 @@
+--TEST--
+Bug #37013 (server hangs when returning circular object references)
+--SKIPIF--
+<?php 
+  if (!extension_loaded('soap')) die('skip soap extension not available');
+?>
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+$request = <<<REQUEST
+<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope
+xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<soapenv:Body>
+<ns2:getThingWithParent
+ soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:ns2="urn:test.soapserver#"/>
+</soapenv:Body>
+
+</soapenv:Envelope>
+REQUEST;
+
+
+class ThingWithParent
+{
+ var $parent;
+ var $id;
+ var $children;
+ function __construct( $id, $parent ) {
+  $this->id = $id;
+  $this->parent = $parent;
+ }
+}
+
+
+class MultiRefTest {
+ public function getThingWithParent() {
+  $p = new ThingWithParent( 1, null );
+  $p2 = new ThingWithParent( 2, $p );
+  $p3 = new ThingWithParent( 3, $p );
+
+  $p->children = array( $p2, $p3 );
+
+  return $p2;
+ }
+}
+
+
+$server = new SoapServer(dirname(__FILE__)."/bug37013.wsdl");
+$server->setClass( "MultiRefTest");
+$server->handle( $request );
+?>
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="urn:test.soapserver#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:getThingWithParentResponse><result id="ref1" xsi:type="SOAP-ENC:Struct"><parent id="ref2" xsi:type="SOAP-ENC:Struct"><parent xsi:nil="true"/><id xsi:type="xsd:int">1</id><children SOAP-ENC:arrayType="SOAP-ENC:Struct[2]" xsi:type="SOAP-ENC:Array"><item href="#ref1"/><item xsi:type="SOAP-ENC:Struct"><parent href="#ref2"/><id xsi:type="xsd:int">3</id><children xsi:nil="true"/></item></children></parent><id xsi:type="xsd:int">2</id><children xsi:nil="true"/></result></ns1:getThingWithParentResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/soap/tests/bugs/bug37013.wsdl b/ext/soap/tests/bugs/bug37013.wsdl
new file mode 100755 (executable)
index 0000000..dbd77fd
--- /dev/null
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<definitions name="shoppingcart"\r
+ xmlns="http://schemas.xmlsoap.org/wsdl/"\r
+ xmlns:tns="urn:test.soapserver#"\r
+targetNamespace="urn:test.soapserver#"\r
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"\r
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"\r
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"\r
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+ xmlns:types="urn:test.soapserver.types#">\r
+\r
+ <!-- all datatypes will be imported to namespace types: -->\r
+ <types>\r
+         <xs:schema targetNamespace="urn:test.soapserver.types#">\r
+                 <xs:complexType name="ThingWithParent">\r
+        <xs:all>\r
+         <xs:element name="id" type="xs:string"/>\r
+         <xs:element name="parent" type="types:ThingWithParent"/>\r
+         <xs:element name="children" type="types:ArrayOfThingWithParent"/>\r
+        </xs:all>\r
+       </xs:complexType>\r
+ <xs:complexType name="ArrayOfThingWithParent">\r
+  <xs:complexContent>\r
+   <xs:restriction base="soapenc:Array">\r
+      <xs:attribute ref="soapenc:arrayType"\r
+        wsdl:arrayType="tns:ThingWithParent[]"/>\r
+   </xs:restriction>\r
+  </xs:complexContent>\r
+ </xs:complexType>\r
+  </xs:schema>\r
+ </types>\r
+         <message name="getThingWithParent-request"/>\r
+         <message name="getThingWithParent-response">\r
+                 <part name="result" element="types:ThingWithParent"/>\r
+         </message>\r
+ <portType name="soapserver-porttype">\r
+  <operation name="getThingWithParent">\r
+   <input name="getThingWithParent-request" message="tns:getThingWithParent-request"/>\r
+   <output name="getThingWithParent-response" message="tns:getThingWithParent-response"/>\r
+  </operation>\r
+ </portType>\r
+ <binding name="soapserver-binding" type="tns:soapserver-porttype">\r
+  <soap:binding style="rpc"\r
+   transport="http://schemas.xmlsoap.org/soap/http"/>\r
+  <operation name="getThingWithParent">\r
+   <soap:operation soapAction="urn:test.soapserver.SoapServer#getThingWithParent"/>\r
+   <input>\r
+      <soap:body use="encoded"\r
+namespace="urn:test.soapserver#"\r
+encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>\r
+   </input>\r
+   <output>\r
+      <soap:body use="encoded"\r
+namespace="urn:test.soapserver#"\r
+encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>\r
+   </output>\r
+  </operation>\r
+ </binding>\r
+\r
+ <service name="soapserver">\r
+  <!-- @binding doesn't like to be tns: -->\r
+  <port name="soapserver-port" binding="tns:soapserver-binding">\r
+   <soap:address location="xxxxxxxxxxxx"/>\r
+  </port>\r
+ </service>\r
+\r
+</definitions>\r
index 0d779dc063f5415e63a924c83ac0d109be77ebe3..16e806a64af9a8bbdc81ea6359ab83ec43c0e724 100644 (file)
@@ -12,9 +12,10 @@ class SOAPStruct {
     }
 }
 
-$struct = new SOAPStruct('arg',34,325.325);
+$struct1 = new SOAPStruct('arg',34,325.325);
+$struct2 = new SOAPStruct('arg',34,325.325);
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
-$client->__soapCall("echoStructArray", array(array($struct,$struct)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
+$client->__soapCall("echoStructArray", array(array($struct1,$struct2)), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
 echo $client->__getlastrequest();
 $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 include("round2_base.inc");
index 887210548b37f0428dcbbf766f24086e2ed9f861..8bcbc1bff38184e16eb9319ad843f48744a8625d 100644 (file)
@@ -12,17 +12,21 @@ class SOAPStruct {
     }
 }
 
-$struct = new SoapVar(array(
+$struct1 = new SoapVar(array(
+               new SoapVar('arg', XSD_STRING, null, null, 'varString'),
+               new SoapVar('34',  XSD_INT, null, null, 'varInt'),
+               new SoapVar('325.325',  XSD_FLOAT, null, null, 'varFloat')
+  ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd");
+$struct2 = new SoapVar(array(
                new SoapVar('arg', XSD_STRING, null, null, 'varString'),
                new SoapVar('34',  XSD_INT, null, null, 'varInt'),
                new SoapVar('325.325',  XSD_FLOAT, null, null, 'varFloat')
   ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd");
 
 $param =   new SoapParam(new SoapVar(array(
-    $struct,
-    $struct
+    $struct1,
+    $struct2
   ),SOAP_ENC_ARRAY,"ArrayOfSOAPStruct","http://soapinterop.org/xsd"), "inputStructArray");
-$struct = new SOAPStruct('arg',34,325.325);
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
 $client->__soapCall("echoStructArray", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/"));
 echo $client->__getlastrequest();
index 83c369dab32b44429822b157164e56c1dd13b68e..a66bf99d81a0021b935e4ec63a1dfdcc8507b04e 100644 (file)
@@ -12,9 +12,10 @@ class SOAPStruct {
     }
 }
 
-$struct = new SOAPStruct('arg',34,325.325);
+$struct1 = new SOAPStruct('arg',34,325.325);
+$struct2 = new SOAPStruct('arg',34,325.325);
 $client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStructArray(array($struct,$struct));
+$client->echoStructArray(array($struct1,$struct2));
 echo $client->__getlastrequest();
 $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 include("round2_base.inc");
index f6b67f2ba701038275b0feee36f694dc260ff4d4..ac8387e95127089cf888c5381b00b01f10ce7e7f 100644 (file)
@@ -11,9 +11,10 @@ class SOAPStruct {
         $this->varFloat = $f;
     }
 }
-$struct = new SOAPStruct('arg',34,325.325);
+$struct1 = new SOAPStruct('arg',34,325.325);
+$struct2 = new SOAPStruct('arg',34,325.325);
 $client = new SoapClient(dirname(__FILE__)."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoStructArray(array($struct,$struct));
+$client->echoStructArray(array($struct1,$struct2));
 echo $client->__getlastrequest();
 $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 include("round3_groupD_import3.inc");
index e66bbb7a21655476ec9319f19a71a544f7828a87..c3c609f13f73b6bd3d0cc00f6500c3380e60712b 100644 (file)
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 005 (php/wsdl): echoLinkedList (cyclic)
 --SKIPIF--
-<?php require_once('skipif.inc'); die('skip cyclic stuctures are not supported yet'); ?>
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 class SOAPList {
@@ -22,9 +22,9 @@ echo "ok\n";
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
 object(stdClass)#7 (3) {
   ["varInt"]=>
   int(1)
@@ -43,7 +43,28 @@ object(stdClass)#7 (3) {
       ["varString"]=>
       string(4) "arg3"
       ["child"]=>
-      NULL
+      object(stdClass)#7 (3) {
+        ["varInt"]=>
+        int(1)
+        ["varString"]=>
+        string(4) "arg1"
+        ["child"]=>
+        object(stdClass)#8 (3) {
+          ["varInt"]=>
+          int(2)
+          ["varString"]=>
+          string(4) "arg2"
+          ["child"]=>
+          object(stdClass)#9 (3) {
+            ["varInt"]=>
+            int(3)
+            ["varString"]=>
+            string(4) "arg3"
+            ["child"]=>
+            *RECURSION*
+          }
+        }
+      }
     }
   }
 }
index 49584874d7738873a705bbb5ecc8c4f6fc22eaf3..4c3aab74c53df728f5899d62054af7df42e0ecf4 100644 (file)
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 006 (php/wsdl): echoLinkedList (cyclic)
 --SKIPIF--
-<?php require_once('skipif.inc'); die("skip cyclic stuctures are not supported yet"); ?>
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 class SOAPList {
@@ -22,16 +22,16 @@ echo "ok\n";
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://soapinterop.org/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="1" xsi:type="ns2:List"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child id="ref1" xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child href="#ref1"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
 object(stdClass)#7 (3) {
   ["varInt"]=>
   int(1)
   ["varString"]=>
   string(4) "arg1"
   ["child"]=>
-  object(stdClass)#8 (3) {
+  &object(stdClass)#8 (3) {
     ["varInt"]=>
     int(2)
     ["varString"]=>
@@ -43,7 +43,21 @@ object(stdClass)#7 (3) {
       ["varString"]=>
       string(4) "arg3"
       ["child"]=>
-      NULL
+      object(stdClass)#8 (3) {
+        ["varInt"]=>
+        int(2)
+        ["varString"]=>
+        string(4) "arg2"
+        ["child"]=>
+        object(stdClass)#9 (3) {
+          ["varInt"]=>
+          int(3)
+          ["varString"]=>
+          string(4) "arg3"
+          ["child"]=>
+          *RECURSION*
+        }
+      }
     }
   }
 }
index 0da7004009d5e7b11d4b46824e211135b430f9c5..d6e80494fa83c3e432105a1749a6580c66f8cf46 100644 (file)
@@ -11,9 +11,11 @@ class SOAPComplexType {
         $this->varFloat = $f;
     }
 }
-$struct = new SOAPComplexType('arg',34,325.325);
+$struct1 = new SOAPComplexType('arg',34,325.325);
+$struct2 = new SOAPComplexType('arg',34,325.325);
+$struct3 = new SOAPComplexType('arg',34,325.325);
 $client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct,$struct,$struct)));
+$client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct1,$struct2,$struct3)));
 echo $client->__getlastrequest();
 $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 include("round4_groupI_xsd.inc");
index 63f551448e1268862d52105789054e3f1b5b2f08..dd9f93f87f37422c3330175b32e4924a7e42f38b 100644 (file)
@@ -11,9 +11,10 @@ class SOAPComplexType {
         $this->varFloat = $f;
     }
 }
-$struct = new SOAPComplexType('arg',34,325.325);
+$struct1 = new SOAPComplexType('arg',34,325.325);
+$struct2 = new SOAPComplexType('arg',34,325.325);
 $client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0));
-$client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct,null,$struct)));
+$client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct1,null,$struct2)));
 echo $client->__getlastrequest();
 $HTTP_RAW_POST_DATA = $client->__getlastrequest();
 include("round4_groupI_xsd.inc");