Fixed bug #29839 (incorrect convert (xml:lang to lang))

diff --git a/NEWS b/NEWS
index 769388bfbba47b9156bc3178ffe6a5c12516dccb..da644b0746f4cc97aa3c322e314911bdb42f4a42 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ PHP                                                                        NEWS
 - Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
 - Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
   (Dmitry)
+- Fixed bug #29839 (incorrect convert (xml:lang to lang)). (Dmitry)
 - Fixed bug #29830 (SoapServer::setClass() should not export non-public
   methods). (Dmitry)
 - Fixed bug #29821 (Fixed possible crashes in convert_uudecode() on invalid

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 05e2d5143c6675486d425505bb882fc56d3b38e5..99786128684ab85e885162dfb416f5bd03caf94e 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1357,7 +1357,14 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
                                                                if ((*attr)->fixed && strcmp((*attr)->fixed,dummy->children->content) != 0) {
                                                                        soap_error3(E_ERROR, "Encoding: Attribute '%s' has fixed value '%s' (value '%s' is not allowed)", (*attr)->name, (*attr)->fixed, dummy->children->content);
                                                                }
-                                                               xmlSetProp(xmlParam, (*attr)->name, dummy->children->content);
+                                                               if ((*attr)->namens && 
+                                                                   (type->ns == NULL || strcmp((*attr)->namens, type->ns))) {
+                                                                       xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)->namens);
+
+                                                                       xmlSetNsProp(xmlParam, nsp, (*attr)->name, dummy->children->content);
+                                                               } else {
+                                                                       xmlSetProp(xmlParam, (*attr)->name, dummy->children->content);
+                                                               }
                                                        }
                                                        xmlUnlinkNode(dummy);
                                                        xmlFreeNode(dummy);

diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h
index 4d7f75d117d5468d7b61593429026a27f70f28c0..1e26cdb535ae2a9b27d50ab815a7132be6d8fb21 100644 (file)
--- a/ext/soap/php_encoding.h
+++ b/ext/soap/php_encoding.h
@@ -43,6 +43,8 @@
 #define XSD_NS_PREFIX "xsd"
 #define XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
 #define XSI_NS_PREFIX "xsi"
+#define XML_NAMESPACE "http://www.w3.org/XML/1998/namespace"
+#define XML_NS_PREFIX "xml"
 
 #define XSD_STRING 101
 #define XSD_STRING_STRING "string"

diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
index a1d7ed8514b295f1226cbbf1158ea6731b7e9ca8..0fa5c4a08e0f2a408b81703f30bc34672c09bbca 100644 (file)
--- a/ext/soap/php_schema.c
+++ b/ext/soap/php_schema.c
@@ -1729,6 +1729,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl
                        if (nsptr != NULL) {
                                smart_str_appends(&key, nsptr->href);
                                smart_str_appendc(&key, ':');
+                               newAttr->namens = estrdup(nsptr->href);
                        }
                        smart_str_appends(&key, attr_name);
                        smart_str_0(&key);
@@ -1745,6 +1746,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl
                        if (ns != NULL) {
                                smart_str_appends(&key, ns->children->content);
                                smart_str_appendc(&key, ':');
+                               newAttr->namens = estrdup(ns->children->content);
                        }
                        smart_str_appends(&key, name->children->content);
                        smart_str_0(&key);
@@ -2014,6 +2016,9 @@ static void schema_attribute_fixup(sdlCtx *ctx, sdlAttributePtr attr)
                                if ((*tmp)->name != NULL && attr->name == NULL) {
                                        attr->name = estrdup((*tmp)->name);
                                }
+                               if ((*tmp)->namens != NULL && attr->namens == NULL) {
+                                       attr->namens = estrdup((*tmp)->namens);
+                               }
                                if ((*tmp)->def != NULL && attr->def == NULL) {
                                        attr->def = estrdup((*tmp)->def);
                                }
@@ -2071,6 +2076,7 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT
                                                        memcpy(newAttr, *tmp_attr, sizeof(sdlAttribute));
                                                        if (newAttr->def) {newAttr->def = estrdup(newAttr->def);}
                                                        if (newAttr->fixed) {newAttr->fixed = estrdup(newAttr->fixed);}
