shyouhei	2008-07-17 02:07:44 +0900 (Thu, 17 Jul 2008)

  New Revision: 18091

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

  Log:
    merge revision(s) 18036:
    * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
      webrick/cookie.  [ ruby-Bugs-21139 ]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/xmlrpc/client.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 18090)
+++ ruby_1_8_7/ChangeLog	(revision 18091)
@@ -1,3 +1,8 @@
+Thu Jul 17 02:05:10 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
+	  webrick/cookie.  [ ruby-Bugs-21139 ]
+
 Thu Jul 17 01:38:31 2008  Yusuke Endoh  <mame@t...>
 
 	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.  [ruby-core:17713]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 18090)
+++ ruby_1_8_7/version.h	(revision 18091)
@@ -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
Index: ruby_1_8_7/lib/xmlrpc/client.rb
===================================================================
--- ruby_1_8_7/lib/xmlrpc/client.rb	(revision 18090)
+++ ruby_1_8_7/lib/xmlrpc/client.rb	(revision 18091)
@@ -567,6 +567,7 @@
 
       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

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