naruse	2012-04-17 21:36:07 +0900 (Tue, 17 Apr 2012)

  New Revision: 35365

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

  Log:
    merge revision(s) 34419: [Backport #6307]
    
    * 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!!!

  Added files:
    branches/ruby_1_9_3/test/rexml/test_namespace.rb
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rexml/parsers/baseparser.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35364)
+++ ruby_1_9_3/ChangeLog	(revision 35365)
@@ -1,3 +1,10 @@
+Tue Apr 17 21:35:47 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!!!
+
 Mon Apr 17 14:27:22 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* dln.c (rb_w32_check_imported): skip ordinal entries.  based on a
Index: ruby_1_9_3/lib/rexml/parsers/baseparser.rb
===================================================================
--- ruby_1_9_3/lib/rexml/parsers/baseparser.rb	(revision 35364)
+++ ruby_1_9_3/lib/rexml/parsers/baseparser.rb	(revision 35365)
@@ -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: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35364)
+++ ruby_1_9_3/version.h	(revision 35365)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 187
+#define RUBY_PATCHLEVEL 188
 
 #define RUBY_RELEASE_DATE "2012-04-17"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/rexml/test_namespace.rb
===================================================================
--- ruby_1_9_3/test/rexml/test_namespace.rb	(revision 0)
+++ ruby_1_9_3/test/rexml/test_namespace.rb	(revision 35365)
@@ -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: ruby_1_9_3/test/rexml/test_namespace.rb
___________________________________________________________________
Added: svn:eol-style
   + LF


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