unicorn 4.0.1.4.g406b → 4.1.0

data/.document

@@ -12,7 +12,14 @@ TODO
 NEWS
 ChangeLog
 LATEST
-lib
+lib/unicorn.rb
+lib/unicorn/configurator.rb
+lib/unicorn/http_server.rb
+lib/unicorn/preread_input.rb
+lib/unicorn/stream_input.rb
+lib/unicorn/tee_input.rb
+lib/unicorn/util.rb
+lib/unicorn/worker.rb
 unicorn_1
 unicorn_rails_1
 ISSUES

data/.wrongdoc.yml

@@ -6,3 +6,5 @@ changelog_start: v1.1.5
 merge_html:
   unicorn_1: Documentation/unicorn.1.html
   unicorn_rails_1: Documentation/unicorn_rails.1.html
+public_email: mongrel-unicorn@rubyforge.org
+private_email: unicorn@bogomips.org

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.0.1.GIT
+DEF_VER=v4.1.0.GIT
 
 LF='
 '

data/KNOWN_ISSUES

@@ -3,6 +3,9 @@
 Occasionally odd {issues}[link:ISSUES.html] arise without a transparent or
 acceptable solution.  Those issues are documented here.
 
+* Issues with FreeBSD jails can be worked around as documented by Tatsuya Ono:
+  http://mid.gmane.org/CAHBuKRj09FdxAgzsefJWotexw-7JYZGJMtgUp_dhjPz9VbKD6Q@mail.gmail.com
+
 * PRNGs (pseudo-random number generators) loaded before forking
   (e.g. "preload_app true") may need to have their internal state
   reset in the after_fork hook.  Starting with \Unicorn 3.6.1, we

data/lib/unicorn.rb

@@ -50,9 +50,14 @@ module Unicorn
       pp({ :inner_app => inner_app }) if $DEBUG
 
       # return value, matches rackup defaults based on env
+      # Unicorn does not support persistent connections, but Rainbows!
+      # and Zbatery both do.  Users accustomed to the Rack::Server default
+      # middlewares will need ContentLength/Chunked middlewares.
       case ENV["RACK_ENV"]
       when "development"
         Rack::Builder.new do
+          use Rack::ContentLength
+          use Rack::Chunked
           use Rack::CommonLogger, $stderr
           use Rack::ShowExceptions
           use Rack::Lint
@@ -60,6 +65,8 @@ module Unicorn
         end.to_app
       when "deployment"
         Rack::Builder.new do
+          use Rack::ContentLength
+          use Rack::Chunked
           use Rack::CommonLogger, $stderr
           run inner_app
         end.to_app
@@ -78,8 +85,10 @@ module Unicorn
     end
   end
 
-  def self.log_error(logger, message, exc)
-    logger.error "#{message}: #{exc.message} (#{exc.class})"
+  def self.log_error(logger, prefix, exc)
+    message = exc.message
+    message = message.dump if /[[:cntrl:]]/ =~ message
+    logger.error "#{prefix}: #{message} (#{exc.class})"
     exc.backtrace.each { |line| logger.error(line) }
   end
   # :startdoc:

data/lib/unicorn/const.rb

@@ -8,7 +8,7 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  UNICORN_VERSION = "4.0.1"
+  UNICORN_VERSION = "4.1.0"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"

data/lib/unicorn/http_server.rb

@@ -408,14 +408,14 @@ class Unicorn::HttpServer
     end
 
     self.reexec_pid = fork do
-      listener_fds = LISTENERS.map do |sock|
+      listener_fds = Hash[LISTENERS.map do |sock|
         # IO#close_on_exec= will be available on any future version of
         # Ruby that sets FD_CLOEXEC by default on new file descriptors
         # ref: http://redmine.ruby-lang.org/issues/5041
         sock.close_on_exec = false if sock.respond_to?(:close_on_exec=)
-        sock.fileno
-      end
-      ENV['UNICORN_FD'] = listener_fds.join(',')
+        [ sock.fileno, sock ]
+      end]
+      ENV['UNICORN_FD'] = listener_fds.keys.join(',')
       Dir.chdir(START_CTX[:cwd])
       cmd = [ START_CTX[0] ].concat(START_CTX[:argv])
 
