[PHP-CVS] cvs: php-src /ext/soap php_encoding.c

[Dmitry Stogov]

dmitry          Sun Oct  9 08:42:08 2005 EDT

  Modified files:              
    /php-src/ext/soap   php_encoding.c 
  Log:
  Fixed bug #34788 (SOAP Client not applying correct namespace to generated 
values)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.111&r2=1.112&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.111 
php-src/ext/soap/php_encoding.c:1.112
--- php-src/ext/soap/php_encoding.c:1.111       Sun Oct  9 07:06:09 2005
+++ php-src/ext/soap/php_encoding.c     Sun Oct  9 08:42:06 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.111 2005/10/09 11:06:09 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.112 2005/10/09 12:42:06 dmitry Exp $ */
 
 #include <time.h>
 
@@ -1381,7 +1381,7 @@
                                        }
                                }
                                return 1;
-                       } else if (strict && model->u.element->nillable) {
+                       } else if (strict && model->u.element->nillable && 
model->min_occurs > 0) {
                                property = 
xmlNewNode(NULL,model->u.element->name);
                                xmlAddChild(node, property);
                                if (style == SOAP_ENCODED) {
@@ -1390,6 +1390,12 @@
                                        xmlNsPtr xsi = 
encode_add_ns(property,XSI_NAMESPACE);
                                        xmlSetNsProp(property, xsi, "nil", 
"true");
                                }
+                               if (style == SOAP_LITERAL &&
+                                   model->u.element->namens &&
+                                   model->u.element->form == 
XSD_FORM_QUALIFIED) {
+                                       xmlNsPtr nsp = encode_add_ns(property, 
model->u.element->namens);
+                                       xmlSetNs(property, nsp);
+                               }
                                return 1;
                        } else if (model->min_occurs == 0) {
                                return 2;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php