From c9d0983a8107f2598648b72ba9eff1805c2f6fa5 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 16 Jul 2008 17:07:44 +0000 Subject: merge revision(s) 18036: * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires webrick/cookie. [ ruby-Bugs-21139 ] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/xmlrpc/client.rb | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f03aa15d1e..423da3a4d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 17 02:05:10 2008 Nobuyoshi Nakada + + * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires + webrick/cookie. [ ruby-Bugs-21139 ] + Thu Jul 17 01:38:31 2008 Yusuke Endoh * ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo. [ruby-core:17713] diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb index 7cf2ed87ac..278855e01d 100644 --- a/lib/xmlrpc/client.rb +++ b/lib/xmlrpc/client.rb @@ -567,6 +567,7 @@ module XMLRPC set_cookies = resp.get_fields("Set-Cookie") if set_cookies and !set_cookies.empty? + require 'webrick/cookie' @cookie = set_cookies.collect do |set_cookie| cookie = WEBrick::Cookie.parse_set_cookie(set_cookie) WEBrick::Cookie.new(cookie.name, cookie.value).to_s diff --git a/version.h b/version.h index fdb3006e3e..fa8ba720ee 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-07-17" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080717 -#define RUBY_PATCHLEVEL 59 +#define RUBY_PATCHLEVEL 60 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3