rainbows 4.3.1 → 4.4.0

data/GIT-VERSION-GEN

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

data/lib/rainbows/configurator.rb

@@ -3,7 +3,7 @@
 # This module adds \Rainbows! to the
 # {Unicorn::Configurator}[http://unicorn.bogomips.org/Unicorn/Configurator.html]
 # \Rainbows!-specific configuration options must be inside a the Rainbows!
-# block, otherwise Unicorn::Configurator directives may be used anwwhere
+# block, otherwise Unicorn::Configurator directives may be used anywhere
 # in the file.
 #
 #   Rainbows! do

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '4.3.1'
+  RAINBOWS_VERSION = '4.4.0'
 
   include Unicorn::Const
 

data/lib/rainbows/coolio/client.rb

@@ -69,7 +69,12 @@ class Rainbows::Coolio::Client < Coolio::IO
   end
 
   def timeout?
-    nil == @deferred && @_write_buffer.empty? and close.nil?
+    if nil == @deferred && @_write_buffer.empty?
+      @_io.shutdown
+      true
+    else
+      false
+    end
   end
 
   # used for streaming sockets and pipes

data/lib/rainbows/epoll.rb

@@ -16,7 +16,7 @@ require 'sendfile'
 # When serving static files, this is extremely unfair and optimized
 # for throughput at the expense of fairness.  This is not an issue
 # if you're not serving static files, or if your working set is
-# small enough to aways be in your kernel page cache.  This concurrency
+# small enough to always be in your kernel page cache.  This concurrency
 # model may starve clients if you have slow disks and large static files.
 #
 # === RubyGem Requirements

data/lib/rainbows/epoll/client.rb

@@ -181,7 +181,7 @@ module Rainbows::Epoll::Client
   end
 
   def timeout!
-    close
+    shutdown
     true
   end
 

data/lib/rainbows/fiber_pool.rb

@@ -30,7 +30,7 @@ module Rainbows::FiberPool
 
     begin
       schedule do |l|
-        fib = pool.shift or break # let another worker process take it
+        fib = pool.pop or break # let another worker process take it
         if io = l.kgio_tryaccept
           fib.resume(io)
         else

data/lib/rainbows/http_server.rb

@@ -18,7 +18,8 @@ class Rainbows::HttpServer < Unicorn::HttpServer
     @logger = Unicorn::Configurator::DEFAULTS[:logger]
     super(app, options)
     defined?(@use) or self.use = Rainbows::Base
-    @worker_connections ||= @use == :Base ? 1 : 50
+    @worker_connections ||= 50
+    @worker_connections = 1 if @use == :Base
   end
 
   # Add one second to the timeout since our fchmod heartbeat is less

data/lib/rainbows/stream_response_epoll.rb

@@ -67,9 +67,31 @@ module Rainbows::StreamResponseEpoll
         end while true
       end
     end
-    ep_client.close if ep_client
     ensure
       body.respond_to?(:close) and body.close
+      if ep_client
+        ep_client.close
+      else
+        socket.shutdown
+        socket.close
+      end
+  end
+
+  # 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)
+    status, headers, body = @app.call(env = @request.read(client))
+
+    if 100 == status.to_i
+      client.write(Unicorn::Const::EXPECT_100_RESPONSE)
+      env.delete(Unicorn::Const::HTTP_EXPECT)
+      status, headers, body = @app.call(env)
+    end
+    @request.headers? or headers = nil
+    http_response_write(client, status, headers, body)
+  rescue => e
+    handle_error(client, e)
   end
+
   # :startdoc:
 end

data/lib/rainbows/stream_response_epoll/client.rb

@@ -19,7 +19,7 @@ class Rainbows::StreamResponseEpoll::Client
 
   def initialize(io, unwritten)
     @closed = false
-    @to_io = io.dup
+    @to_io = io
     @wr_queue = [ unwritten.dup ]
     EP.set(self, OUT)
   end
@@ -50,6 +50,7 @@ class Rainbows::StreamResponseEpoll::Client
 
   def on_write_complete
     if @closed
+      @to_io.shutdown
       @to_io.close
       N.decr(0, 1)
     end

data/lib/rainbows/thread_timeout.rb

@@ -44,6 +44,15 @@ require 'thread'
 # does not expose a monotonic clock for users, so don't change
 # the system time while this is running.  All servers should be
 # running ntpd anyways.
+#
+# "ensure" clauses may not fire properly or be interrupted during
+# execution, so do not mix this module with code which relies on "ensure".
+# (This is also true for the "Timeout" module in the Ruby standard library)
+#
+# "recursive locking" ThreadError exceptions may occur if
+# ThreadTimeout fires while a Mutex is locked (because "ensure"
+# clauses may not fire properly).
+
 class Rainbows::ThreadTimeout
 
   # :stopdoc:

data/lib/rainbows/xepoll_thread_pool/client.rb

@@ -77,7 +77,7 @@ module Rainbows::XEpollThreadPool::Client
       LOCK.synchronize do
         KATO.delete_if { |client, time| time < ot and defer << client }
       end
-      defer.each { |io| io.closed? or io.close }
+      defer.each { |io| io.closed? or io.shutdown }
     end
     @@last_expire = now
   end

data/lib/rainbows/xepoll_thread_spawn/client.rb

@@ -33,7 +33,7 @@ module Rainbows::XEpollThreadSpawn::Client
   Rainbows.at_quit do
     clients = nil
     LOCK.synchronize { clients = KATO.keys; KATO.clear }
-    clients.each { |io| io.closed? or io.close }
+    clients.each { |io| io.closed? or io.shutdown }
   end
   @@last_expire = Time.now
 

data/t/t0501-cramp-rainsocket.sh

@@ -25,7 +25,7 @@ t_begin "setup and start" && {
 }
 
 t_begin "wait for server to say hello to us" && {
-	ok=$((curl --no-buffer -sS http://$listen/ || :) | \
+	ok=$( (curl --no-buffer -sS http://$listen/ || :) | \
 	     (tr -d '\0\0377' || :) | \
 	     awk '/Hello from the Server/ { print "ok"; exit 0 }')
 

data/t/test_isolate.rb

@@ -16,29 +16,29 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.6.0'
+  gem 'kgio', '2.7.4'
   gem 'kcar', '0.3.0'
-  gem 'raindrops', '0.7.0'
-  gem 'unicorn', '4.1.0'
+  gem 'raindrops', '0.10.0'
+  gem 'unicorn', '4.3.1'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0'
     gem 'cool.io', '1.1.0'
 
     gem 'eventmachine', '0.12.10'
-    gem 'sinatra', '1.2.0'
-    gem 'async_sinatra', '0.5.0'
+    gem 'sinatra', '1.3.2'
+    gem 'async_sinatra', '1.0.0'
 
     gem 'neverblock', '0.1.6.2'
   end
 
   if defined?(::Fiber) && engine == "ruby"
     gem 'revactor', '0.1.5'
-    gem 'rack-fiber_pool', '0.9.1'
+    gem 'rack-fiber_pool', '0.9.2'
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.0.1'
+    gem 'sleepy_penguin', '3.1.0'
 
     # is 2.6.32 new enough?
     gem 'io_splice', '4.1.1' if `uname -r`.strip > '2.6.32'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: 
   segments: 
   - 4
-  - 3
-  - 1
-  version: 4.3.1
+  - 4
+  - 0
+  version: 4.4.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 Z
+date: 2012-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: "- Unicorn for sleepy apps and slow clients"