Merge 2e88d19 into a273967

lib/reel/connection.rb

@@ -139,7 +139,7 @@ def respond(response, headers_or_body = {}, body = nil)
       # The client disconnected early
       @keepalive = false
     ensure
-      if @keepalive
+      if @keepalive || body.nil?
         reset_request(:header)
       else
         @socket.close unless @socket.closed?

lib/reel/rack_worker.rb

@@ -66,11 +66,21 @@ def handle(connection)
         when WebSocket
           handle_websocket(request, connection)
         end
+        return if request.hijacked?
       end
     end
 
     def handle_request(request, connection)
       status, headers, body_parts = @app.call(request_env(request, connection))
+      return if request.hijacked?
+
+      # XXX delete is not actually part of the Rack SPEC...
+      if hijacking_callback = headers.delete('rack.hijack')
+        connection.respond Response.new(status, headers)
+        hijacking_callback.call(request.hijack)
+        return
+      end
+
       body, is_stream = response_body(body_parts)
       connection.respond (is_stream ? StreamResponse : Response).new(status, headers, body)
     end
@@ -119,6 +129,10 @@ def env request
       env[REQUEST_METHOD] = request.method
       env[PATH_INFO]      = request.path
       env[QUERY_STRING]   = request.query_string || ''
+      env["rack.hijack?"] = true
+      env["rack.hijack"]  = proc do
+        env["rack.hijack_io"] ||= request.hijack
+      end
 
       (_ = request.headers.delete CONTENT_TYPE_ORIG) && (env[CONTENT_TYPE] = _)
       (_ = request.headers.delete CONTENT_LENGTH_ORIG) && (env[CONTENT_LENGTH] = _)

lib/reel/request.rb

@@ -35,8 +35,17 @@ def self.read(connection)
 
     def initialize(http_parser, connection = nil)
       @http_parser, @connection = http_parser, connection
+      @hijacked = false
     end
 
+    def hijack
+      @hijacked = true
+      @connection.detach
+      @connection.socket
+    end
+
+    def hijacked?; @hijacked; end
+
     def body
       @body ||= begin
         raise "no connection given" unless @connection