shyouhei	2010-04-20 06:42:04 +0900 (Tue, 20 Apr 2010)

  New Revision: 27406

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

  Log:
    merge revision(s) 26169:

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/uri/generic.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 27405)
+++ ruby_1_8_7/ChangeLog	(revision 27406)
@@ -1,3 +1,8 @@
+Tue Apr 20 06:40:53 2010  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/uri/generic.rb (URI::Generic::eql): Check the class of the
+	  compared object. Based on a patch by Peter McLain [ruby-core:27019]
+
 Fri Apr  2 03:27:22 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* lib/net/http.rb (HTTPGenericRequest#send_request_with_body_stream):
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 27405)
+++ ruby_1_8_7/version.h	(revision 27406)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-04-17"
+#define RUBY_RELEASE_DATE "2010-04-19"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100417
-#define RUBY_PATCHLEVEL 251
+#define RUBY_RELEASE_CODE 20100419
+#define RUBY_PATCHLEVEL 252
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/lib/uri/generic.rb
===================================================================
--- ruby_1_8_7/lib/uri/generic.rb	(revision 27405)
+++ ruby_1_8_7/lib/uri/generic.rb	(revision 27406)
@@ -1054,6 +1054,7 @@
     end
 
     def eql?(oth)
+      self.class == oth.class &&
       self.component_ary.eql?(oth.component_ary)
     end
 

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