Changeset 1822

Timestamp:

05/31/07 22:38:50 (2 years ago)

Author:

nahi

Message:

• now you can access to HTTP-Cookies with SOAP::RPC::SOAPlet.cookies from servant implementation (MT-safe). added cookies client / server sample. closes #321.
  

Files:

• trunk/lib/soap/mapping/mapping.rb (modified) (2 diffs)
• trunk/lib/soap/rpc/cgistub.rb (modified) (3 diffs)
• trunk/lib/soap/rpc/soaplet.rb (modified) (4 diffs)
• trunk/lib/soap/streamHandler.rb (modified) (1 diff)
• trunk/sample/cookies (added)
• trunk/sample/cookies/calc.rb (added)
• trunk/sample/cookies/client.rb (added)
• trunk/sample/cookies/server.rb (added)

trunk/lib/soap/mapping/mapping.rb

@@ -506 +506 @@
-
-  class << Mapping
+  public
+
+    def protect_threadvars(*symbols)
+      backup = {}
+      begin
+        symbols.each do |sym|
+          backup[sym] = Thread.current[sym]
+        end
+        yield
+      ensure
+        symbols.each do |sym|
+          Thread.current[sym] = backup[sym]
+        end
+      end
+    end
+
-  private
-
@@ -524 +540 @@
-    end
-
-    def protect_threadvars(*symbols)
-      backup = {}
-      begin
-        symbols.each do |sym|
-          backup[sym] = Thread.current[sym]
-        end
-        yield
-      ensure
-        symbols.each do |sym|
-          Thread.current[sym] = backup[sym]
-        end
-      end
-    end
-
-    def add_md_ary(md_ary, ary, indices, registry)
-      for idx in 0..(ary.size - 1)

trunk/lib/soap/rpc/cgistub.rb

@@ -35 +35 @@
-
-    def meta_vars; end
+
+    def cookies; end
-  end
-
@@ -54 +56 @@
-      }
-    end
+
+    def cookies
+      if cookie = ENV['HTTP_Cookie'] || ENV['Cookie']
+        [WEBrick::Cookie.parse(cookie)]
+      end
+    end
-  end
-
@@ -72 +80 @@
-        'HTTP_SOAPACTION' => @request.env['HTTP_SOAPAction']
-      }
+    end
+
+    def cookies
+      if cookie = @request.env['HTTP_Cookie'] || @request.env['Cookie']
+        [WEBrick::Cookie.parse(cookie)]
+      end
-    end
-  end

trunk/lib/soap/rpc/soaplet.rb

@@ -86 +86 @@
-      setup_req(conn_data, req)
-      @router.external_ces = @options[:external_ces]
-
-
+
+
+
+
+
-    rescue Exception => e
-      conn_data = @router.create_fault_response(e)
@@ -100 +103 @@
-      logger.debug { "SOAP response: " + res.body } if logger
-    end
+  end
+
+  def self.cookies
+    if var = Thread.current[:SOAPlet]
+      var[:Cookies]
+    else
+      nil
+    end
+  end
+
+  def self.cookies=(cookies)
+    var = Thread.current[:SOAPlet] = {}
+    var[:Cookies] = cookies
-  end
-
@@ -115 +131 @@
-
-  def setup_res(conn_data, req, res)
+    res['content-type'] = conn_data.send_contenttype
+    if cookies = SOAPlet.cookies
+      res['set-cookie'] = cookies.to_s
+    end
-    if conn_data.is_nocontent
-      res.status = WEBrick::HTTPStatus::RC_ACCEPTED
@@ -120 +140 @@
-      return
-    end
-    res['content-type'] = conn_data.send_contenttype
-    if conn_data.is_fault
-      res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR

trunk/lib/soap/streamHandler.rb

@@ -137 +137 @@
-  def send(endpoint_url, conn_data, soapaction = nil, charset = @charset)
-    conn_data.soapaction ||= soapaction # for backward conpatibility
-
+
+
+
-  end
-