rainbows 3.4.0 → 4.0.0

data/Documentation/GNUmakefile

@@ -1,7 +1,7 @@
 all::
 
 PANDOC = pandoc
-PANDOC_OPTS = -f markdown --email-obfuscation=none --sanitize-html
+PANDOC_OPTS = -f markdown --email-obfuscation=none
 pandoc = $(PANDOC) $(PANDOC_OPTS)
 pandoc_html = $(pandoc) --toc -t html --no-wrap
 

data/GIT-VERSION-GEN

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

data/bin/rainbows

@@ -118,4 +118,4 @@ if $DEBUG
 end
 
 Unicorn::Launcher.daemonize!(options) if rackup_opts[:daemonize]
-Rainbows.run(app, options)
+Rainbows::HttpServer.new(app, options).start.join

data/lib/rainbows.rb

@@ -61,17 +61,11 @@ module Rainbows
   end
   # :stopdoc:
 
-  # runs the Rainbows! HttpServer with +app+ and +options+ and does
-  # not return until the server has exited.
-  def self.run(app, options = {}) # :nodoc:
-    HttpServer.new(app, options).start.join
-  end
-
   class << self
     attr_accessor :server
     attr_accessor :cur # may not always be used
     attr_reader :alive
-    attr_writer :tick_io
+    attr_writer :worker
     attr_writer :forked
   end
 
@@ -84,7 +78,6 @@ module Rainbows
 
   @alive = true
   @cur = 0
-  @tick_mod = 0
   @expire = nil
   @at_quit = []
 
@@ -93,7 +86,7 @@ module Rainbows
   end
 
   def self.tick
-    @tick_io.chmod(@tick_mod = 0 == @tick_mod ? 1 : 0)
+    @worker.tick = Time.now.to_i
     exit!(2) if @expire && Time.now >= @expire
     @alive && @server.master_pid == Process.ppid or quit!
   end
@@ -136,6 +129,7 @@ module Rainbows
   autoload :NeverBlock, "rainbows/never_block"
   autoload :XEpollThreadSpawn, "rainbows/xepoll_thread_spawn"
   autoload :XEpollThreadPool, "rainbows/xepoll_thread_pool"
+  autoload :StreamResponseEpoll, "rainbows/stream_response_epoll"
 
   autoload :Fiber, 'rainbows/fiber' # core class
   autoload :StreamFile, 'rainbows/stream_file'

data/lib/rainbows/base.rb

@@ -11,12 +11,9 @@ module Rainbows::Base
   # this method is called by all current concurrency models
   def init_worker_process(worker) # :nodoc:
     super(worker)
-    Rainbows::Response.setup(self.class)
+    Rainbows::Response.setup
     Rainbows::MaxBody.setup
-    Rainbows.tick_io = worker.tmp
-
-    listeners = Rainbows::HttpServer::LISTENERS
-    Rainbows::HttpServer::IO_PURGATORY.concat(listeners)
+    Rainbows.worker = worker
 
     # we're don't use the self-pipe mechanism in the Rainbows! worker
     # since we don't defer reopening logs
@@ -36,5 +33,12 @@ module Rainbows::Base
     klass.const_set :LISTENERS, Rainbows::HttpServer::LISTENERS
   end
 
+  def reopen_worker_logs(worker_nr)
+    logger.info "worker=#{worker_nr} reopening logs..."
+    Unicorn::Util.reopen_logs
+    logger.info "worker=#{worker_nr} done reopening logs"
+    rescue
+      Rainbows.quit! # let the master reopen and refork us
+  end
   # :startdoc:
 end

data/lib/rainbows/configurator.rb

@@ -27,6 +27,7 @@ module Rainbows::Configurator
     :keepalive_requests => 100,
     :client_max_body_size => 1024 * 1024,
     :client_header_buffer_size => 1024,
+    :client_max_header_size => 112 * 1024,
     :copy_stream => IO.respond_to?(:copy_stream) ? IO : false,
   })
 
@@ -147,6 +148,18 @@ module Rainbows::Configurator
     set[:client_max_body_size] = bytes
   end
 
