shyouhei	2008-06-08 05:10:34 +0900 (Sun, 08 Jun 2008)

  New Revision: 16980

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/uri/common.rb
    branches/ruby_1_8_5/version.h

  Log:
    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]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16980&r2=16979&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16980&r2=16979&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/uri/common.rb?r1=16980&r2=16979&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16979)
+++ ruby_1_8_5/ChangeLog	(revision 16980)
@@ -1,3 +1,9 @@
+Sun Jun  8 05:09:29 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* lib/cgi.rb (read_multipart): exclude blanks from header values.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16979)
+++ ruby_1_8_5/version.h	(revision 16980)
@@ -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
Index: ruby_1_8_5/lib/uri/common.rb
===================================================================
--- ruby_1_8_5/lib/uri/common.rb	(revision 16979)
+++ ruby_1_8_5/lib/uri/common.rb	(revision 16980)
@@ -110,7 +110,7 @@
       SERVER = "(?:#{USERINFO}@)?#{HOSTPORT}"
       # reg_name      = 1*( unreserved | escaped | "$" | "," |
       #                     ";" | ":" | "@" | "&" | "=" | "+" )
-      REG_NAME = "(?:[#{UNRESERVED}$,;+@&=+]|#{ESCAPED})+"
+      REG_NAME = "(?:[#{UNRESERVED}$,;:@&=+]|#{ESCAPED})+"
       # authority     = server | reg_name
       AUTHORITY = "(?:#{SERVER}|#{REG_NAME})"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/