Inline and remove the HttpRequest#reset method

These potentially leaves an open file handle around until the
next request hits the process, but this makes the common case
faster.

3 files changed, 8 insertions, 14 deletions

diff --git a/lib/unicorn.rb b/lib/unicorn.rb
index 0b8ac5e..bcd0a91 100644
--- a/lib/unicorn.rb
+++ b/lib/unicorn.rb
@@ -430,8 +430,6 @@ module Unicorn
       client.close rescue nil
       logger.error "Read error: #{e.inspect}"
       logger.error e.backtrace.join("\n")
-    ensure
-      @request.reset
     end
 
     # gets rid of stuff the worker has no business keeping track of
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index e786d79..c356576 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -38,17 +38,6 @@ module Unicorn
 
     def initialize(logger)
       @logger = logger
-      reset
-    end
-
-    def reset
-      input = PARAMS[Const::RACK_INPUT]
-      if input != NULL_IO
-        input.close rescue nil
-        input.close! rescue nil
-      end
-      PARAMS.clear
-      PARSER.reset
     end
 
     # Does the majority of the IO processing.  It has been written in
@@ -65,6 +54,14 @@ module Unicorn
     # This does minimal exception trapping and it is up to the caller
     # to handle any socket errors (e.g. user aborted upload).
     def read(socket)
+      # reset the parser
+      unless NULL_IO == (input = PARAMS[Const::RACK_INPUT]) # unlikely
+        input.close rescue nil
+        input.close! rescue nil
+      end
+      PARAMS.clear
+      PARSER.reset
+
       # From http://www.ietf.org/rfc/rfc3875:
       # "Script authors should be aware that the REMOTE_ADDR and
       #  REMOTE_HOST meta-variables (see sections 4.1.8 and 4.1.9)
diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb
index a6cb13c..0bfff7d 100644
--- a/test/unit/test_request.rb
+++ b/test/unit/test_request.rb
@@ -77,7 +77,6 @@ class RequestTest < Test::Unit::TestCase
       client = MockRequest.new("GET #{abs_uri} HTTP/1.1\r\n" \
                                "Host: foo\r\n\r\n")
       assert_raises(HttpParserError) { @request.read(client) }
-      @request.reset
     end
   end