From f4b455e5fc59782a491b577f98c244f197e6da33 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 19 Apr 2010 21:42:04 +0000 Subject: merge revision(s) 26169: git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/uri/generic.rb | 1 + version.h | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7522a30a65..e3ecea510a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 20 06:40:53 2010 Marc-Andre Lafortune + + * 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 * lib/net/http.rb (HTTPGenericRequest#send_request_with_body_stream): diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index d907e0b4b2..c855d60610 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -1054,6 +1054,7 @@ module URI end def eql?(oth) + self.class == oth.class && self.component_ary.eql?(oth.component_ary) end diff --git a/version.h b/version.h index 17f280af64..64beb54932 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit v1.2.3