+                                                       if (newAttr->namens) {newAttr->namens = estrdup(newAttr->namens);}
                                                        if (newAttr->name) {newAttr->name = estrdup(newAttr->name);}
                                                        if (newAttr->extraAttributes) {
                                                          xmlNodePtr node;
@@ -2330,6 +2336,9 @@ void delete_attribute(void *attribute)
        if (attr->name) {
                efree(attr->name);
        }
+       if (attr->namens) {
+               efree(attr->namens);
+       }
        if (attr->ref) {
                efree(attr->ref);
        }

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index d8518cb298d8b300f64773db27500248f22cdd81..05237969bc9beb5c7420456a8a96a1f14b8e5f92 100644 (file)
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -993,7 +993,7 @@ static sdlPtr load_wsdl(char *struri)
        return ctx.sdl;
 }
 
-#define WSDL_CACHE_VERSION 0x09
+#define WSDL_CACHE_VERSION 0x0a
 
 #define WSDL_CACHE_GET(ret,type,buf)   memcpy(&ret,*buf,sizeof(type)); *buf += sizeof(type);
 #define WSDL_CACHE_GET_INT(ret,buf)    ret = ((unsigned char)(*buf)[0])|((unsigned char)(*buf)[1]<<8)|((unsigned char)(*buf)[2]<<16)|((int)(*buf)[3]<<24); *buf += 4;
@@ -1042,6 +1042,7 @@ static void sdl_deserialize_attribute(sdlAttributePtr attr, encodePtr *encoders,
        int i;
 
        attr->name = sdl_deserialize_string(in);
+       attr->namens = sdl_deserialize_string(in);
        attr->ref = sdl_deserialize_string(in);
        attr->def = sdl_deserialize_string(in);
        attr->fixed = sdl_deserialize_string(in);
@@ -1317,7 +1318,7 @@ static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t)
        sdlPtr sdl;
        time_t old_t;
        int  i, num_groups, num_types, num_elements, num_encoders, num_bindings, num_func;
-       sdlFunctionPtr *functions;
+       sdlFunctionPtr *functions = NULL;
        sdlBindingPtr *bindings;
        sdlTypePtr *types;
        encodePtr *encoders;
@@ -1472,69 +1473,71 @@ static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t)
 
        /* deserialize functions */
        WSDL_CACHE_GET_INT(num_func, &in);
