boourns-unicorn 4.4.8 → 4.4.9

data/ext/unicorn_http/unicorn_http.rl

@@ -626,7 +626,7 @@ static VALUE HttpParser_clear(VALUE self)
 
   http_parser_init(hp);
   rb_funcall(hp->env, id_clear, 0);
-  rb_ivar_set(self, id_response_start_sent, Qfalse);
+  rb_funcall(self, id_response_start_sent, 1, Qfalse);
 
   return self;
 }
@@ -1032,7 +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");
+  id_response_start_sent = rb_intern("response_start_sent=");
   init_unicorn_httpdate();
 }
 #undef SET_GLOBAL

data/lib/unicorn/configurator.rb

@@ -99,13 +99,8 @@ class Unicorn::Configurator
     end
     if set[:check_client_connection]
       set[:listeners].each do |address|
-        if set[:listener_opts][address][:tcp_nopush] == true
-          raise ArgumentError,
-            "check_client_connection is incompatible with tcp_nopush:true"
-        end
-        if set[:listener_opts][address][:tcp_nodelay] == true
-          raise ArgumentError,
-            "check_client_connection is incompatible with tcp_nodelay:true"
+        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
@@ -469,12 +464,6 @@ class Unicorn::Configurator
 
   # When enabled, unicorn will check the client connection by writing
   # the beginning of the HTTP headers before calling the application.
-  #
-  # This will prevent calling the application for clients who have
-  # disconnected while their connection was queued.
-  #
-  # This option cannot be used in conjunction with tcp_nodelay or
-  # tcp_nopush.
   def check_client_connection(bool)
     set_bool(:check_client_connection, bool)
   end

data/lib/unicorn/http_server.rb

@@ -558,7 +558,13 @@ class Unicorn::HttpServer
       status, headers, body = @app.call(env)
     end
     @request.headers? or headers = nil
-    http_response_write(client, status, headers, body, @request.response_start_sent)
+
+    if body.nil?
+      @logger.error("Rendered a nil body status #{status} headers #{headers} env #{env}")
+      client.respond_to?(:close) and body.close
+    else
+      http_response_write(client, status, headers, body, @request.response_start_sent)
+    end
     client.shutdown # in case of fork() in Rack app
     client.close # flush and uncork socket immediately, no keepalive
   rescue => e

data/unicorn.gemspec

@@ -1,5 +1,4 @@
 # -*- encoding: binary -*-
-ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
 require 'wrongdoc'
 extend Wrongdoc::Gemspec
@@ -14,7 +13,7 @@ end.compact
 
 Gem::Specification.new do |s|
   s.name = %q{boourns-unicorn}
-  s.version = "4.4.8"
+  s.version = "4.4.9"
   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 |-
-    NC40Ljg=
+    NC40Ljk=
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFjaw==
-  requirement: &70290006096480 !ruby/object:Gem::Requirement
+  requirement: &70149000442480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,11 +24,11 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290006096480
+  version_requirements: *70149000442480
 - !ruby/object:Gem::Dependency
   name: !binary |-
     a2dpbw==
-  requirement: &70290006095640 !ruby/object:Gem::Requirement
+  requirement: &70149000441740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -38,11 +38,11 @@ dependencies:
           Mi42
   type: :runtime
   prerelease: false
-  version_requirements: *70290006095640
+  version_requirements: *70149000441740
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFpbmRyb3Bz
-  requirement: &70290006093640 !ruby/object:Gem::Requirement
+  requirement: &70149000441220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -52,11 +52,11 @@ dependencies:
           MC43
   type: :runtime
   prerelease: false
-  version_requirements: *70290006093640
+  version_requirements: *70149000441220
 - !ruby/object:Gem::Dependency
   name: !binary |-
     aXNvbGF0ZQ==
-  requirement: &70290006092440 !ruby/object:Gem::Requirement
+  requirement: &70149000440740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -66,11 +66,11 @@ dependencies:
           My4y
   type: :development
   prerelease: false
-  version_requirements: *70290006092440
+  version_requirements: *70149000440740
 - !ruby/object:Gem::Dependency
   name: !binary |-
     d3Jvbmdkb2M=
-  requirement: &70290006090280 !ruby/object:Gem::Requirement
+  requirement: &70149000440260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -80,7 +80,7 @@ dependencies:
           MS42LjE=
   type: :development
   prerelease: false
-  version_requirements: *70290006090280
+  version_requirements: *70149000440260
 description: ! '\Unicorn is an HTTP server for Rack applications designed to only
   serve
 
@@ -331,3 +331,4 @@ test_files:
 - test/unit/test_server.rb
 - test/unit/test_sni_hostnames.rb
 - test/unit/test_util.rb
+has_rdoc: