kou	2013-08-11 18:08:21 +0900 (Sun, 11 Aug 2013)

  New Revision: 42515

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

  Log:
    * lib/rexml/parsers/baseparser.rb
      (REXML::Parsers::BaseParser#pull_event): Support optional NDATA
      in parameter entity declaration.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rexml/parsers/baseparser.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42514)
+++ ChangeLog	(revision 42515)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Aug 11 18:07:39 2013  Kouhei Sutou  <kou@c...>
+
+	* lib/rexml/parsers/baseparser.rb
+	  (REXML::Parsers::BaseParser#pull_event): Support optional NDATA
+	  in parameter entity declaration.
+
 Sun Aug 11 17:54:07 2013  Kouhei Sutou  <kou@c...>
 
 	* NEWS (REXML::Parsers::SAX2Parser): Add about this change.
Index: lib/rexml/parsers/baseparser.rb
===================================================================
--- lib/rexml/parsers/baseparser.rb	(revision 42514)
+++ lib/rexml/parsers/baseparser.rb	(revision 42515)
@@ -283,7 +283,8 @@ module REXML https://github.com/ruby/ruby/blob/trunk/lib/rexml/parsers/baseparser.rb#L283
               # External reference
               match[3] = match[3][1..-2] # PUBID
               match[4] = match[4][1..-2] # HREF
-              # match is [ :entity, name, PUBLIC, pubid, href ]
+              match.delete_at(5) if match.size > 5 # Chop out NDATA decl
+              # match is [ :entity, name, PUBLIC, pubid, href(, ndata)? ]
             else
               match[2] = match[2][1..-2]
               match.pop if match.size == 4

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