fix bug #49463 (setAttributeNS fails setting default namespace)

add test

diff --git a/NEWS b/NEWS
index 14fbf44e69ba88e7001aba002376c6f6a4c5059a..76a5a7f58304463b5dc1ede2a33b2c3463a95439 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,7 @@ PHP                                                                        NEWS
 - Fixed bug #50394 (Reference argument converted to value in __call). (Stas)
 - Fixed bug #49851 (http wrapper breaks on 1024 char long headers). (Ilia)
 - Fixed bug #49600 (imageTTFText text shifted right). (Takeshi Abe)
+- Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
 - Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
 - Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
   in HTTP uploads). (Ilia)

diff --git a/ext/dom/element.c b/ext/dom/element.c
index 88d4777eb809b9e87b50cc4525c10e4e652c7fb0..9e336655f4814b576e9317a750de3a8fbed39472 100644 (file)
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -792,11 +792,17 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
                                node_list_unlink(nodep->children TSRMLS_CC);
                        }
 
-                       if (xmlStrEqual((xmlChar *) prefix,"xmlns") && xmlStrEqual((xmlChar *) uri, DOM_XMLNS_NAMESPACE)) {
+                       if ((xmlStrEqual((xmlChar *) prefix, (xmlChar *)"xmlns") || 
+                               (prefix == NULL && xmlStrEqual((xmlChar *) localname, (xmlChar *)"xmlns"))) && 
+                               xmlStrEqual((xmlChar *) uri, (xmlChar *)DOM_XMLNS_NAMESPACE)) {
                                is_xmlns = 1;
-                               nsptr = dom_get_nsdecl(elemp, localname);
+                               if (prefix == NULL) {
+                                       nsptr = dom_get_nsdecl(elemp, NULL);
+                               } else {
+                                       nsptr = dom_get_nsdecl(elemp, (xmlChar *)localname);
+                               }
                        } else {
-                               nsptr = xmlSearchNsByHref(elemp->doc, elemp, uri);
+                               nsptr = xmlSearchNsByHref(elemp->doc, elemp, (xmlChar *)uri);
                                if (nsptr && nsptr->prefix == NULL) {
                                        xmlNsPtr tmpnsptr;
 
@@ -817,10 +823,15 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
 
                        if (nsptr == NULL) {
                                if (prefix == NULL) {
-                                       errorcode = NAMESPACE_ERR;
+                                       if (is_xmlns == 1) {
+                                               xmlNewNs(elemp, (xmlChar *)value, NULL);
+                                               xmlReconciliateNs(elemp->doc, elemp);
+                                       } else {
+                                               errorcode = NAMESPACE_ERR;
+                                       }
                                } else {
                                        if (is_xmlns == 1) {
-                                               xmlNewNs(elemp, value, localname);
+                                               xmlNewNs(elemp, (xmlChar *)value, (xmlChar *)localname);
                                        } else {
                                                nsptr = dom_get_ns(elemp, uri, &errorcode, prefix);
                                        }

diff --git a/ext/dom/tests/bug49463.phpt b/ext/dom/tests/bug49463.phpt
new file mode 100644 (file)
index 0000000..4f232e3
--- /dev/null
+++ b/ext/dom/tests/bug49463.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #49463 (setAttributeNS fails setting default namespace).
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+$doc = new DOMDocument('1.0', 'utf-8');
+$root = $doc->createElementNS('http://purl.org/rss/1.0/','rdf:RDF');
+$doc->appendChild($root);
+$root->setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns","http://purl.org/rss/1.0/" );
+
+echo $doc->saveXML()."\n";
+?>
+--EXPECT--
+<?xml version="1.0" encoding="utf-8"?>
+<rdf:RDF xmlns:rdf="http://purl.org/rss/1.0/" xmlns="http://purl.org/rss/1.0/"/>