unicorn 3.4.0 → 3.5.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.4.0.GIT
+DEF_VER=v3.5.0.GIT
 
 LF='
 '

data/KNOWN_ISSUES

@@ -8,6 +8,10 @@ acceptable solution.  Those issues are documented here.
 
   See http://redmine.ruby-lang.org/issues/show/4338
 
+* On Ruby 1.8 prior to Ruby 1.8.7-p248, *BSD platforms have a broken
+  stdio that causes failure for file uploads larger than 112K.  Upgrade
+  your version of Ruby or continue using Unicorn 1.x/3.4.x.
+
 * For notes on sandboxing tools such as Bundler or Isolate,
   see the {Sandbox}[link:Sandbox.html] page.
 

data/README

@@ -60,11 +60,11 @@ both the the request and response in between \Unicorn and slow clients.
 == License
 
 \Unicorn is copyright 2009 by all contributors (see logs in git).
-It is based on Mongrel and carries the same license.
+It is based on Mongrel 1.1.5 and carries the same license.
 
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
-under the Ruby license and the GPL2. See the included LICENSE file for
-details.
+under the Ruby (1.8) license and the GPL2. See the included LICENSE file
+for details.
 
 \Unicorn is 100% Free Software.
 

data/lib/unicorn/app/exec_cgi.rb

@@ -33,7 +33,7 @@ module Unicorn::App
         sysseek(@body_offset = n)
       end
 
-      def each(&block)
+      def each
         sysseek @body_offset
         # don't use a preallocated buffer for sysread since we can't
         # guarantee an actual socket is consuming the yielded string

data/lib/unicorn/app/inetd.rb

@@ -47,7 +47,7 @@ module Unicorn::App
         }
       end
 
-      def each(&block)
+      def each
         begin
           rd, = IO.select([err_rd, out_rd])
           rd && rd.first or next

data/lib/unicorn/http_server.rb

@@ -582,7 +582,7 @@ class Unicorn::HttpServer
 
     # closing anything we IO.select on will raise EBADF
     trap(:USR1) { nr = -65536; SELF_PIPE[0].close rescue nil }
-    trap(:QUIT) { alive = nil; LISTENERS.each { |s| s.close rescue nil } }
+    trap(:QUIT) { alive = nil; LISTENERS.each { |s| s.close rescue nil }.clear }
     [:TERM, :INT].each { |sig| trap(sig) { exit!(0) } } # instant shutdown
     logger.info "worker=#{worker.nr} ready"
     m = 0

data/lib/unicorn/oob_gc.rb

@@ -38,8 +38,8 @@ module Unicorn
       [ status, headers, self ]
     end
 
-    def each(&block)
-      body.each(&block)
+    def each
+      body.each { |x| yield x }
     end
 
     # in Unicorn, this is closed _after_ the client socket

data/lib/unicorn/stream_input.rb

@@ -93,7 +93,7 @@ class Unicorn::StreamInput
   #
   # Executes the block for every ``line'' in *ios*, where lines are
   # separated by the global record separator ($/, typically "\n").
-  def each(&block)
+  def each
     while line = gets
       yield line
     end

data/lib/unicorn/tee_input.rb

@@ -120,7 +120,6 @@ private
   def tee(buffer)
     if buffer && buffer.size > 0
       @tmp.write(buffer)
-      @tmp.seek(0, IO::SEEK_END) # workaround FreeBSD/OSX + MRI 1.8.x bug
     end
     buffer
   end

data/script/isolate_for_tests

@@ -17,7 +17,7 @@ opts = {
 pid = fork do
   Isolate.now!(opts) do
     gem 'sqlite3-ruby', '1.2.5'
-    gem 'kgio', '2.2.0'
+    gem 'kgio', '2.3.2'
     gem 'rack', '1.1.0'
   end
 end

data/t/bin/unused_listen

@@ -7,11 +7,24 @@ require 'tmpdir'
 
 default_port = 8080
 addr = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+retries = 100
+base = 5000
 port = sock = lock_path = nil
 
 begin
-  sock = TCPServer.new(addr, 0)
-  port = sock.addr[1]
+  begin
+    port = base + rand(32768 - base)
+    while port == default_port
+      port = base + rand(32768 - base)
+    end
+
+    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    sock.bind(Socket.pack_sockaddr_in(port, addr))
+    sock.listen(5)
+  rescue Errno::EADDRINUSE, Errno::EACCES
+    sock.close rescue nil
+    retry if (retries -= 1) >= 0
+  end
 
   # since we'll end up closing the random port we just got, there's a race
   # condition could allow the random port we just chose to reselect itself

data/test/test_helper.rb

@@ -100,17 +100,30 @@ end
 # for a race condition is very small).  You may also set UNICORN_TEST_ADDR
 # to override the default test address (127.0.0.1).
 def unused_port(addr = '127.0.0.1')
+  retries = 100
+  base = 5000
   port = sock = nil
   begin
-    sock = TCPServer.new(addr, 0)
-    port = sock.addr[1]
+    begin
+      port = base + rand(32768 - base)
+      while port == Unicorn::Const::DEFAULT_PORT
+        port = base + rand(32768 - base)
+      end
+
+      sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+      sock.bind(Socket.pack_sockaddr_in(port, addr))
+      sock.listen(5)
+    rescue Errno::EADDRINUSE, Errno::EACCES
+      sock.close rescue nil
+      retry if (retries -= 1) >= 0
+    end
 
     # since we'll end up closing the random port we just got, there's a race
     # condition could allow the random port we just chose to reselect itself
     # when running tests in parallel with gmake.  Create a lock file while
     # we have the port here to ensure that does not happen .
     lock_path = "#{Dir::tmpdir}/unicorn_test.#{addr}:#{port}.lock"
-    File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
+    File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600).close
     at_exit { File.unlink(lock_path) rescue nil }
   rescue Errno::EEXIST
     sock.close rescue nil

data/unicorn.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.files = manifest
   s.homepage = Wrongdoc.config[:rdoc_url]
   s.rdoc_options = rdoc_options
-  s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{mongrel}
   s.test_files = test_files
 
@@ -35,7 +34,7 @@ Gem::Specification.new do |s|
   # commented out.  Nevertheless, upgrading to Rails 2.3.4 or later is
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
-  s.add_dependency(%q<kgio>, '~> 2.2')
+  s.add_dependency(%q<kgio>, '~> 2.3')
 
   s.add_development_dependency('isolate', '~> 3.0.0')
   s.add_development_dependency('wrongdoc', '~> 1.5')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 3
-  - 4
+  - 5
   - 0
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +00:00
+date: 2011-03-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,11 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 2
-        - 2
-        version: "2.2"
+        - 3
+        version: "2.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -392,7 +392,6 @@ rdoc_options:
 - http://bogomips.org/unicorn.git/tree/%s
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -414,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongrel
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server for fast clients and Unix