* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]

* test/xmlrpc/test_cookie.rb: add a test for the above fix.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
index 726945ea3..7cf2ed87a 100644
--- a/lib/xmlrpc/client.rb
+++ b/lib/xmlrpc/client.rb
@@ -565,8 +565,13 @@ module XMLRPC
         raise "Wrong size. Was #{data.size}, should be #{expected}"
       end
 
-      c = resp["Set-Cookie"]
-      @cookie = c if c
+      set_cookies = resp.get_fields("Set-Cookie")
+      if set_cookies and !set_cookies.empty?
+        @cookie = set_cookies.collect do |set_cookie|
+          cookie = WEBrick::Cookie.parse_set_cookie(set_cookie)
+          WEBrick::Cookie.new(cookie.name, cookie.value).to_s
+        end.join("; ")
+      end
 
       return data
     end