From f770e5ba01bfcbc3c9f5c3eb12b28abdf6849f15 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Wed, 3 Aug 2016 02:57:14 +0000
Subject: response: reduce stack overhead for parameter passing

This makes it easier to add more parameters to
http_response_write and simplifies current callers.
---
 lib/yahns/http_client.rb   | 20 ++++++++++----------
 lib/yahns/http_response.rb |  7 ++++---
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index 873dd73..7a1bac1 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -191,9 +191,9 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     else # :lazy, false
       env = @hs.env
       hdr_only = env['REQUEST_METHOD'] == 'HEAD'.freeze
-      status, headers, body = k.app.call(env)
-      return :ignore if app_hijacked?(env, body)
-      http_response_write(status, headers, body, hdr_only)
+      res = k.app.call(env)
+      return :ignore if app_hijacked?(env, res)
+      http_response_write(res, hdr_only)
     end
   end
 
@@ -224,15 +224,15 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
 
     hdr_only = env['REQUEST_METHOD'] == 'HEAD'.freeze
     # run the rack app
-    status, headers, body = k.app.call(env)
-    return :ignore if app_hijacked?(env, body)
-    if status.to_i == 100
+    res = k.app.call(env)
+    return :ignore if app_hijacked?(env, res)
+    if res[0].to_i == 100
       rv = http_100_response(env) and return rv
-      status, headers, body = k.app.call(env)
+      res = k.app.call(env)
     end
 
     # this returns :wait_readable, :wait_writable, :ignore, or nil:
-    http_response_write(status, headers, body, hdr_only)
+    http_response_write(res, hdr_only)
   end
 
   # called automatically by kgio_write
@@ -308,9 +308,9 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     return # always drop the connection on uncaught errors
   end
 
-  def app_hijacked?(env, body)
+  def app_hijacked?(env, res)
     return false unless env.include?('rack.hijack_io'.freeze)
-    body.close if body.respond_to?(:close)
+    res[2].close if res && res[2].respond_to?(:close)
     true
   end
 
diff --git a/lib/yahns/http_response.rb b/lib/yahns/http_response.rb
index f2d9c62..b157ee4 100644
--- a/lib/yahns/http_response.rb
+++ b/lib/yahns/http_response.rb
@@ -8,8 +8,8 @@ require_relative 'wbuf_str'
 # Writes a Rack response to your client using the HTTP/1.1 specification.
 # You use it by simply doing:
 #
-#   status, headers, body = rack_app.call(env)
-#   http_response_write(status, headers, body, env['REQUEST_METHOD']=='HEAD')
+#   res = rack_app.call(env)
+#   http_response_write(res, env['REQUEST_METHOD']=='HEAD')
 #
 # Most header correctness (including Content-Length and Content-Type)
 # is the job of Rack, with the exception of the "Date" header.
@@ -120,7 +120,8 @@ module Yahns::HttpResponse # :nodoc:
 
   # writes the rack_response to socket as an HTTP response
   # returns :wait_readable, :wait_writable, :forget, or nil
-  def http_response_write(status, headers, body, hdr_only)
+  def http_response_write(res, hdr_only)
+    status, headers, body = res
     offset = 0
     count = hijack = nil
     k = self.class
-- 
cgit v1.2.3-24-ge0c7