From fedb5e50829e6dfad30ca18ea525c812eccbec70 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 22 Jan 2013 23:52:14 +0000
Subject: ignore normal Rack response at request-time hijack

Once a connection is hijacked, we ignore it completely and leave
the connection at the mercy of the application.
---
 lib/unicorn/http_request.rb | 8 ++++++++
 lib/unicorn/http_server.rb  | 2 ++
 2 files changed, 10 insertions(+)

(limited to 'lib')

diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 3bc64ed..3795b3b 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -106,6 +106,10 @@ class Unicorn::HttpParser
     RACK_HIJACK = "rack.hijack".freeze
     RACK_HIJACK_IO = "rack.hijack_io".freeze
 
+    def hijacked?
+      env.include?(RACK_HIJACK_IO)
+    end
+
     def hijack_setup(e, socket)
       e[RACK_HIJACK] = proc { e[RACK_HIJACK_IO] ||= socket }
     end
@@ -113,5 +117,9 @@ class Unicorn::HttpParser
     # old Rack, do nothing.
     def hijack_setup(e, _)
     end
+
+    def hijacked?
+      false
+    end
   end
 end
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 2d8e4e1..cc0a705 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -550,11 +550,13 @@ class Unicorn::HttpServer
   # in 3 easy steps: read request, call app, write app response
   def process_client(client)
     status, headers, body = @app.call(env = @request.read(client))
+    return if @request.hijacked?
 
     if 100 == status.to_i
       client.write(expect_100_response)
       env.delete(Unicorn::Const::HTTP_EXPECT)
       status, headers, body = @app.call(env)
+      return if @request.hijacked?
     end
     @request.headers? or headers = nil
     http_response_write(client, status, headers, body,
-- 
cgit v1.2.3-24-ge0c7