dmitry Mon Apr 2 13:43:09 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug36999.phpt bug36999.wsdl
bug37013.phpt bug37013.wsdl
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c php_encoding.h php_soap.h soap.c
/php-src/ext/soap/tests/interop/Round2/Base r2_base_015p.phpt
r2_base_015s.phpt
r2_base_015w.phpt
/php-src/ext/soap/tests/interop/Round3/GroupD
r3_groupD_import3_002w.phpt
/php-src/ext/soap/tests/interop/Round3/GroupE
r3_groupE_list_005w.phpt
r3_groupE_list_006w.phpt
/php-src/ext/soap/tests/interop/Round4/GroupI
r4_groupI_xsd_014w.phpt
r4_groupI_xsd_015w.phpt
Log:
Fixed bug #37013 (server hangs when returning circular object references)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.619&r2=1.2027.2.547.2.620&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.619 php-src/NEWS:1.2027.2.547.2.620
--- php-src/NEWS:1.2027.2.547.2.619 Sun Apr 1 19:29:42 2007
+++ php-src/NEWS Mon Apr 2 13:43:08 2007
@@ -146,6 +146,8 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.26&r2=1.103.2.21.2.27&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.26
php-src/ext/soap/php_encoding.c:1.103.2.21.2.27
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.26 Tue Mar 20 09:52:13 2007
+++ php-src/ext/soap/php_encoding.c Mon Apr 2 13:43:08 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.26 2007/03/20 09:52:13 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.27 2007/04/02 13:43:08 dmitry Exp $ */
#include <time.h>
@@ -270,6 +270,85 @@
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 @@
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 @@
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 @@
} 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 @@
}
} 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 @@
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 @@
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 @@
{
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)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.h?r1=1.38.2.3.2.3&r2=1.38.2.3.2.4&diff_format=u
Index: php-src/ext/soap/php_encoding.h
diff -u php-src/ext/soap/php_encoding.h:1.38.2.3.2.3
php-src/ext/soap/php_encoding.h:1.38.2.3.2.4
--- php-src/ext/soap/php_encoding.h:1.38.2.3.2.3 Mon Jan 1 09:36:06 2007
+++ php-src/ext/soap/php_encoding.h Mon Apr 2 13:43:08 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.h,v 1.38.2.3.2.3 2007/01/01 09:36:06 sebastian Exp $ */
+/* $Id: php_encoding.h,v 1.38.2.3.2.4 2007/04/02 13:43:08 dmitry Exp $ */
#ifndef PHP_ENCODING_H
#define PHP_ENCODING_H
@@ -201,6 +201,7 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_soap.h?r1=1.38.2.6.2.4&r2=1.38.2.6.2.5&diff_format=u
Index: php-src/ext/soap/php_soap.h
diff -u php-src/ext/soap/php_soap.h:1.38.2.6.2.4
php-src/ext/soap/php_soap.h:1.38.2.6.2.5
--- php-src/ext/soap/php_soap.h:1.38.2.6.2.4 Tue Mar 20 09:52:13 2007
+++ php-src/ext/soap/php_soap.h Mon Apr 2 13:43:08 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_soap.h,v 1.38.2.6.2.4 2007/03/20 09:52:13 dmitry Exp $ */
+/* $Id: php_soap.h,v 1.38.2.6.2.5 2007/04/02 13:43:08 dmitry Exp $ */
#ifndef PHP_SOAP_H
#define PHP_SOAP_H
@@ -168,6 +168,8 @@
HashTable *class_map;
int features;
HashTable wsdl_cache;
+ int cur_uniq_ref;
+ HashTable *ref_map;
ZEND_END_MODULE_GLOBALS(soap)
#ifdef PHP_WIN32
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.21&r2=1.156.2.28.2.22&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.21
php-src/ext/soap/soap.c:1.156.2.28.2.22
--- php-src/ext/soap/soap.c:1.156.2.28.2.21 Tue Mar 20 09:52:13 2007
+++ php-src/ext/soap/soap.c Mon Apr 2 13:43:08 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.21 2007/03/20 09:52:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.22 2007/04/02 13:43:08 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -479,6 +479,7 @@
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 @@
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 @@
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 @@
xmlAttrPtr attr;
sdlFunctionPtr function;
+ encode_reset_ns();
+
/* Get <Envelope> element */
env = NULL;
trav = request->children;
@@ -3530,6 +3537,9 @@
func = func->children;
}
deserialize_parameters(func, function, num_params, parameters);
+
+ encode_finish();
+
return function;
}
@@ -3982,6 +3992,8 @@
}
}
+ encode_finish();
+
if (function && function->responseName == NULL &&
body->children == NULL && head == NULL) {
xmlFreeDoc(doc);
@@ -4196,6 +4208,8 @@
}
}
+ encode_finish();
+
return doc;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt?r1=1.1.4.1&r2=1.1.4.2&diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt:1.1.4.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt:1.1.4.2
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt:1.1.4.1
Fri May 26 09:02:34 2006
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt Mon Apr
2 13:43:08 2007
@@ -12,9 +12,10 @@
}
}
-$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");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt?r1=1.1.4.1&r2=1.1.4.2&diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt:1.1.4.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt:1.1.4.2
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt:1.1.4.1
Fri May 26 09:02:34 2006
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt Mon Apr
2 13:43:08 2007
@@ -12,17 +12,21 @@
}
}
-$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();
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt?r1=1.1.4.1&r2=1.1.4.2&diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt:1.1.4.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt:1.1.4.2
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt:1.1.4.1
Fri May 26 09:02:34 2006
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt Mon Apr
2 13:43:08 2007
@@ -12,9 +12,10 @@
}
}
-$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");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt?r1=1.1.4.1&r2=1.1.4.2&diff_format=u
Index: php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
diff -u
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt:1.1.4.1
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt:1.1.4.2
---
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt:1.1.4.1
Fri May 26 09:02:34 2006
+++ php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
Mon Apr 2 13:43:08 2007
@@ -11,9 +11,10 @@
$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");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt?r1=1.1&r2=1.1.4.1&diff_format=u
Index: php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
diff -u
php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt:1.1
php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt:1.1.4.1
--- php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt:1.1
Sun Apr 3 15:51:20 2005
+++ php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
Mon Apr 2 13:43:08 2007
@@ -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 @@
?>
--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 @@
["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*
+ }
+ }
+ }
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt?r1=1.1&r2=1.1.4.1&diff_format=u
Index: php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
diff -u
php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt:1.1
php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt:1.1.4.1
--- php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt:1.1
Sun Apr 3 15:51:20 2005
+++ php-src/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
Mon Apr 2 13:43:08 2007
@@ -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 @@
?>
--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 @@
["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*
+ }
+ }
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt?r1=1.1&r2=1.1.4.1&diff_format=u
Index: php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
diff -u
php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt:1.1
php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt:1.1.4.1
--- php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt:1.1
Sun Apr 3 15:51:22 2005
+++ php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
Mon Apr 2 13:43:08 2007
@@ -11,9 +11,11 @@
$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");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
diff -u
php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt:1.1.2.1
php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt:1.1.2.1.2.1
---
php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt:1.1.2.1
Sun Oct 9 11:05:46 2005
+++ php-src/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
Mon Apr 2 13:43:08 2007
@@ -11,9 +11,10 @@
$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");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug36999.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug36999.phpt
+++ php-src/ext/soap/tests/bugs/bug36999.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug36999.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug36999.wsdl
+++ php-src/ext/soap/tests/bugs/bug36999.wsdl
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug37013.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug37013.phpt
+++ php-src/ext/soap/tests/bugs/bug37013.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug37013.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug37013.wsdl
+++ php-src/ext/soap/tests/bugs/bug37013.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
