From 92cecf79b428cfe1c8fc83a9b25ca5a99e867d83 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Feb 2012 12:42:27 +0000
Subject: [PATCH] * lib/rexml/parsers/baseparser.rb,
 test/rexml/test_namespace.rb:   fix the default xml namespace URI validation.
   Reported by Miho Hiramatsu. Thanks!!!

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                       |  7 ++++++
 lib/rexml/parsers/baseparser.rb |  2 +-
 test/rexml/test_namespace.rb    | 38 +++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/rexml/test_namespace.rb

diff --git a/ChangeLog b/ChangeLog
index 0b3aee85fd..48ad8d766f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb  2 21:38:52 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/parsers/baseparser.rb, test/rexml/test_namespace.rb:
+	  fix the default xml namespace URI validation.
+	  [ruby-dev:45169] [Bug #5956]
+	  Reported by Miho Hiramatsu. Thanks!!!
+
 Thu Feb  2 17:51:02 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace.
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index e4d89cd7d4..2df26b82f9 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -376,7 +376,7 @@ module REXML
                 attrs.each { |a,b,c,d,e|
                   if b == "xmlns"
                     if c == "xml"
-                      if d != "http://www.w3.org/XML/1998/namespace"
+                      if e != "http://www.w3.org/XML/1998/namespace"
                         msg = "The 'xml' prefix must not be bound to any other namespace "+
                         "(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
                         raise REXML::ParseException.new( msg, @source, self )
diff --git a/test/rexml/test_namespace.rb b/test/rexml/test_namespace.rb
new file mode 100644
index 0000000000..6ab16b6342
--- /dev/null
+++ b/test/rexml/test_namespace.rb
@@ -0,0 +1,38 @@
+require "rexml_test_utils"
+
+require "rexml/document"
+
+class TestNamespace < Test::Unit::TestCase
+  include REXMLTestUtils
+  include REXML
+
+  def setup
+    @xsa_source = <<-EOL
+      <?xml version="1.0"?>
+      <?xsl stylesheet="blah.xsl"?>
+      <!-- The first line tests the XMLDecl, the second tests PI.
+      The next line tests DocType. This line tests comments. -->
+      <!DOCTYPE xsa PUBLIC
+        "-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
+        "http://www.garshol.priv.no/download/xsa/xsa.dtd">
+
+      <xsa>
+        <vendor id="blah">
+          <name>Lars Marius Garshol</name>
+          <email>larsga@garshol.priv.no</email>
+          <url>http://www.stud.ifi.uio.no/~lmariusg/</url>
+        </vendor>
+      </xsa>
+    EOL
+  end
+
+  def test_xml_namespace
+    xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root xmlns:xml="http://www.w3.org/XML/1998/namespace" />
+XML
+    document = Document.new(xml)
+    assert_equal("http://www.w3.org/XML/1998/namespace",
+                 document.root.namespace("xml"))
+  end
+end