summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 20:11:00 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 20:11:00 +0000
commit03d22a22df852e464d0ec8bb9bfaebdecfcbdadd (patch)
treeb849227badabf55f6904ce828542a62b7a5ae01d
parent12de99909b34fd885590748667769ecf6ccb3bf7 (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_6@16982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/uri/common.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index f74f0eb..af6aaf2 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})"
diff --git a/version.h b/version.h
index c6674c5..70d7236 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 157
+#define RUBY_PATCHLEVEL 158
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8