From 6da1aae4f04662900bea4b816f0c6dd195ea9ee5 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 8 May 2015 22:46:59 +0000 Subject: avoid excess allocations for rack.hijack support Proc object allocation is not cheap, so avoid doing it and allow Yahns::HttpClient to be assigned as the env["rack.hijack"] callback for Rack applications. --- lib/yahns/http_client.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb index 164cac9..a0fd5a4 100644 --- a/lib/yahns/http_client.rb +++ b/lib/yahns/http_client.rb @@ -208,7 +208,7 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc: # check_client_connection if input env[REMOTE_ADDR] = @kgio_addr - env[RACK_HIJACK] = hijack_proc(env) + env[RACK_HIJACK] = self env[RACK_INPUT] = input if k.check_client_connection && @hs.headers? @@ -228,14 +228,6 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc: http_response_write(status, headers, body) end - # this is the env["rack.hijack"] callback exposed to the Rack app - def hijack_proc(env) - proc do - hijack_cleanup - env[RACK_HIJACK_IO] = self - end - end - # called automatically by kgio_write def kgio_wait_writable(timeout = self.class.client_timeout) super timeout @@ -268,6 +260,12 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc: @input = nil # keep env["rack.input"] accessible, though end + # this is the env["rack.hijack"] callback exposed to the Rack app + def call + hijack_cleanup + @hs.env[RACK_HIJACK_IO] = self + end + def response_hijacked(fn) hijack_cleanup fn.call(self) -- cgit v1.2.3-24-ge0c7