dmitry Wed Mar 15 16:14:40 2006 UTC
Modified files:
/php-src/ext/soap php_schema.c
/php-src/ext/soap/tests/bugs bug36614.phpt bug36614.wsdl
bug36629.phpt
Log:
Fixed Bug #36614 (Segfault when using Soap)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_schema.c?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.62 php-src/ext/soap/php_schema.c:1.63
--- php-src/ext/soap/php_schema.c:1.62 Sun Jan 1 13:09:53 2006
+++ php-src/ext/soap/php_schema.c Wed Mar 15 16:14:40 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_schema.c,v 1.62 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: php_schema.c,v 1.63 2006/03/15 16:14:40 dmitry Exp $ */
#include "php_soap.h"
#include "libxml/uri.h"
@@ -2117,7 +2117,7 @@
}
if (attr->name == NULL && attr->ref != NULL) {
char *name = strrchr(attr->ref, ':');
- if (*name) {
+ if (name) {
attr->name = estrdup(name+1);
} else{
attr->name = estrdup(attr->ref);
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36614.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug36614.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug36614.phpt:1.2
--- /dev/null Wed Mar 15 16:14:40 2006
+++ php-src/ext/soap/tests/bugs/bug36614.phpt Wed Mar 15 16:14:40 2006
@@ -0,0 +1,13 @@
+--TEST--
+Bug #36614 (Segfault when using Soap)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+$lo_soap = new SoapClient(dirname(__FILE__)."/bug36614.wsdl");
+echo "ok\n";
+?>
+--EXPECT--
+ok
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36614.wsdl?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug36614.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug36614.wsdl:1.2
--- /dev/null Wed Mar 15 16:14:40 2006
+++ php-src/ext/soap/tests/bugs/bug36614.wsdl Wed Mar 15 16:14:40 2006
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<definitions name="SonicMobile Web-Services"
+ targetNamespace="http://soap.sonicmobile.com/sonicmobile.wsdl";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:sonic="http://soap.sonicmobile.com/sonicmobile.wsdl";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+
+ <types>
+ <xsd:schema xmlns="http://www.w3.org/2000/10/XMLSchema";>
+ <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+ <complexType name="TransportCount">
+ <all>
+ <element name="transport" type="string" />
+ <element name="count" type="integer" />
+ <element name="rate" type="integer" />
+ <element name="last_message" type="integer" />
+ </all>
+ </complexType>
+ <complexType name="ArrayOfTransportCount">
+ <complexContent>
+ <restriction base="soapenc:Array">
+ <attribute ref="soapenc:arrayType"
arrayType="TransportCount[]" />
+ </restriction>
+ </complexContent>
+ </complexType>
+ </xsd:schema>
+ </types>
+
+ <message name="userSendMessageRequest">
+ <part name="sourceUser" type="xsd:int"/>
+ <part name="password" type="xsd:string"/>
+ <part name="destinationUser" type="xsd:int"/>
+ <part name="content" type="xsd:string"/>
+ <part name="sendRepliesTo" type="xsd:string"/>
+ <part name="reference" type="xsd:string"/>
+ </message>
+
+ <message name="sendMessageRequest">
+ <part name="application" type="xsd:string"/>
+ <part name="password" type="xsd:string"/>
+ <part name="destination" type="xsd:string"/>
+ <part name="content" type="xsd:string"/>
+ <part name="reference" type="xsd:string"/>
+ <part name="requestSource" type="xsd:string"/>
+ <part name="customer" type="xsd:string"/>
+ <part name="class" type="xsd:string"/>
+ </message>
+
+ <message name="MessageResponse">
+ <part name="messageid" type="xsd:int"/>
+ <part name="response" type="xsd:string"/>
+ </message>
+
+ <message name="messageCountRequest">
+ <part name="password" type="xsd:string"/>
+ </message>
+
+ <message name="messageCountResponse">
+ <part name="transports" type="tns:ArrayOfTransportCount"/>
+ </message>
+
+ <message name="serverStatusRequest">
+ <part name="password" type="xsd:string"/>
+ </message>
+ <message name="serverStatusResponse">
+ <part name="status_string" type="xsd:string"/>
+ </message>
+
+ <message name="flushGatewayRequest">
+ <part name="password" type="xsd:string"/>
+ </message>
+ <message name="flushGatewayResponse">
+ <part name="status_string" type="xsd:string"/>
+ </message>
+
+ <portType name="SonicMobilePortType">
+ <operation name="userSendMessage">
+ <input message="sonic:userSendMessageRequest"/>
+ <output message="sonic:MessageResponse"/>
+ </operation>
+
+ <operation name="sendMessage">
+ <input message="sonic:sendMessageRequest"/>
+ <output message="sonic:MessageResponse"/>
+ </operation>
+
+ <operation name="messageCount">
+ <input message="sonic:messageCountRequest"/>
+ <output message="sonic:messageCountResponse"/>
+ </operation>
+
+ <operation name="serverStatus">
+ <input message="sonic:serverStatusRequest"/>
+ <output message="sonic:serverStatusResponse"/>
+ </operation>
+
+ <operation name="flushGateway">
+ <input message="sonic:flushGatewayRequest"/>
+ <output message="sonic:flushGatewayResponse"/>
+ </operation>
+ </portType>
+
+ <binding name="SonicMobileBinding" type="sonic:SonicMobilePortType">
+ <soap:binding style="rpc"
transport="http://schemas.xmlsoap.org/soap/http"; />
+
+ <operation name="userSendMessage">
+ <soap:operation
soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#userSendMessage"/>
+
+ <input>
+ <soap:body
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+ namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </input>
+
+ <output>
+ <soap:body
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+ namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </output>
+ </operation>
+
+ <operation name="sendMessage">
+ <soap:operation
soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#sendMessage"/>
+
+ <input>
+ <soap:body
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+ namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </input>
+
+ <output>
+ <soap:body
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+ namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </output>
+ </operation>
+
+ <operation name="messageCount">
+ <soap:operation
soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#messageCount"/>
+
+ <input>
+ <soap:body
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+ namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </input>
+
+ <output>
+ <soap:body
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+ namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </output>
+ </operation>
+
+ <operation name="serverStatus">
+ <soap:operation
soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#serverStatus"/>
+
+ <input>
+ <soap:body
+
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+
namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </input>
+
+ <output>
+ <soap:body
+
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+
namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </output>
+ </operation>
+
+ <operation name="flushGateway">
+ <soap:operation
soapAction="http://soap.sonicmobile.com/SonicMobile/SOAP#flushGateway"/>
+
+ <input>
+ <soap:body
+
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+
namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </input>
+ <output>
+ <soap:body
+
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
+
namespace="http://soap.sonicmobile.com/SonicMobile/SOAP";
+ use="encoded" />
+ </output>
+ </operation>
+
+ </binding>
+
+ <service name="SonicMobile">
+ <port name="SonicMobilePort" binding="sonic:SonicMobileBinding">
+ <soap:address location="http://soap.sonicmobile.com/"/>
+ </port>
+ </service>
+
+</definitions>
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36629.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug36629.phpt
diff -u php-src/ext/soap/tests/bugs/bug36629.phpt:1.2
php-src/ext/soap/tests/bugs/bug36629.phpt:1.3
--- php-src/ext/soap/tests/bugs/bug36629.phpt:1.2 Fri Mar 10 11:47:06 2006
+++ php-src/ext/soap/tests/bugs/bug36629.phpt Wed Mar 15 16:14:40 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #36629 (SoapServer::handle() exits on SOAP faults)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
function test1() {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
