From 8ce88a3756b110e5e3001f640ebd53a5b11d8c65 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 8 Mar 2017 00:52:23 +0000 Subject: revert signature change to HttpServer#process_client We can force kgio_tryaccept to return an internal class for TCP objects by subclassing Kgio::TCPServer. This avoids breakage in any unfortunate projects which depend on our undocumented internal APIs, such as gctools --- lib/unicorn/http_server.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/unicorn/http_server.rb') diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 2aa1072..c2086cb 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -558,8 +558,8 @@ class Unicorn::HttpServer # once a client is accepted, it is processed in its entirety here # in 3 easy steps: read request, call app, write app response - def process_client(client, listener) - status, headers, body = @app.call(env = @request.read(client, listener)) + def process_client(client) + status, headers, body = @app.call(env = @request.read(client)) begin return if @request.hijacked? @@ -655,7 +655,7 @@ class Unicorn::HttpServer # Unicorn::Worker#kgio_tryaccept is not like accept(2) at all, # but that will return false if client = sock.kgio_tryaccept - process_client(client, sock) + process_client(client) nr += 1 worker.tick = time_now.to_i end -- cgit v1.2.3-24-ge0c7