summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-10 09:31:55 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-10 09:31:55 +0000
commit39a6f7e34e5657cfa775c1108f7efecf196128ea (patch)
treebff91fdd4190d60adb86fc4701697678c8a3687c
parentee1717dc3e0b5409634e86870464fb9c5c32dbd2 (diff)
* 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@14178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/uri/common.rb2
-rw-r--r--version.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9953ca6fc9..899456cfbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 10 18:28:06 2007 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 Dec 9 12:39:01 2007 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 f74f0eb2e1..af6aaf26fb 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 346bcd8a32..14a3353805 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-12-09"
+#define RUBY_RELEASE_DATE "2007-12-10"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071209
+#define RUBY_RELEASE_CODE 20071210
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];