diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-10 03:01:56 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-10 03:01:56 +0000 |
| commit | 6b2c0ca25dbf76b5e673fec3392a290ce210d483 (patch) | |
| tree | fc869d14eaf94e912276da4d59c9addb1321e8b9 | |
| parent | b729f2da308e9f6ec74299c39ca1bfbb19f5c804 (diff) | |
| download | ruby-6b2c0ca25dbf76b5e673fec3392a290ce210d483.tar.gz | |
* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::SYSTEM):
Fix loose "head" match regular expression. It doesn't cause any
problem in the current code but it should be fixed because readers
may confuse it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Aug 10 12:00:45 2013 Kouhei Sutou <kou@cozmixng.org> + + * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::SYSTEM): + Fix loose "head" match regular expression. It doesn't cause any + problem in the current code but it should be fixed because readers + may confuse it. + Sat Aug 10 11:58:24 2013 Kouhei Sutou <kou@cozmixng.org> * test/rexml/parse/test_notation_declaration.rb (#test_system_public): diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index d6ea4f7e23..04a23f4428 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -78,7 +78,7 @@ module REXML ATTLISTDECL_PATTERN = /^\s*<!ATTLIST\s+#{NAME}(?:#{ATTDEF})*\s*>/um NOTATIONDECL_START = /^\s*<!NOTATION/um PUBLIC = /\A\s*<!NOTATION\s+(\w[\-\w]*)\s+(PUBLIC)\s+(["'])(.*?)\3(?:\s+(["'])(.*?)\5)?\s*>/um - SYSTEM = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(SYSTEM)\s+(["'])(.*?)\3\s*>/um + SYSTEM = /\A\s*<!NOTATION\s+(\w[\-\w]*)\s+(SYSTEM)\s+(["'])(.*?)\3\s*>/um TEXT_PATTERN = /\A([^<]*)/um |