kou	2012-02-02 21:42:27 +0900 (Thu, 02 Feb 2012)

  New Revision: 34419

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34419

  Log:
    * lib/rexml/parsers/baseparser.rb, test/rexml/test_namespace.rb:
      fix the default xml namespace URI validation.
      Reported by Miho Hiramatsu. Thanks!!!

  Added files:
    trunk/test/rexml/test_namespace.rb
  Modified files:
    trunk/ChangeLog
    trunk/lib/rexml/parsers/baseparser.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34418)
+++ ChangeLog	(revision 34419)
@@ -1,3 +1,10 @@
+Thu Feb  2 21:38:52 2012  Kouhei Sutou  <kou@c...>
+
+	* 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@r...>
 
 	* io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace.
Index: lib/rexml/parsers/baseparser.rb
===================================================================
--- lib/rexml/parsers/baseparser.rb	(revision 34418)
+++ lib/rexml/parsers/baseparser.rb	(revision 34419)
@@ -376,7 +376,7 @@
                 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 )
Index: test/rexml/test_namespace.rb
===================================================================
--- test/rexml/test_namespace.rb	(revision 0)
+++ test/rexml/test_namespace.rb	(revision 34419)
@@ -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@g...</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

Property changes on: test/rexml/test_namespace.rb
___________________________________________________________________
Added: svn:eol-style
   + LF


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/