+  # Limits the maximum size of a request header for all requests.
+  #
+  # Default: 112 kilobytes (114688 bytes)
+  #
+  # Lowering this will lower worst-case memory usage and mitigate some
+  # denial-of-service attacks.  This should be larger than
+  # client_header_buffer_size.
+  def client_max_header_size(bytes)
+    check!
+    set_int(:client_max_header_size, bytes, 8)
+  end
+
   # This governs the amount of memory allocated for an individual read(2) or
   # recv(2) system call when reading headers.  Applications that make minimal
   # use of cookies should not increase this from the default.

data/lib/rainbows/const.rb

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

data/lib/rainbows/coolio_fiber_spawn.rb

@@ -18,7 +18,7 @@ module Rainbows::CoolioFiberSpawn
   include Rainbows::Fiber::Coolio
 
   def worker_loop(worker) # :nodoc:
-    Rainbows::Response.setup(Server)
+    Rainbows::Response.setup
     init_worker_process(worker)
     Server.const_set(:MAX, @worker_connections)
     Rainbows::Fiber::Base.setup(Server, nil)

data/lib/rainbows/dev_fd_response.rb

@@ -6,10 +6,6 @@
 # objects.  This may be used in conjunction with the #to_path method
 # on servers that support it to pass arbitrary file descriptors into
 # the HTTP response without additional open(2) syscalls
-#
-# This middleware is currently a no-op for Rubinius, as it lacks
-# IO.copy_stream in 1.9 and also due to a bug here:
-#   http://github.com/evanphx/rubinius/issues/379
 
 class Rainbows::DevFdResponse < Struct.new(:app)
 
@@ -19,15 +15,8 @@ class Rainbows::DevFdResponse < Struct.new(:app)
   Transfer_Encoding = "Transfer-Encoding".freeze
   Rainbows_autochunk = "rainbows.autochunk".freeze
   Rainbows_model = "rainbows.model"
-  HTTP_1_0 = "HTTP/1.0"
   HTTP_VERSION = "HTTP_VERSION"
   Chunked = "chunked"
-
-  # make this a no-op under Rubinius, it's pointless anyways
-  # since Rubinius doesn't have IO.copy_stream
-  def self.new(app)
-    app
-  end if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   include Rack::Utils
 
   # Rack middleware entry point, we'll just pass through responses
@@ -55,8 +44,12 @@ class Rainbows::DevFdResponse < Struct.new(:app)
       headers.delete(Transfer_Encoding)
     elsif st.pipe? || st.socket? # epoll-able things
       unless headers.include?(Content_Length)
-        if env[Rainbows_autochunk] && HTTP_1_0 != env[HTTP_VERSION]
-          headers[Transfer_Encoding] = Chunked
+        if env[Rainbows_autochunk]
+          case env[HTTP_VERSION]
+          when "HTTP/1.0", nil
+          else
+            headers[Transfer_Encoding] = Chunked
+          end
         else
           env[Rainbows_autochunk] = false
         end

data/lib/rainbows/epoll/client.rb

@@ -96,12 +96,12 @@ module Rainbows::Epoll::Client
   end
 
   def ev_write_response(status, headers, body, alive)
+    @state = alive ? :headers : :close
     if body.respond_to?(:to_path)
       write_response_path(status, headers, body, alive)
     else
       write_response(status, headers, body, alive)
     end
-    @state = alive ? :headers : :close
     on_read(Z) if alive && 0 == @wr_queue.size && 0 != @buf.size
   end
 

data/lib/rainbows/ev_core.rb

@@ -10,6 +10,7 @@ module Rainbows::EvCore
   RBUF = ""
   Z = "".freeze
   Rainbows.config!(self, :client_header_buffer_size)
+  HTTP_VERSION = "HTTP_VERSION"
 
   # Apps may return this Rack response: AsyncResponse = [ -1, {}, [] ]
   ASYNC_CALLBACK = "async.callback".freeze
@@ -54,13 +55,23 @@ module Rainbows::EvCore
   def stream_response_headers(status, headers, alive)
     headers = Rack::Utils::HeaderHash.new(headers) unless Hash === headers
     if headers.include?(Content_Length)
-      rv = false
+      write_headers(status, headers, alive)
+      return false
+    end
+
+    case @env[HTTP_VERSION]
+    when "HTTP/1.0" # disable HTTP/1.0 keepalive to stream
+      write_headers(status, headers, false)
+      @hp.clear
+      false
+    when nil # "HTTP/0.9"
+      false
     else
       rv = !!(headers[Transfer_Encoding] =~ %r{\Achunked\z}i)
       rv = false unless @env["rainbows.autochunk"]
+      write_headers(status, headers, alive)
+      rv
     end
-    write_headers(status, headers, alive)
-    rv
   end
 
   def prepare_request_body
@@ -80,8 +91,7 @@ module Rainbows::EvCore
   def on_read(data)
     case @state
     when :headers
-      @buf << data
-      @hp.parse or return want_more
+      @hp.add_parse(data) or return want_more
       @state = :body
       if 0 == @hp.content_length
         app_call NULL_IO # common case
@@ -105,7 +115,7 @@ module Rainbows::EvCore
         want_more
       end
     when :trailers
-      if @hp.trailers(@env, @buf << data)
+      if @hp.add_parse(data)
         @input.rewind
         app_call @input
       else

data/lib/rainbows/fiber.rb

@@ -1,11 +1,10 @@
 # -*- encoding: binary -*-
-# :stopdoc:
+# :enddoc:
 begin
   require 'fiber'
 rescue LoadError
   defined?(NeverBlock) or raise
 end
-# :startdoc:
 
 # core namespace for all things that use Fibers in \Rainbows!
 #
@@ -15,7 +14,6 @@ end
 # supporting these in the future.
 module Rainbows::Fiber
 
-  # :stopdoc:
   # blocked readers (key: fileno, value: Rainbows::Fiber::IO object)
   RD = []
 
@@ -24,7 +22,6 @@ module Rainbows::Fiber
 
   # sleeping fibers go here (key: Fiber object, value: wakeup time)
   ZZ = {}
-  # :startdoc:
 
   # puts the current Fiber into uninterruptible sleep for at least
   # +seconds+.  Unlike Kernel#sleep, this it is not possible to sleep

data/lib/rainbows/fiber/io.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-
+# :enddoc:
 # A \Fiber-aware IO class, gives users the illusion of a synchronous
 # interface that yields away from the current \Fiber whenever
 # the underlying descriptor is blocked on reads or write

data/lib/rainbows/fiber/io/methods.rb

@@ -1,5 +1,4 @@
 # -*- encoding: binary -*-
-#
 # :enddoc:
 
 # this is used to augment Kgio::Socket and Kgio::Pipe-enhanced classes

data/lib/rainbows/fiber/io/pipe.rb

@@ -1,4 +1,6 @@
 # -*- encoding: binary -*-
+# :enddoc:
+#
 # A Fiber-aware Pipe class, gives users the illusion of a synchronous
 # interface that yields away from the current Fiber whenever
 # the underlying descriptor is blocked on reads or write.

data/lib/rainbows/fiber/io/socket.rb

@@ -1,4 +1,6 @@
 # -*- encoding: binary -*-
+# :enddoc:
+#
 # A Fiber-aware Socket class, gives users the illusion of a synchronous
 # interface that yields away from the current Fiber whenever
 # the underlying descriptor is blocked on reads or write.

data/lib/rainbows/http_server.rb

@@ -21,14 +21,6 @@ class Rainbows::HttpServer < Unicorn::HttpServer
     @worker_connections ||= @use == :Base ? 1 : 50
   end
 
-  def reopen_worker_logs(worker_nr)
-    logger.info "worker=#{worker_nr} reopening logs..."
-    Unicorn::Util.reopen_logs
-    logger.info "worker=#{worker_nr} done reopening logs"
-    rescue
-      Rainbows.quit! # let the master reopen and refork us
-  end
-
   # Add one second to the timeout since our fchmod heartbeat is less
   # precise (and must be more conservative) than Unicorn does.  We
   # handle many clients per process and can't chmod on every
@@ -105,4 +97,8 @@ class Rainbows::HttpServer < Unicorn::HttpServer
   def keepalive_requests
     Unicorn::HttpRequest.keepalive_requests
   end
+
+  def client_max_header_size=(bytes)
+    Unicorn::HttpParser.max_header_len = bytes
+  end
 end

data/lib/rainbows/response.rb

@@ -13,7 +13,7 @@ module Rainbows::Response
   class F < File; end
 
   # called after forking
-  def self.setup(klass)
+  def self.setup
     Kgio.accept_class = Rainbows::Client
     0 == Rainbows.server.keepalive_timeout and
       Rainbows::HttpParser.keepalive_requests = 0
@@ -119,7 +119,15 @@ module Rainbows::Response
     # This does not support multipart responses (does anybody actually
     # use those?)
     def sendfile_range(status, headers)
-      200 == status.to_i &&
+      status = status.to_i
+      if 206 == status
+        if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ headers[Content_Range]
+          a, b = $1.to_i, $2.to_i
+          return 206, headers, [ a,  b - a + 1 ]
+        end
+        return # wtf...
+      end
+      200 == status &&
       /\Abytes=(\d+-\d*|\d*-\d+)\z/ =~ @hp.env[HTTP_RANGE] or
         return
       a, b = $1.split(/-/)

data/lib/rainbows/stream_response_epoll.rb

@@ -0,0 +1,75 @@
+# -*- encoding: binary -*-
+require "sleepy_penguin"
+require "raindrops"
+
+# Like Unicorn itself, this concurrency model is only intended for use
+# behind nginx and completely unsupported otherwise.  Even further from
+# Unicorn, this isn't even a good idea with normal LAN clients, only nginx!
+#
+# It does NOT require a thread-safe Rack application at any point, but
+# allows streaming data asynchronously via nginx (using the
+# "X-Accel-Buffering: no" header to disable buffering).
+#
+# Unlike Rainbows::Base, this does NOT support persistent
+# connections or pipelining.  All \Rainbows! specific configuration
+# options are ignored (except Rainbows::Configurator#use).
+#
+# === RubyGem Requirements
+#
+# * raindrops 0.6.0 or later
+# * sleepy_penguin 3.0.1 or later
+module Rainbows::StreamResponseEpoll
+  # :stopdoc:
+  CODES = Unicorn::HttpResponse::CODES
+  HEADER_END = "X-Accel-Buffering: no\r\n\r\n"
+  autoload :Client, "rainbows/stream_response_epoll/client"
+
+  def http_response_write(socket, status, headers, body)
+    status = CODES[status.to_i] || status
+    ep_client = false
+
+    if headers
+      # don't set extra headers here, this is only intended for
+      # consuming by nginx.
+      buf = "HTTP/1.0 #{status}\r\nStatus: #{status}\r\n"
+      headers.each do |key, value|
+        if value =~ /\n/
+          # avoiding blank, key-only cookies with /\n+/
+          buf << value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" }.join
+        else
+          buf << "#{key}: #{value}\r\n"
+        end
+      end
+      buf << HEADER_END
+
+      case rv = socket.kgio_trywrite(buf)
+      when nil then break
+      when String # retry, socket buffer may grow
+        buf = rv
+      when :wait_writable
+        ep_client = Client.new(socket, buf)
+        body.each { |chunk| ep_client.write(chunk) }
+        return ep_client.close
+      end while true
+    end
+
+    body.each do |chunk|
+      if ep_client
+        ep_client.write(chunk)
+      else
+        case rv = socket.kgio_trywrite(chunk)
+        when nil then break
+        when String # retry, socket buffer may grow
+          chunk = rv
+        when :wait_writable
+          ep_client = Client.new(socket, chunk)
+          break
+        end while true
+      end
+    end
+    ep_client.close if ep_client
+    ensure
+      body.respond_to?(:close) and body.close
+  end
+  # :startdoc:
+end

data/lib/rainbows/stream_response_epoll/client.rb

@@ -0,0 +1,57 @@
+# -*- encoding: binary -*-
+# :enddoc:
+class Rainbows::StreamResponseEpoll::Client
+  OUT = SleepyPenguin::Epoll::OUT
+  N = Raindrops.new(1)
+  EP = SleepyPenguin::Epoll.new
+  timeout = Rainbows.server.timeout
+  thr = Thread.new do
+    begin
+      EP.wait(nil, timeout) { |_,client| client.epoll_run }
+    rescue Errno::EINTR
+    rescue => e
+      Rainbows::Error.listen_loop(e)
+    end while Rainbows.alive || N[0] > 0
+  end
+  Rainbows.at_quit { thr.join(timeout) }
+
+  attr_reader :to_io
+
+  def initialize(io, unwritten)
+    @closed = false
+    @to_io = io.dup
+    @wr_queue = [ unwritten.dup ]
+    EP.set(self, OUT)
+  end
+
+  def write(str)
+    @wr_queue << str.dup
+  end
+
+  def close
+    @closed = true
+  end
+
+  def epoll_run
+    return if @to_io.closed?
+    buf = @wr_queue.shift or return on_write_complete
+    case rv = @to_io.kgio_trywrite(buf)
+    when nil
+      buf = @wr_queue.shift or return on_write_complete
+    when String # retry, socket buffer may grow
+      buf = rv
+    when :wait_writable
+      return @wr_queue.unshift(buf)
+    end while true
+    rescue => err
+      @to_io.close
+      N.decr(0, 1)
+  end
+
+  def on_write_complete
+    if @closed
+      @to_io.close
+      N.decr(0, 1)
+    end
+  end
+end

data/lib/rainbows/xepoll_thread_pool.rb

@@ -14,7 +14,7 @@ require "raindrops"
 #
 # === Disadvantages
 #
-# This is only supported under Linux 2.6 kernels.
+# This is only supported under Linux 2.6 and later kernels.
 #
 # === Compared to CoolioThreadPool
 #

data/lib/rainbows/xepoll_thread_pool/client.rb

@@ -111,8 +111,7 @@ module Rainbows::XEpollThreadPool::Client
       return kato_set
     when String
       kato_delete
-      @hp.buf << buf
-      @hp.parse and return queue!
+      @hp.add_parse(buf) and return queue!
     else
       return close
     end while true

data/lib/rainbows/xepoll_thread_spawn.rb

@@ -14,7 +14,7 @@ require "raindrops"
 #
 # === Disadvantages
 #
-# This is only supported under Linux 2.6 kernels.
+# This is only supported under Linux 2.6 and later kernels.
 #
 # === Compared to CoolioThreadSpawn
 #

data/lib/rainbows/xepoll_thread_spawn/client.rb

@@ -95,8 +95,7 @@ module Rainbows::XEpollThreadSpawn::Client
       return kato_set
     when String
       kato_delete
-      @hp.buf << buf
-      env = @hp.parse and return spawn(env, @hp)
+      env = @hp.add_parse(buf) and return spawn(env, @hp)
     else
       return close
     end while true
@@ -115,8 +114,7 @@ module Rainbows::XEpollThreadSpawn::Client
       kato_set
       return false
     when String
-      hp.buf << buf
-      hp.parse and return true
+      hp.add_parse(buf) and return true
       # continue loop
     else
       return close

data/rainbows.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<kgio>, ['~> 2.4'])
 
   # we need Unicorn for the HTTP parser and process management
-  s.add_dependency(%q<unicorn>, ["~> 3.6"])
-  s.add_development_dependency(%q<isolate>, "~> 3.0.0")
+  s.add_dependency(%q<unicorn>, ["~> 4.0"])
+  s.add_development_dependency(%q<isolate>, "~> 3.1")
   s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
 
   # optional runtime dependencies depending on configuration
@@ -53,5 +53,6 @@ Gem::Specification.new do |s|
   # NeverBlock, currently only available on http://gems.github.com/
   # s.add_dependency(%q<espace-neverblock>, ["~> 0.1.6.1"])
 
-  # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
+  # accessor not compatible with older RubyGems
+  # s.licenses = %w(GPLv3 GPLv2 Ruby)
 end

data/t/GNUmakefile

@@ -32,6 +32,7 @@ models += ThreadSpawn
 models += Coolio
 models += EventMachine
 models += NeverBlock
+models += StreamResponseEpoll
 
 ifeq ($(RUBY_ENGINE),ruby)
   rp := )

data/t/async-response-no-autochunk.ru

@@ -1,6 +1,6 @@
 use Rack::Chunked
 use Rainbows::DevFdResponse
-script = <<-EOF
+script_chunked = <<-EOF
 for i in 0 1 2 3 4 5 6 7 8 9
 do
 	printf '1\r\n%s\r\n' $i
@@ -9,15 +9,25 @@ done
 printf '0\r\n\r\n'
 EOF
 
+script_identity = <<-EOF
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+	printf $i
+	sleep 1
+done
+EOF
+
 run lambda { |env|
   env['rainbows.autochunk'] = false
-  io = IO.popen(script, 'rb')
-  [
-    200,
-    {
-      'Content-Type' => 'text/plain',
-      'Transfer-Encoding' => 'chunked',
-    },
-    io
-  ].freeze
+  headers = { 'Content-Type' => 'text/plain' }
+
+  script = case env["HTTP_VERSION"]
+  when nil, "HTTP/1.0"
+    script_identity
+  else
+    headers['Transfer-Encoding'] = 'chunked'
+    script_chunked
+  end
+
+  [ 200, headers, IO.popen(script, 'rb') ].freeze
 }

data/t/t0000-simple-http.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 t_plan 25 "simple HTTP connection keepalive/pipelining tests for $model"
 
 t_begin "checking for config.ru for $model" && {

data/t/t0001-unix-http.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 t_plan 19 "simple HTTP connection keepalive/pipelining tests for $model"
 
 t_begin "checking for config.ru for $model" && {

data/t/t0005-large-file-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 
 if ! grep -v ^VmRSS: /proc/self/status >/dev/null 2>&1

data/t/t0009-broken-app.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 9 "graceful handling of broken apps for $model"
 

data/t/t0010-keepalive-timeout-effective.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
+
 t_plan 6 "keepalive_timeout tests for $model"
 
 t_begin "setup and start" && {

data/t/t0011-close-on-exec-set.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 nr=${nr-"5"}
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 7 "ensure close-on-exec flag is set for $model"
 

data/t/t0017-keepalive-timeout-zero.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 t_plan 6 "keepalive_timeout 0 tests for $model"
 
 t_begin "setup and start" && {

data/t/t0019-keepalive-cpu-usage.sh

@@ -5,6 +5,8 @@ then
 fi
 . ./test-lib.sh
 skip_models WriterThreadSpawn WriterThreadPool Base
+skip_models StreamResponseEpoll
+
 t_plan 6 "keepalive_timeout CPU usage tests for $model"
 
 t_begin "setup and start" && {

data/t/t0020-large-sendfile-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 case $RUBY_ENGINE in
 ruby) ;;

data/t/t0021-sendfile-wrap-to_path.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 case $RUBY_ENGINE in
 ruby) ;;

data/t/t0023-sendfile-byte-range.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 case $RUBY_ENGINE in
 ruby) ;;

data/t/t0024-pipelined-sendfile-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 6 "pipelined sendfile response for $model"
 

data/t/t0030-fast-pipe-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 
 t_plan 10 "fast pipe response for $model"

data/t/t0031-close-pipe-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 16 "close pipe response for $model"
 

data/t/t0032-close-pipe-to_path-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 if ! test -d /dev/fd
 then
 	t_info "skipping $T since /dev/fd is required"

data/t/t0034-pipelined-pipe-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 6 "pipelined pipe response for $model"
 

data/t/t0035-kgio-pipe-response.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 
 t_plan 10 "fast Kgio pipe response for $model"

data/t/t0040-keepalive_requests-setting.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 t_plan 6 "keepalive_requests limit tests for $model"
 
 t_begin "setup and start" && {

data/t/t0044-autopush.sh

@@ -15,6 +15,7 @@ fi
 # these buffer internally in external libraries, so we can't detect when
 # to use TCP_CORK
 skip_models EventMachine NeverBlock
+skip_models StreamResponseEpoll
 skip_models Coolio CoolioThreadPool CoolioThreadSpawn
 skip_models Revactor Rev RevThreadPool RevThreadSpawn
 

data/t/t0045-client_max_header_size.sh

@@ -0,0 +1,90 @@
+#!/bin/sh
+. ./test-lib.sh
+skip_models StreamResponseEpoll
+
+t_plan 11 "client_max_header_size tests for $model"
+
+t_begin "setup Rainbows!" && {
+	rainbows_setup $model
+}
+
+t_begin "fails with zero size" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_max_body_size.*/  client_max_header_size 0/
+w
+EOF
+	grep "client_max_header_size 0" $unicorn_config
+	rainbows -D env.ru -c $unicorn_config && die "should fail"
+}
+
+t_begin "fails with negative value" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_max_header_size.*/  client_max_header_size -1/
+w
+EOF
+	grep "client_max_header_size -1" $unicorn_config
+	rainbows -D env.ru -c $unicorn_config && die "should fail"
+}
+
+t_begin "fails with small size" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_max_header_size.*/  client_max_header_size 7/
+w
+EOF
+	grep "client_max_header_size 7" $unicorn_config
+	rainbows -D env.ru -c $unicorn_config && die "should fail"
+}
+
+t_begin "starts with minimum value" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_max_header_size.*/  client_max_header_size 8/
+w
+EOF
+	grep 'client_max_header_size 8$' $unicorn_config
+	rainbows -D env.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "smallest HTTP/0.9 request works right" && {
+	(
+		cat $fifo > $tmp &
+		printf 'GET /\r\n'
+		wait
+		echo ok > $ok
+	) | socat - TCP:$listen > $fifo
+	wait
+	test xok = x"$(cat $ok)"
+	test 1 -eq $(wc -l < $tmp)
+	grep HTTP_VERSION $tmp && die "unexpected HTTP_VERSION in HTTP/0.9 request"
+}
+
+t_begin "HTTP/1.1 request fails" && {
+	curl -vsSf http://$listen/ > $tmp 2>&1 && die "unexpected curl success"
+	grep '400$' $tmp
+}
+
+t_begin "increase client_max_header_size on reload" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_max_header_size.*/  client_max_header_size 512/
+w
+EOF
+	grep 'client_max_header_size 512$' $unicorn_config
+	kill -HUP $rainbows_pid
+	test xSTART = x"$(cat $fifo)"
+}
+
+t_begin "HTTP/1.1 request succeeds" && {
+	curl -sSf http://$listen/ > $tmp
+	test 1 -eq $(wc -l < $tmp)
+	dbgcat tmp
+}
+
+t_begin "no errors in stderr" && {
+	check_stderr
+}
+
+t_begin "shutdown" && {
+	kill $rainbows_pid
+}
+
+t_done

data/t/t0050-response-body-close-has-env.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 29 "keepalive does not clear Rack env prematurely for $model"
 
@@ -15,6 +16,7 @@ req_pipelined () {
 	pfx=$1
 	t_begin "make pipelined requests to trigger $pfx response body" && {
 		> $r_out
+		rm -f $ok
 		(
 			cat $fifo > $tmp &
 			printf 'GET /%s/1 HTTP/1.1\r\n' $pfx
@@ -34,7 +36,8 @@ req_pipelined () {
 reload () {
 	t_begin 'reloading Rainbows! to ensure writeout' && {
 		# ensure worker is loaded before HUP
-		curl -s http://$listen/ >/dev/null
+		rm -f $curl_err $curl_out
+		curl -vs http://$listen/ >$curl_out 2> $curl_err
 		# reload to ensure everything is flushed
 		kill -HUP $rainbows_pid
 		test xSTART = x"$(cat $fifo)"

data/t/t0101-rack-input-trailer.sh

@@ -29,7 +29,7 @@ t_begin "staggered trailer upload" && {
 }
 
 t_begin "HTTP response is OK" && {
-	fgrep 'HTTP/1.1 200 OK' $tmp
+	grep 'HTTP/1\.[01] 200 OK' $tmp
 }
 
 t_begin "upload small blob" && {
@@ -42,7 +42,7 @@ t_begin "upload small blob" && {
 	test xok = x"$(cat $ok)"
 }
 
-t_begin "HTTP response is OK" && fgrep 'HTTP/1.1 200 OK' $tmp
+t_begin "HTTP response is OK" && grep 'HTTP/1\.[01] 200 OK' $tmp
 t_begin "no errors in stderr log" && check_stderr
 
 t_begin "big blob request" && {
@@ -55,7 +55,7 @@ t_begin "big blob request" && {
 	test xok = x"$(cat $ok)"
 }
 
-t_begin "HTTP response is OK" && fgrep 'HTTP/1.1 200 OK' $tmp
+t_begin "HTTP response is OK" && grep 'HTTP/1\.[01] 200 OK' $tmp
 t_begin "no errors in stderr log" && check_stderr
 
 t_begin "staggered blob upload" && {
@@ -76,9 +76,7 @@ t_begin "staggered blob upload" && {
 	test xok = x"$(cat $ok)"
 }
 
-t_begin "HTTP response is OK" && {
-	fgrep 'HTTP/1.1 200 OK' $tmp
-}
+t_begin "HTTP response is OK" && grep 'HTTP/1\.[01] 200 OK' $tmp
 
 t_begin "no errors in stderr log" && check_stderr
 

data/t/t0103-rack-input-limit.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 req_curl_chunked_upload_err_check
 

data/t/t0104-rack-input-limit-tiny.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 req_curl_chunked_upload_err_check
 

data/t/t0105-rack-input-limit-bigger.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 test -r random_blob || die "random_blob required, run with 'make $0'"
 req_curl_chunked_upload_err_check
 

data/t/t0106-rack-input-keepalive.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 t_plan 11 "rack.input pipelining test"
 
 t_begin "setup and startup" && {

data/t/t0107-rack-input-limit-zero.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 req_curl_chunked_upload_err_check
 
 t_plan 6 "rack.input client_max_body_size zero"

data/t/t0200-async-response.sh

@@ -3,6 +3,7 @@ CONFIG_RU=${CONFIG_RU-'async-response.ru'}
 . ./test-lib.sh
 
 skip_models Base WriterThreadPool WriterThreadSpawn
+skip_models StreamResponseEpoll
 
 case $CONFIG_RU in
 *no-autochunk.ru)

data/t/t0202-async-response-one-oh.sh

@@ -3,6 +3,7 @@ CONFIG_RU=${CONFIG_RU-'async-response.ru'}
 . ./test-lib.sh
 
 skip_models Base WriterThreadPool WriterThreadSpawn
+skip_models StreamResponseEpoll
 
 t_plan 6 "async HTTP/1.0 response for $model"
 

data/t/t9001-sendfile-to-path.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
+skip_models StreamResponseEpoll
 
 t_plan 7 "Sendfile middleware test for $model"
 

data/t/t9002.ru

@@ -1,4 +1,5 @@
 require 'rainbows/server_token'
 require 'rack/lobster'
+use Rack::Head
 use Rainbows::ServerToken
 run Rack::Lobster.new

data/t/test-lib.sh

@@ -218,6 +218,9 @@ check_splice () {
 			exit 0
 		fi
 		;;
+	[3-9].*)
+		# OK
+		;;
 	*)
 		t_info "skipping $T (Linux $uname_r < 2.6.$min)"
 		exit 0

data/t/test_isolate.rb

@@ -16,13 +16,13 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.4.0'
-  gem 'unicorn', '3.6.2'
-  gem 'kcar', '0.2.0'
-  gem 'raindrops', '0.6.1'
+  gem 'kgio', '2.5.0'
+  gem 'kcar', '0.3.0'
+  gem 'raindrops', '0.7.0'
+  gem 'unicorn', '4.0.0'
 
   if engine == "ruby"
-    gem 'sendfile', '1.1.0' # next Rubinius should support this
+    gem 'sendfile', '1.1.0'
     gem 'cool.io', '1.0.0'
 
     gem 'eventmachine', '0.12.10'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 63
   prerelease: 
   segments: 
-  - 3
   - 4
   - 0
-  version: 3.4.0
+  - 0
+  version: 4.0.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -55,11 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 27
         segments: 
-        - 3
-        - 6
-        version: "3.6"
+        - 4
+        - 0
+        version: "4.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -70,12 +70,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
-        - 0
-        - 0
-        version: 3.0.0
+        - 1
+        version: "3.1"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -193,6 +192,8 @@ extra_rdoc_files:
 - lib/rainbows/server_token.rb
 - lib/rainbows/socket_proxy.rb
 - lib/rainbows/stream_file.rb
+- lib/rainbows/stream_response_epoll.rb
+- lib/rainbows/stream_response_epoll/client.rb
 - lib/rainbows/sync_close.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
@@ -338,6 +339,8 @@ files:
 - lib/rainbows/server_token.rb
 - lib/rainbows/socket_proxy.rb
 - lib/rainbows/stream_file.rb
+- lib/rainbows/stream_response_epoll.rb
+- lib/rainbows/stream_response_epoll/client.rb
 - lib/rainbows/sync_close.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
@@ -460,6 +463,7 @@ files:
 - t/t0042-client_header_buffer_size.sh
 - t/t0043-quit-keepalive-disconnect.sh
 - t/t0044-autopush.sh
+- t/t0045-client_max_header_size.sh
 - t/t0050-response-body-close-has-env.sh
 - t/t0100-rack-input-hammer-chunked.sh
 - t/t0100-rack-input-hammer-content-length.sh
@@ -534,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: "- Unicorn for sleepy apps and slow clients"