boourns-unicorn 4.4.3 → 4.4.4

data/lib/unicorn/const.rb

@@ -29,10 +29,10 @@ module Unicorn::Const
 
   # :stopdoc:
   # common errors we'll send back
-  ERROR_400_RESPONSE = "HTTP/1.1 400 Bad Request\r\n\r\n"
-  ERROR_414_RESPONSE = "HTTP/1.1 414 Request-URI Too Long\r\n\r\n"
-  ERROR_413_RESPONSE = "HTTP/1.1 413 Request Entity Too Large\r\n\r\n"
-  ERROR_500_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\n\r\n"
+  ERROR_400_RESPONSE = "400 Bad Request\r\n\r\n"
+  ERROR_414_RESPONSE = "414 Request-URI Too Long\r\n\r\n"
+  ERROR_413_RESPONSE = "413 Request Entity Too Large\r\n\r\n"
+  ERROR_500_RESPONSE = "500 Internal Server Error\r\n\r\n"
 
   EXPECT_100_RESPONSE = "HTTP/1.1 100 Continue\r\n\r\n"
   EXPECT_100_RESPONSE_SUFFIXED = "100 Continue\r\n\r\nHTTP/1.1 "

data/lib/unicorn/http_request.rb

@@ -22,6 +22,8 @@ class Unicorn::HttpParser
 
   NULL_IO = StringIO.new("")
 
+  attr_accessor :response_start_sent
+
   # :stopdoc:
   # A frozen format for this is about 15% faster
   REMOTE_ADDR = 'REMOTE_ADDR'.freeze
@@ -83,7 +85,10 @@ class Unicorn::HttpParser
 
     # detect if the socket is valid by writing a partial response:
     if @@check_client_connection && headers?
+      @response_start_sent = true
       Unicorn::Const::HTTP_RESPONSE_START.each { |c| socket.write(c) }
+    else
+      @response_start_sent = false
     end
 
     e[RACK_INPUT] = 0 == content_length ?

data/lib/unicorn/http_response.rb

@@ -17,14 +17,11 @@ module Unicorn::HttpResponse
   }
   CRLF = "\r\n"
 
-  def http_response_start
-    Unicorn::HttpParser.check_client_connection ? '' : 'HTTP/1.1 '
-  end
-
   # writes the rack_response to socket as an HTTP response
-  def http_response_write(socket, status, headers, body)
+  def http_response_write(socket, status, headers, body, response_start_sent=false)
     status = CODES[status.to_i] || status
 
+    http_response_start = response_start_sent ? '' : 'HTTP/1.1 '
     if headers
       buf = "#{http_response_start}#{status}\r\n" \
             "Date: #{httpdate}\r\n" \

data/lib/unicorn/http_server.rb

@@ -533,13 +533,14 @@ class Unicorn::HttpServer
       Unicorn.log_error(@logger, "app error", e)
       Unicorn::Const::ERROR_500_RESPONSE
     end
+    msg = 'HTTP/1.1 ' + msg unless @request.response_start_sent
     client.kgio_trywrite(msg)
     client.close
     rescue
   end
 
   def expect_100_response
-    if Unicorn::HttpRequest.check_client_connection
+    if @request.response_start_sent
       Unicorn::Const::EXPECT_100_RESPONSE_SUFFIXED
     else
       Unicorn::Const::EXPECT_100_RESPONSE
@@ -549,6 +550,7 @@ 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)
+    @request.response_start_sent = false
     status, headers, body = @app.call(env = @request.read(client))
 
     if 100 == status.to_i
@@ -557,7 +559,7 @@ class Unicorn::HttpServer
       status, headers, body = @app.call(env)
     end
     @request.headers? or headers = nil
-    http_response_write(client, status, headers, body)
+    http_response_write(client, status, headers, body, @request.response_start_sent)
     client.shutdown # in case of fork() in Rack app
     client.close # flush and uncork socket immediately, no keepalive
   rescue => e

data/unicorn.gemspec

@@ -14,7 +14,7 @@ end.compact
 
 Gem::Specification.new do |s|
   s.name = %q{boourns-unicorn}
-  s.version = "4.4.3"
+  s.version = "4.4.4"
   s.authors = ["#{name} hackers"]
   s.summary = summary
   s.date = Time.now.utc.strftime('%Y-%m-%d')

metadata

@@ -3,7 +3,7 @@ name: !binary |-
   Ym9vdXJucy11bmljb3Ju
 version: !ruby/object:Gem::Version
   version: !binary |-
-    NC40LjM=
+    NC40LjQ=
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFjaw==
-  requirement: &70200646381740 !ruby/object:Gem::Requirement
+  requirement: &70186187391540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,11 +24,11 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200646381740
+  version_requirements: *70186187391540
 - !ruby/object:Gem::Dependency
   name: !binary |-
     a2dpbw==
-  requirement: &70200646380700 !ruby/object:Gem::Requirement
+  requirement: &70186187391020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -38,11 +38,11 @@ dependencies:
           Mi42
   type: :runtime
   prerelease: false
-  version_requirements: *70200646380700
+  version_requirements: *70186187391020
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFpbmRyb3Bz
-  requirement: &70200646379220 !ruby/object:Gem::Requirement
+  requirement: &70186187439620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -52,11 +52,11 @@ dependencies:
           MC43
   type: :runtime
   prerelease: false
-  version_requirements: *70200646379220
+  version_requirements: *70186187439620
 - !ruby/object:Gem::Dependency
   name: !binary |-
     aXNvbGF0ZQ==
-  requirement: &70200646378140 !ruby/object:Gem::Requirement
+  requirement: &70186187439160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -66,11 +66,11 @@ dependencies:
           My4y
   type: :development
   prerelease: false
-  version_requirements: *70200646378140
+  version_requirements: *70186187439160
 - !ruby/object:Gem::Dependency
   name: !binary |-
     d3Jvbmdkb2M=
-  requirement: &70200646376700 !ruby/object:Gem::Requirement
+  requirement: &70186187438700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -80,7 +80,7 @@ dependencies:
           MS42LjE=
   type: :development
   prerelease: false
-  version_requirements: *70200646376700
+  version_requirements: *70186187438700
 description: ! '\Unicorn is an HTTP server for Rack applications designed to only
   serve