naruse	2010-12-06 10:41:10 +0900 (Mon, 06 Dec 2010)

  New Revision: 30091

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

  Log:
    * lib/uri/common.rb (URI::Parser#initialize_pattern):
      refix for restrict the pattern.

  Modified files:
    trunk/ChangeLog
    trunk/lib/uri/common.rb
    trunk/test/uri/test_ldap.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30090)
+++ ChangeLog	(revision 30091)
@@ -1,3 +1,8 @@
+Mon Dec  6 10:39:54 2010  NARUSE, Yui  <naruse@r...>
+
+	* lib/uri/common.rb (URI::Parser#initialize_pattern):
+	  refix for restrict the pattern.
+
 Mon Dec  6 09:45:11 2010  Eric Hodel  <drbrain@s...>
 
 	* ext/openssl (OpenSSL): add toplevel documentation
Index: lib/uri/common.rb
===================================================================
--- lib/uri/common.rb	(revision 30090)
+++ lib/uri/common.rb	(revision 30091)
@@ -260,7 +260,7 @@
       # hostname      = *( domainlabel "." ) toplabel [ "." ]
       # reg-name      = *( unreserved / pct-encoded / sub-delims ) # RFC3986
       unless hostname
-	ret[:HOSTNAME] = hostname = "(?:[a-zA-Z0-9\\-._~!$&'()*+,;=]|%\\h\\h)*"
+	ret[:HOSTNAME] = hostname = "(?:[a-zA-Z0-9\\-.]|%\\h\\h)+"
       end
 
       # RFC 2373, APPENDIX B:
Index: test/uri/test_ldap.rb
===================================================================
--- test/uri/test_ldap.rb	(revision 30090)
+++ test/uri/test_ldap.rb	(revision 30091)
@@ -36,7 +36,7 @@
     assert_equal(nil, u.extensions)
 
     # from RFC2255, section 6.
-    urls = {
+    {
       'ldap:///o=University%20of%20Michigan,c=US' =>
       ['ldap', nil, URI::LDAP::DEFAULT_PORT,
 	'o=University%20of%20Michigan,c=US',

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