dmitry Thu May 10 14:58:32 2007 UTC Modified files: /php-src/ext/soap php_sdl.c /php-src/ext/soap/tests/bugs bug41337.phpt bug41337.wsdl Log: Fixed bug #41337 (WSDL parsing doesn't ignore non soap bindings) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.107&r2=1.108&diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.107 php-src/ext/soap/php_sdl.c:1.108 --- php-src/ext/soap/php_sdl.c:1.107 Mon Jan 1 09:29:29 2007 +++ php-src/ext/soap/php_sdl.c Thu May 10 14:58:31 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_sdl.c,v 1.107 2007/01/01 09:29:29 sebastian Exp $ */ +/* $Id: php_sdl.c,v 1.108 2007/05/10 14:58:31 dmitry Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -654,6 +654,7 @@ for (i = 0; i < n; i++) { xmlNodePtr *tmp, service; xmlNodePtr trav, port; + int has_soap_port = 0; zend_hash_get_current_data(&ctx.services, (void **)&tmp); service = *tmp; @@ -716,8 +717,15 @@ trav2 = trav2->next; } if (!address) { - soap_error0(E_ERROR, "Parsing WSDL: No address associated with <port>"); + if (has_soap_port || trav->next) { + efree(tmpbinding); + trav = trav->next; + continue; + } else { + soap_error0(E_ERROR, "Parsing WSDL: No address associated with <port>"); + } } + has_soap_port = 1; location = get_attribute(address->properties, "location"); if (!location) { http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/soap/tests/bugs/bug41337.phpt diff -u /dev/null php-src/ext/soap/tests/bugs/bug41337.phpt:1.2 --- /dev/null Thu May 10 14:58:32 2007 +++ php-src/ext/soap/tests/bugs/bug41337.phpt Thu May 10 14:58:32 2007 @@ -0,0 +1,12 @@ +--TEST-- +Bug #41337 (WSDL parsing doesn't ignore non soap bindings) +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php +ini_set("soap.wsdl_cache_enabled",0); +$client = new SoapClient(dirname(__FILE__)."/bug41337.wsdl"); +echo "ok\n"; +?> +--EXPECT-- +ok http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337.wsdl?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/soap/tests/bugs/bug41337.wsdl diff -u /dev/null php-src/ext/soap/tests/bugs/bug41337.wsdl:1.2 --- /dev/null Thu May 10 14:58:32 2007 +++ php-src/ext/soap/tests/bugs/bug41337.wsdl Thu May 10 14:58:32 2007 @@ -0,0 +1,63 @@ +<?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"> + + <types> + <xsd:schema targetNamespace="http://linuxsrv.home/~dmitry/soap/test.wsdl"> + <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> + <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" /> + </xsd:schema> + </types> + + <message name="AddRequest"> + <part name="x" type="xsd:double" /> + <part name="y" type="xsd:double" /> + </message> + <message name="AddResponse"> + <part name="result" type="xsd:double" /> + </message> + + <portType name="TestServicePortType"> + <operation name="Add"> + <input message="tns:AddRequest" /> + <output message="tns:AddResponse" /> + </operation> + </portType> + + <binding name="TestServiceBinding2" type="tns:TestServicePortType"> + <operation name="Add"> + <input/> + <output/> + </operation> + </binding> + + <binding name="TestServiceBinding" type="tns:TestServicePortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="Add"> + <soap:operation soapAction="Add" 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="TestServicePort2" binding="tns:TestServiceBinding"/> + <port name="TestServicePort" binding="tns:TestServiceBinding"> + <soap:address location="http://linuxsrv.home/~dmitry/soap/soap_server.php" /> + </port> + </service> + +</definitions>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php