naruse	2012-02-23 14:45:08 +0900 (Thu, 23 Feb 2012)

  New Revision: 34761

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34761

  Log:
    merge revision(s) 34214:
    
    * lib/uri/common.rb (URI::Parser#initialize_regexp):
      use \A \z instead of ^ $. [Bug #5843]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/uri/common.rb
    branches/ruby_1_9_3/test/uri/test_generic.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34760)
+++ ruby_1_9_3/ChangeLog	(revision 34761)
@@ -1,3 +1,8 @@
+Thu Feb 23 14:44:36 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/uri/common.rb (URI::Parser#initialize_regexp):
+	  use \A \z instead of ^ $. [Bug #5843]
+
 Thu Feb 23 08:08:23 2012  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_uchmod): typo.  [Bug#5671] [ruby-dev:44898]
Index: ruby_1_9_3/lib/uri/common.rb
===================================================================
--- ruby_1_9_3/lib/uri/common.rb	(revision 34760)
+++ ruby_1_9_3/lib/uri/common.rb	(revision 34761)
@@ -514,16 +514,16 @@
       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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34760)
+++ ruby_1_9_3/version.h	(revision 34761)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 140
+#define RUBY_PATCHLEVEL 141
 
 #define RUBY_RELEASE_DATE "2012-02-23"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/uri/test_generic.rb
===================================================================
--- ruby_1_9_3/test/uri/test_generic.rb	(revision 34760)
+++ ruby_1_9_3/test/uri/test_generic.rb	(revision 34761)
@@ -692,6 +692,7 @@
 
     uri = URI.parse('http://example.com')
     assert_raise(URI::InvalidURIError) { uri.password = 'bar' }
+    assert_raise(URI::InvalidComponentError) { uri.query = "foo\nbar" }
     uri.userinfo = 'foo:bar'
     assert_equal('http://foo:bar@e...', uri.to_s)
     assert_raise(URI::InvalidURIError) { uri.registry = 'bar' }

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