-       zend_hash_init(&sdl->functions, num_func, NULL, delete_function, 0);
-       functions = emalloc(num_func*sizeof(sdlFunctionPtr));
-       for (i = 0; i < num_func; i++) {
-               int binding_num, num_faults;
-               sdlFunctionPtr func = emalloc(sizeof(sdlFunction));
-               sdl_deserialize_key(&sdl->functions, func, &in);
-               func->functionName = sdl_deserialize_string(&in);
-               func->requestName = sdl_deserialize_string(&in);
-               func->responseName = sdl_deserialize_string(&in);
-
-               WSDL_CACHE_GET_INT(binding_num, &in);
-               if (binding_num == 0) {
-                       func->binding = NULL;
-               } else {
-                       func->binding = bindings[binding_num-1];
-               }
-               if (func->binding && func->binding->bindingType == BINDING_SOAP && *in != 0) {
-                       sdlSoapBindingFunctionPtr binding = func->bindingAttributes = emalloc(sizeof(sdlSoapBindingFunction));
-                       memset(binding, 0, sizeof(sdlSoapBindingFunction));
-                       WSDL_CACHE_GET_1(binding->style,sdlEncodingStyle,&in);
-                       binding->soapAction = sdl_deserialize_string(&in);
-                       sdl_deserialize_soap_body(&binding->input, encoders, types, &in);
-                       sdl_deserialize_soap_body(&binding->output, encoders, types, &in);
-               } else {
-                       WSDL_CACHE_SKIP(1, &in);
-                       func->bindingAttributes = NULL;
-               }
+       if (num_func > 0) {
+               zend_hash_init(&sdl->functions, num_func, NULL, delete_function, 0);
+               functions = emalloc(num_func*sizeof(sdlFunctionPtr));
+               for (i = 0; i < num_func; i++) {
+                       int binding_num, num_faults;
+                       sdlFunctionPtr func = emalloc(sizeof(sdlFunction));
+                       sdl_deserialize_key(&sdl->functions, func, &in);
+                       func->functionName = sdl_deserialize_string(&in);
+                       func->requestName = sdl_deserialize_string(&in);
+                       func->responseName = sdl_deserialize_string(&in);
+
+                       WSDL_CACHE_GET_INT(binding_num, &in);
+                       if (binding_num == 0) {
+                               func->binding = NULL;
+                       } else {
+                               func->binding = bindings[binding_num-1];
+                       }
+                       if (func->binding && func->binding->bindingType == BINDING_SOAP && *in != 0) {
+                               sdlSoapBindingFunctionPtr binding = func->bindingAttributes = emalloc(sizeof(sdlSoapBindingFunction));
+                               memset(binding, 0, sizeof(sdlSoapBindingFunction));
+                               WSDL_CACHE_GET_1(binding->style,sdlEncodingStyle,&in);
+                               binding->soapAction = sdl_deserialize_string(&in);
+                               sdl_deserialize_soap_body(&binding->input, encoders, types, &in);
+                               sdl_deserialize_soap_body(&binding->output, encoders, types, &in);
+                       } else {
+                               WSDL_CACHE_SKIP(1, &in);
+                               func->bindingAttributes = NULL;
+                       }
 
-               func->requestParameters = sdl_deserialize_parameters(encoders, types, &in);
-               func->responseParameters = sdl_deserialize_parameters(encoders, types, &in);
+                       func->requestParameters = sdl_deserialize_parameters(encoders, types, &in);
+                       func->responseParameters = sdl_deserialize_parameters(encoders, types, &in);
 
-               WSDL_CACHE_GET_INT(num_faults, &in);
-               if (num_faults > 0) {
-                 int j;
+                       WSDL_CACHE_GET_INT(num_faults, &in);
+                       if (num_faults > 0) {
+                         int j;
 
-                       func->faults = emalloc(sizeof(HashTable));
-                       zend_hash_init(func->faults, num_faults, NULL, delete_fault, 0);
+                               func->faults = emalloc(sizeof(HashTable));
+                               zend_hash_init(func->faults, num_faults, NULL, delete_fault, 0);
 
-                       for (j = 0; j < num_faults; j++) {
-                               sdlFaultPtr fault = emalloc(sizeof(sdlFault));
+                               for (j = 0; j < num_faults; j++) {
+                                       sdlFaultPtr fault = emalloc(sizeof(sdlFault));
 
-                               sdl_deserialize_key(func->faults, fault, &in);
-                               fault->name =sdl_deserialize_string(&in);
-                               fault->details =sdl_deserialize_parameters(encoders, types, &in);
-                               if (*in != 0) {
-                                       sdlSoapBindingFunctionFaultPtr binding = fault->bindingAttributes = emalloc(sizeof(sdlSoapBindingFunctionFault));
-                                       memset(binding, 0, sizeof(sdlSoapBindingFunctionFault));
-                                       WSDL_CACHE_GET_1(binding->use,sdlEncodingUse,&in);
-                                       if (binding->use == SOAP_ENCODED) {
-                                               WSDL_CACHE_GET_1(binding->encodingStyle, sdlRpcEncodingStyle, &in);
+                                       sdl_deserialize_key(func->faults, fault, &in);
+                                       fault->name =sdl_deserialize_string(&in);
+                                       fault->details =sdl_deserialize_parameters(encoders, types, &in);
+                                       if (*in != 0) {
+                                               sdlSoapBindingFunctionFaultPtr binding = fault->bindingAttributes = emalloc(sizeof(sdlSoapBindingFunctionFault));
+                                               memset(binding, 0, sizeof(sdlSoapBindingFunctionFault));
+                                               WSDL_CACHE_GET_1(binding->use,sdlEncodingUse,&in);
+                                               if (binding->use == SOAP_ENCODED) {
+                                                       WSDL_CACHE_GET_1(binding->encodingStyle, sdlRpcEncodingStyle, &in);
+                                               } else {
+                                                       binding->encodingStyle = SOAP_ENCODING_DEFAULT;
+                                               }
+                                               binding->ns = sdl_deserialize_string(&in);
                                        } else {
-                                               binding->encodingStyle = SOAP_ENCODING_DEFAULT;
+                                               WSDL_CACHE_SKIP(1, &in);
+                                               fault->bindingAttributes = NULL;
                                        }
-                                       binding->ns = sdl_deserialize_string(&in);
-                               } else {
-                                       WSDL_CACHE_SKIP(1, &in);
-                                       fault->bindingAttributes = NULL;
                                }
+                       } else {
+                               func->faults = NULL;
                        }
-               } else {
-                       func->faults = NULL;
+                       functions[i] = func;
                }
-               functions[i] = func;
        }
 
        /* deserialize requests */
@@ -1551,7 +1554,9 @@ static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t)
                }
        }
 
-       efree(functions);
+       if (functions) {
+               efree(functions);
+       }
        efree(bindings);
        efree(encoders);
        efree(types);
@@ -1619,6 +1624,7 @@ static void sdl_serialize_attribute(sdlAttributePtr attr, HashTable *tmp_encoder
        int i;
 
        sdl_serialize_string(attr->name, out);
+       sdl_serialize_string(attr->namens, out);
        sdl_serialize_string(attr->ref, out);
        sdl_serialize_string(attr->def, out);
        sdl_serialize_string(attr->fixed, out);

diff --git a/ext/soap/php_sdl.h b/ext/soap/php_sdl.h
index 7b29c87ed85a5f7f69649f71106bc1db49408c8e..77bb8d2b291fd89d072da34175b9cc369aeb31da 100644 (file)
--- a/ext/soap/php_sdl.h
+++ b/ext/soap/php_sdl.h
@@ -239,6 +239,7 @@ typedef struct _sdlExtraAttribute {
 
 struct _sdlAttribute {
        char      *name;
+       char      *namens;
        char      *ref;
        char      *def;
        char      *fixed;

diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
new file mode 100644 (file)
index 0000000..ab05820
--- /dev/null
+++ b/ext/soap/tests/bugs/bug29839.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Bug #29839 incorrect convert (xml:lang to lang)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+function EchoString($s) {
+  return $s;
+}
+
+class LocalSoapClient extends SoapClient {
+
+  function LocalSoapClient($wsdl, $options) {
+    $this->SoapClient($wsdl, $options);
+    $this->server = new SoapServer($wsdl, $options);
+    $this->server->addFunction('EchoString');
+  }
+
+  function __doRequest($request, $location, $action, $version) {
+    ob_start();
+    $this->server->handle($request);
+    $response = ob_get_contents();
+    ob_end_clean();
+    return $response;
+  }
+
+}
+
+$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1)); 
+$client->EchoString(array("value"=>"hello","lang"=>"en"));
+echo $client->__getLastRequest();
+echo $client->__getLastResponse();
+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://test-uri"><SOAP-ENV:Body><string xml:lang="en"><ns1:value>hello</ns1:value></string></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://test-uri"><SOAP-ENV:Body><string xml:lang="en"><ns1:value>hello</ns1:value></string></SOAP-ENV:Body></SOAP-ENV:Envelope>
+ok
\ No newline at end of file

diff --git a/ext/soap/tests/bugs/bug29839.wsdl b/ext/soap/tests/bugs/bug29839.wsdl
new file mode 100644 (file)
index 0000000..d8ccb97
--- /dev/null
+++ b/ext/soap/tests/bugs/bug29839.wsdl
@@ -0,0 +1,42 @@
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://test-uri" targetNamespace="http://test-uri">\r
+       <types>\r
+               <xs:schema targetNamespace="http://test-uri" elementFormDefault="qualified">\r
+                       <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" />\r
+                       <complexType name="LocalizedString">\r
+                               <sequence>\r
+                                       <element name="value" type="xsd:string"/>\r
+                               </sequence>\r
+                               <attribute ref="xml:lang" use="required"/>\r
+                       </complexType>\r
+               </xs:schema>\r
+       </types>\r
+       <message name="EchoStringRequest">\r
+               <part name="string" type="tns:LocalizedString"/>\r
+       </message>\r
+       <message name="EchoStringResponse">\r
+               <part name="string" type="tns:LocalizedString"/>\r
+       </message>\r
+       <portType name="AWSProductDataPortType">\r
+               <operation name="EchoString">\r
+                       <input message="tns:EchoStringRequest"/>\r
+                       <output message="tns:EchoStringResponse"/>\r
+               </operation>\r
+       </portType>\r
+       <binding name="AWSProductDataBinding" type="tns:AWSProductDataPortType">\r
+               <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>\r
+               <operation name="EchoString">\r
+                       <soap:operation soapAction="http://test-uri"/>\r
+                       <input>\r
+                               <soap:body use="literal"/>\r
+                       </input>\r
+                       <output>\r
+                               <soap:body use="literal"/>\r
+                       </output>\r
+               </operation>\r
+       </binding>\r
+       <service name="AWSProductData">\r
+               <port name="AWSProductDataPort" binding="tns:AWSProductDataBinding">\r
+                       <soap:address location="http://aws-beta.amazon.com/onca/soap?Service=AWSProductData"/>\r
+               </port>\r
+       </service>\r
+</definitions>\r

diff --git a/ext/soap/tests/bugs/xml.xsd b/ext/soap/tests/bugs/xml.xsd
new file mode 100644 (file)
index 0000000..abb844a
--- /dev/null
+++ b/ext/soap/tests/bugs/xml.xsd
@@ -0,0 +1,34 @@
+<?xml version='1.0'?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>