boourns-unicorn 4.4.4 → 4.4.5

data/ext/unicorn_http/unicorn_http.rl

@@ -115,7 +115,7 @@ struct http_parser {
   } len;
 };
 
-static ID id_clear, id_set_backtrace;
+static ID id_clear, id_set_backtrace, id_response_start_sent;
 
 static void finalize_header(struct http_parser *hp);
 
@@ -626,6 +626,7 @@ static VALUE HttpParser_clear(VALUE self)
 
   http_parser_init(hp);
   rb_funcall(hp->env, id_clear, 0);
+  rb_funcall(self, id_response_start_sent, 1, Qfalse);
 
   return self;
 }
@@ -1031,6 +1032,7 @@ void Init_unicorn_http(void)
   SET_GLOBAL(g_http_connection, "CONNECTION");
   id_clear = rb_intern("clear");
   id_set_backtrace = rb_intern("set_backtrace");
+  id_response_start_sent = rb_intern("response_start_sent=");
   init_unicorn_httpdate();
 }
 #undef SET_GLOBAL

data/lib/unicorn/configurator.rb

@@ -97,6 +97,13 @@ class Unicorn::Configurator
     if ready_pipe = RACKUP.delete(:ready_pipe)
       server.ready_pipe = ready_pipe
     end
+    if set[:check_client_connection]
+      set[:listeners].each do |address|
+        if set[:listener_opts][address][:tcp_nopush] == true || set[:listener_opts][address][:tcp_nodelay] == true
+          raise ArgumentError, "With check_client_connection set to true both :tcp_nopush and :tcp_nodelay listener options must be set to false."
+        end
+      end
+    end
     set.each do |key, value|
       value == :unset and next
       skip.include?(key) and next

data/lib/unicorn/http_request.rb

@@ -41,6 +41,7 @@ class Unicorn::HttpParser
 
   def self.check_client_connection
     @@check_client_connection
+    true
   end
 
   def self.check_client_connection=(bool)
@@ -87,8 +88,6 @@ class Unicorn::HttpParser
     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_server.rb

@@ -533,7 +533,7 @@ 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
+    msg = "HTTP/1.1 #{msg}" unless @request.response_start_sent
     client.kgio_trywrite(msg)
     client.close
     rescue
@@ -550,7 +550,6 @@ 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

data/test/unit/test_configurator.rb

@@ -151,6 +151,18 @@ class TestConfigurator < Test::Unit::TestCase
     assert test_struct.check_client_connection
   end
 
+  def test_check_client_connection_with_tcp_bad
+    tmp = Tempfile.new('unicorn_config')
+    test_struct = TestStruct.new
+    listener = "127.0.0.1:12345"
+    tmp.syswrite("check_client_connection true\n")
+    tmp.syswrite("listen '#{listener}', :tcp_nopush => true\n")
+
+    assert_raises(ArgumentError) do
+      Unicorn::Configurator.new(:config_file => tmp.path).commit!(test_struct)
+    end
+  end
+
   def test_after_fork_proc
     test_struct = TestStruct.new
     [ proc { |a,b| }, Proc.new { |a,b| }, lambda { |a,b| } ].each do |my_proc|

data/unicorn.gemspec

@@ -14,7 +14,7 @@ end.compact
 
 Gem::Specification.new do |s|
   s.name = %q{boourns-unicorn}
-  s.version = "4.4.4"
+  s.version = "4.4.5"
   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 |-
-    NC40LjQ=
+    NC40LjU=
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFjaw==
-  requirement: &70186187391540 !ruby/object:Gem::Requirement
+  requirement: &70303153240700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,11 +24,11 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186187391540
+  version_requirements: *70303153240700
 - !ruby/object:Gem::Dependency
   name: !binary |-
     a2dpbw==
-  requirement: &70186187391020 !ruby/object:Gem::Requirement
+  requirement: &70303153236920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -38,11 +38,11 @@ dependencies:
           Mi42
   type: :runtime
   prerelease: false
-  version_requirements: *70186187391020
+  version_requirements: *70303153236920
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFpbmRyb3Bz
-  requirement: &70186187439620 !ruby/object:Gem::Requirement
+  requirement: &70303153236380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -52,11 +52,11 @@ dependencies:
           MC43
   type: :runtime
   prerelease: false
-  version_requirements: *70186187439620
+  version_requirements: *70303153236380
 - !ruby/object:Gem::Dependency
   name: !binary |-
     aXNvbGF0ZQ==
-  requirement: &70186187439160 !ruby/object:Gem::Requirement
+  requirement: &70303153235560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -66,11 +66,11 @@ dependencies:
           My4y
   type: :development
   prerelease: false
-  version_requirements: *70186187439160
+  version_requirements: *70303153235560
 - !ruby/object:Gem::Dependency
   name: !binary |-
     d3Jvbmdkb2M=
-  requirement: &70186187438700 !ruby/object:Gem::Requirement
+  requirement: &70303153234260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -80,7 +80,7 @@ dependencies:
           MS42LjE=
   type: :development
   prerelease: false
-  version_requirements: *70186187438700
+  version_requirements: *70303153234260
 description: ! '\Unicorn is an HTTP server for Rack applications designed to only
   serve