@@ -428,6 +428,10 @@ class Unicorn::HttpServer
         IO_PURGATORY << io
         io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       end
+
+      # exec(command, hash) works in at least 1.9.1+, but will only be
+      # required in 1.9.4/2.0.0 at earliest.
+      cmd << listener_fds if RUBY_VERSION >= "1.9.1"
       logger.info "executing #{cmd.inspect} (in #{Dir.pwd})"
       before_exec.call(self)
       exec(*cmd)
@@ -545,6 +549,7 @@ class Unicorn::HttpServer
   def init_worker_process(worker)
     # we'll re-trap :QUIT later for graceful shutdown iff we accept clients
     EXIT_SIGS.each { |sig| trap(sig) { exit!(0) } }
+    exit!(0) if (SIG_QUEUE & EXIT_SIGS)[0]
     WORKER_QUEUE_SIGS.each { |sig| trap(sig, nil) }
     trap(:CHLD, 'DEFAULT')
     SIG_QUEUE.clear

data/script/isolate_for_tests

@@ -17,9 +17,9 @@ opts = {
 pid = fork do
   Isolate.now!(opts) do
     gem 'sqlite3-ruby', '1.2.5'
-    gem 'raindrops', '0.6.1'
-    gem 'kgio', '2.5.0'
-    gem 'rack', '1.3.0'
+    gem 'raindrops', '0.7.0'
+    gem 'kgio', '2.6.0'
+    gem 'rack', '1.3.2'
   end
 end
 _, status = Process.waitpid2(pid)

data/test/unit/test_socket_helper.rb

@@ -179,7 +179,11 @@ class TestSocketHelper < Test::Unit::TestCase
   end if defined?(TCP_DEFER_ACCEPT)
 
   def test_ipv6only
-    port = unused_port "#@test6_addr"
+    port = begin
+      unused_port "#@test6_addr"
+    rescue Errno::EINVAL
+      return
+    end
     sock = bind_listen "[#@test6_addr]:#{port}", :ipv6only => true
     cur = sock.getsockopt(:IPPROTO_IPV6, :IPV6_V6ONLY).unpack('i')[0]
     assert_equal 1, cur

data/unicorn.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<raindrops>, '~> 0.6')
 
   s.add_development_dependency('isolate', '~> 3.1')
-  s.add_development_dependency('wrongdoc', '~> 1.5')
+  s.add_development_dependency('wrongdoc', '~> 1.6')
 
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -1,17 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 1551
-  prerelease: 8
+  hash: 59
+  prerelease: 
   segments: 
   - 4
-  - 0
   - 1
-  - 4
-  - g
-  - 406
-  - b
-  version: 4.0.1.4.g406b
+  - 0
+  version: 4.1.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -19,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 Z
+date: 2011-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -88,11 +84,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
-        - 5
-        version: "1.5"
+        - 6
+        version: "1.6"
   type: :development
   version_requirements: *id005
 description: |-
@@ -123,23 +119,11 @@ extra_rdoc_files:
 - ChangeLog
 - LATEST
 - lib/unicorn.rb
-- lib/unicorn/app/exec_cgi.rb
-- lib/unicorn/app/inetd.rb
-- lib/unicorn/app/old_rails.rb
-- lib/unicorn/app/old_rails/static.rb
-- lib/unicorn/cgi_wrapper.rb
 - lib/unicorn/configurator.rb
-- lib/unicorn/const.rb
-- lib/unicorn/http_request.rb
-- lib/unicorn/http_response.rb
 - lib/unicorn/http_server.rb
-- lib/unicorn/launcher.rb
-- lib/unicorn/oob_gc.rb
 - lib/unicorn/preread_input.rb
-- lib/unicorn/socket_helper.rb
 - lib/unicorn/stream_input.rb
 - lib/unicorn/tee_input.rb
-- lib/unicorn/tmpio.rb
 - lib/unicorn/util.rb
 - lib/unicorn/worker.rb
 - ISSUES
@@ -418,14 +402,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: mongrel