diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-23 05:45:08 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-23 05:45:08 +0000 |
commit | 6cd700f3e9be25e270d11840b3d658ae35dcb0ca (patch) | |
tree | 9e8bcbe0b26b9bb97580399ec2c99ae3ec81dfaa /lib | |
parent | 9efce27a62e2ef3c5940d3ee407e5a57e860bc66 (diff) |
merge revision(s) 34214:
* lib/uri/common.rb (URI::Parser#initialize_regexp):
use \A \z instead of ^ $. [Bug #5843]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/uri/common.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb index f279a0cbc9..288bbe191e 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -514,16 +514,16 @@ module URI ret[:UNSAFE] = Regexp.new("[^#{pattern[:UNRESERVED]}#{pattern[:RESERVED]}]") # for Generic#initialize - ret[:SCHEME] = Regexp.new("^#{pattern[:SCHEME]}$") - ret[:USERINFO] = Regexp.new("^#{pattern[:USERINFO]}$") - ret[:HOST] = Regexp.new("^#{pattern[:HOST]}$") - ret[:PORT] = Regexp.new("^#{pattern[:PORT]}$") - ret[:OPAQUE] = Regexp.new("^#{pattern[:OPAQUE_PART]}$") - ret[:REGISTRY] = Regexp.new("^#{pattern[:REG_NAME]}$") - ret[:ABS_PATH] = Regexp.new("^#{pattern[:ABS_PATH]}$") - ret[:REL_PATH] = Regexp.new("^#{pattern[:REL_PATH]}$") - ret[:QUERY] = Regexp.new("^#{pattern[:QUERY]}$") - ret[:FRAGMENT] = Regexp.new("^#{pattern[:FRAGMENT]}$") + ret[:SCHEME] = Regexp.new("\\A#{pattern[:SCHEME]}\\z") + ret[:USERINFO] = Regexp.new("\\A#{pattern[:USERINFO]}\\z") + ret[:HOST] = Regexp.new("\\A#{pattern[:HOST]}\\z") + ret[:PORT] = Regexp.new("\\A#{pattern[:PORT]}\\z") + ret[:OPAQUE] = Regexp.new("\\A#{pattern[:OPAQUE_PART]}\\z") + ret[:REGISTRY] = Regexp.new("\\A#{pattern[:REG_NAME]}\\z") + ret[:ABS_PATH] = Regexp.new("\\A#{pattern[:ABS_PATH]}\\z") + ret[:REL_PATH] = Regexp.new("\\A#{pattern[:REL_PATH]}\\z") + ret[:QUERY] = Regexp.new("\\A#{pattern[:QUERY]}\\z") + ret[:FRAGMENT] = Regexp.new("\\A#{pattern[:FRAGMENT]}\\z") ret end |