diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 20:10:34 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 20:10:34 +0000 |
commit | 067e3003315c9d7a649cd075e3d824adf1353f4f (patch) | |
tree | 4b5a3b17599fc8174894acdbd21d1ae404cbdbb6 | |
parent | 5a0aa734b33e7107dcca48fb75c162d7bae16cd7 (diff) |
merge revision(s) 14178:
* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME
regular expression. a patch from Ueda Satoshi
<s-ueda AT livedoor.jp>. [ruby-dev:32514]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/uri/common.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jun 8 05:09:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME + regular expression. a patch from Ueda Satoshi + <s-ueda AT livedoor.jp>. [ruby-dev:32514] + Sun Jun 8 05:05:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/cgi.rb (read_multipart): exclude blanks from header values. diff --git a/lib/uri/common.rb b/lib/uri/common.rb index 7a5207a315..9f58cdf918 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -110,7 +110,7 @@ module URI SERVER = "(?:#{USERINFO}@)?#{HOSTPORT}" # reg_name = 1*( unreserved | escaped | "$" | "," | # ";" | ":" | "@" | "&" | "=" | "+" ) - REG_NAME = "(?:[#{UNRESERVED}$,;+@&=+]|#{ESCAPED})+" + REG_NAME = "(?:[#{UNRESERVED}$,;:@&=+]|#{ESCAPED})+" # authority = server | reg_name AUTHORITY = "(?:#{SERVER}|#{REG_NAME})" @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 157 +#define RUBY_PATCHLEVEL 158 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |