puma 1.5.0 → 1.6.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.6.0 / 2012-07-23
+
+* 1 major bug fix:
+  * Prevent slow clients from starving the server by introducing a
+    dedicated IO reactor thread. Credit for reporting goes to @meh.
+
 === 1.5.0 / 2012-07-19
 
 * 7 contributers to this release:

data/Manifest.txt

@@ -33,6 +33,7 @@ ext/puma_http11/puma_http11.c
 lib/puma.rb
 lib/puma/app/status.rb
 lib/puma/cli.rb
+lib/puma/client.rb
 lib/puma/compat.rb
 lib/puma/configuration.rb
 lib/puma/const.rb
@@ -41,12 +42,14 @@ lib/puma/events.rb
 lib/puma/jruby_restart.rb
 lib/puma/null_io.rb
 lib/puma/rack_patch.rb
+lib/puma/reactor.rb
 lib/puma/server.rb
 lib/puma/thread_pool.rb
 lib/rack/handler/puma.rb
 puma.gemspec
 test/ab_rs.rb
 test/config/app.rb
+test/hello-post.ru
 test/hello.ru
 test/lobster.ru
 test/mime.yaml

data/ext/puma_http11/puma_http11.c

@@ -57,7 +57,7 @@ DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10));
 DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32)));
 
 struct common_field {
-	const signed long len;
+	const size_t len;
 	const char *name;
   int raw;
 	VALUE value;
@@ -127,7 +127,7 @@ static int common_field_cmp(const void *a, const void *b)
 
 static void init_common_fields(void)
 {
-  int i;
+  unsigned i;
   struct common_field *cf = common_http_fields;
   char tmp[256]; /* MAX_FIELD_NAME_LENGTH */
   memcpy(tmp, HTTP_PREFIX, HTTP_PREFIX_LEN);
@@ -163,7 +163,7 @@ static VALUE find_common_field_value(const char *field, size_t flen)
                                          common_field_cmp);
   return found ? found->value : Qnil;
 #else /* !HAVE_QSORT_BSEARCH */
-  int i;
+  unsigned i;
   struct common_field *cf = common_http_fields;
   for(i = 0; i < ARRAY_SIZE(common_http_fields); i++, cf++) {
     if (cf->len == flen && !memcmp(cf->name, field, flen))
@@ -460,6 +460,7 @@ void Init_puma_http11()
 {
 
   VALUE mPuma = rb_define_module("Puma");
+  VALUE cHttpParser = rb_define_class_under(mPuma, "HttpParser", rb_cObject);
 
   DEF_GLOBAL(request_method, "REQUEST_METHOD");
   DEF_GLOBAL(request_uri, "REQUEST_URI");
@@ -471,7 +472,6 @@ void Init_puma_http11()
   eHttpParserError = rb_define_class_under(mPuma, "HttpParserError", rb_eIOError);
   rb_global_variable(&eHttpParserError);
 
-  VALUE cHttpParser = rb_define_class_under(mPuma, "HttpParser", rb_cObject);
   rb_define_alloc_func(cHttpParser, HttpParser_alloc);
   rb_define_method(cHttpParser, "initialize", HttpParser_init, 0);
   rb_define_method(cHttpParser, "reset", HttpParser_reset, 0);

data/lib/puma/cli.rb

@@ -4,6 +4,7 @@ require 'uri'
 require 'puma/server'
 require 'puma/const'
 require 'puma/configuration'
+require 'puma/detect'
 
 require 'rack/commonlogger'
 require 'rack/utils'
@@ -12,8 +13,6 @@ module Puma
   # Handles invoke a Puma::Server in a command line style.
   #
   class CLI
-    IS_JRUBY = defined?(JRUBY_VERSION)
-
     # Create a new CLI object using +argv+ as the command line
     # arguments.
     #

data/lib/puma/client.rb

@@ -0,0 +1,233 @@
+class IO
+  # We need to use this for a jruby work around on both 1.8 and 1.9.
+  # So this either creates the constant (on 1.8), or harmlessly
+  # reopens it (on 1.9).
+  module WaitReadable
+  end
+end
+
+require 'puma/detect'
+
+if Puma::IS_JRUBY
+  # We have to work around some OpenSSL buffer/io-readiness bugs
+  # so we pull it in regardless of if the user is binding
+  # to an SSL socket
+  require 'openssl'
+end
+
+module Puma
+  class Client
+    include Puma::Const
+
+    def initialize(io, env)
+      @io = io
+      @to_io = io.to_io
+      @proto_env = env
+      @env = env.dup
+
+      @parser = HttpParser.new
+      @parsed_bytes = 0
+      @read_header = true
+      @ready = false
+
+      @body = nil
+      @buffer = nil
+
+      @timeout_at = nil
+
+      @requests_served = 0
+    end
+
+    attr_reader :env, :to_io, :body, :io, :timeout_at, :ready
+
+    def inspect
+      "#<Puma::Client:0x#{object_id.to_s(16)} @ready=#{@ready.inspect}>"
+    end
+
+    def set_timeout(val)
+      @timeout_at = Time.now + val
+    end
+
+    def reset
+      @parser.reset
+      @read_header = true
+      @env = @proto_env.dup
+      @body = nil
+      @parsed_bytes = 0
+      @ready = false
+
+      if @buffer
+        @parsed_bytes = @parser.execute(@env, @buffer, @parsed_bytes)
+
+        if @parser.finished?
+          return setup_body
+        elsif @parsed_bytes >= MAX_HEADER
+          raise HttpParserError,
+            "HEADER is longer than allowed, aborting client early."
+        end
+
+        return false
+      end
+    end
+
+    def close
+      begin
+        @io.close
+      rescue IOError
+      end
+    end
+
+    # The object used for a request with no body. All requests with
+    # no body share this one object since it has no state.
+    EmptyBody = NullIO.new
+
+    def setup_body
+      body = @parser.body
+      cl = @env[CONTENT_LENGTH]
+
+      unless cl
+        @buffer = body.empty? ? nil : body
+        @body = EmptyBody
+        @requests_served += 1
+        @ready = true
+        return true
+      end
+
+      remain = cl.to_i - body.bytesize
+
+      if remain <= 0
+        @body = StringIO.new(body)
+        @buffer = nil
+        @requests_served += 1
+        @ready = true
+        return true
+      end
+
+      if remain > MAX_BODY
+        @body = Tempfile.new(Const::PUMA_TMP_BASE)
+        @body.binmode
+      else
+        # The body[0,0] trick is to get an empty string in the same
+        # encoding as body.
+        @body = StringIO.new body[0,0]
+      end
+
+      @body.write body
+
+      @body_remain = remain
+
+      @read_header = false
+
+      return false
+    end
+
+    def try_to_finish
+      return read_body unless @read_header
+
+      data = @io.readpartial(CHUNK_SIZE)
+
+      if @buffer
+        @buffer << data
+      else
+        @buffer = data
+      end
+
+      @parsed_bytes = @parser.execute(@env, @buffer, @parsed_bytes)
+
+      if @parser.finished?
+        return setup_body
+      elsif @parsed_bytes >= MAX_HEADER
+        raise HttpParserError,
+          "HEADER is longer than allowed, aborting client early."
+      end
+      
+      false
+    end
+
+    if IS_JRUBY
+      def jruby_start_try_to_finish
+        return read_body unless @read_header
+
+        begin
+          data = @io.sysread_nonblock(CHUNK_SIZE)
+        rescue OpenSSL::SSL::SSLError => e
+          return false if e.kind_of? IO::WaitReadable
+          raise e
+        end
+
+        if @buffer
+          @buffer << data
+        else
+          @buffer = data
+        end
+
+        @parsed_bytes = @parser.execute(@env, @buffer, @parsed_bytes)
+
+        if @parser.finished?
+          return setup_body
+        elsif @parsed_bytes >= MAX_HEADER
+          raise HttpParserError,
+            "HEADER is longer than allowed, aborting client early."
+        end
+
+        false
+      end
+
+      def eagerly_finish
+        return true if @ready
+
+        if @io.kind_of? OpenSSL::SSL::SSLSocket
+          return true if jruby_start_try_to_finish
+        end
+
+        return false unless IO.select([@to_io], nil, nil, 0)
+        try_to_finish
+      end
+
+    else
+
+      def eagerly_finish
+        return true if @ready
+        return false unless IO.select([@to_io], nil, nil, 0)
+        try_to_finish
+      end
+    end # IS_JRUBY
+
+    def read_body
+      # Read an odd sized chunk so we can read even sized ones
+      # after this
+      remain = @body_remain
+
+      if remain > CHUNK_SIZE
+        want = CHUNK_SIZE
+      else
+        want = remain
+      end
+
+      chunk = @io.readpartial(want)
+
+      # No chunk means a closed socket
+      unless chunk
+        @body.close
+        @buffer = nil
+        @requests_served += 1
+        @ready = true
+        raise EOFError
+      end
+
+      remain -= @body.write(chunk)
+
+      if remain <= 0
+        @body.rewind
+        @buffer = nil
+        @requests_served += 1
+        @ready = true
+        return true
+      end
+
+      @body_remain = remain
+
+      false
+    end
+  end
+end

data/lib/puma/const.rb

@@ -25,12 +25,16 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.5.0".freeze
+    PUMA_VERSION = VERSION = "1.6.0".freeze
 
     # The default number of seconds for another request within a persistent
     # session.
     PERSISTENT_TIMEOUT = 20
 
+    # The default number of seconds to wait until we get the first data
+    # for the request
+    FIRST_DATA_TIMEOUT = 30
+
     DATE = "Date".freeze
 
     SCRIPT_NAME = "SCRIPT_NAME".freeze

data/lib/puma/reactor.rb

@@ -0,0 +1,124 @@
+module Puma
+  class Reactor
+    DefaultSleepFor = 5
+
+    def initialize(server, app_pool)
+      @server = server
+      @events = server.events
+      @app_pool = app_pool
+
+      @mutex = Mutex.new
+      @ready, @trigger = IO.pipe
+      @input = []
+      @sleep_for = DefaultSleepFor
+      @timeouts = []
+    end
+
+    def run
+      sockets = [@ready]
+
+      while true
+        ready = IO.select sockets, nil, nil, @sleep_for
+
+        if ready and reads = ready[0]
+          reads.each do |c|
+            if c == @ready
+              @mutex.synchronize do
+                case @ready.read(1)
+                when "*"
+                  sockets += @input
+                  @input.clear
+                when "!"
+                  return
+                end
+              end
+            else
+              # We have to be sure to remove it from the timeout
+              # list or we'll accidentally close the socket when
+              # it's in use!
+              if c.timeout_at
+                @timeouts.delete c
+              end
+
+              begin
+                if c.try_to_finish
+                  @app_pool << c
+                  sockets.delete c
+                end
+
+              # The client doesn't know HTTP well
+              rescue HttpParserError => e
+                c.close
+                sockets.delete c
+
+                @events.parse_error @server, c.env, e
+
+              rescue IOError => e
+                c.close
+                sockets.delete c
+              end
+            end
+          end
+        end
+
+        unless @timeouts.empty?
+          now = Time.now
+
+          while @timeouts.first.timeout_at < now
+            c = @timeouts.shift
+            sockets.delete c
+            c.close
+
+            break if @timeouts.empty?
+          end
+
+          calculate_sleep
+        end
+      end
+    end
+
+    def run_in_thread
+      @thread = Thread.new {
+        begin
+          run
+        rescue Exception => e
+          puts "MAJOR ERROR DETECTED"
+          p e
+          puts e.backtrace
+        end
+      }
+    end
+
+    def calculate_sleep
+      if @timeouts.empty?
+        @sleep_for = DefaultSleepFor
+      else
+        diff = @timeouts.first.timeout_at.to_f - Time.now.to_f
+
+        if diff < 0.0
+          @sleep_for = 0
+        else
+          @sleep_for = diff
+        end
+      end
+    end
+
+    def add(c)
+      @mutex.synchronize do
+        @input << c
+        @trigger << "*"
+
+        if c.timeout_at
+          @timeouts << c
+          @timeouts.sort! { |a,b| a.timeout_at <=> b.timeout_at }
+
+          calculate_sleep
+        end
+      end
+    end
+
+    def shutdown
+      @trigger << "!"
+    end
+  end
+end

data/lib/puma/server.rb

@@ -6,6 +6,8 @@ require 'puma/const'
 require 'puma/events'
 require 'puma/null_io'
 require 'puma/compat'
+require 'puma/reactor'
+require 'puma/client'
 
 require 'puma/puma_http11'
 
@@ -54,6 +56,8 @@ module Puma
       @persistent_timeout = PERSISTENT_TIMEOUT
       @persistent_check, @persistent_wakeup = IO.pipe
 
+      @first_data_timeout = FIRST_DATA_TIMEOUT
+
       @unix_paths = []
 
       @proto_env = {
@@ -61,7 +65,7 @@ module Puma
         "rack.errors".freeze => events.stderr,
         "rack.multithread".freeze => true,
         "rack.multiprocess".freeze => false,
-        "rack.run_once".freeze => true,
+        "rack.run_once".freeze => false,
         "SCRIPT_NAME".freeze => ENV['SCRIPT_NAME'] || "",
 
         # Rack blows up if this is an empty string, and Rack::Lint
@@ -196,10 +200,30 @@ module Puma
 
       @status = :run
 
-      @thread_pool = ThreadPool.new(@min_threads, @max_threads) do |client, env|
-        process_client(client, env)
+      @thread_pool = ThreadPool.new(@min_threads, @max_threads) do |client|
+        process_now = false
+
+        begin
+          process_now = client.eagerly_finish
+        rescue HttpParserError => e
+          client.close
+          @events.parse_error self, client.env, e
+        rescue IOError
+          client.close
+        else
+          if process_now
+            process_client client
+          else
+            client.set_timeout @first_data_timeout
+            @reactor.add client
+          end
+        end
       end
 
+      @reactor = Reactor.new self, @thread_pool
+
+      @reactor.run_in_thread
+
       if @auto_trim_time
         @thread_pool.auto_trim!(@auto_trim_time)
       end
@@ -225,7 +249,8 @@ module Puma
               if sock == check
                 break if handle_check
               else
-                pool << [sock.accept, @envs.fetch(sock, @proto_env)]
+                c = Client.new sock.accept, @envs.fetch(sock, @proto_env)
+                pool << c
               end
             end
           rescue Errno::ECONNABORTED
@@ -236,6 +261,7 @@ module Puma
           end
         end
 
+        @reactor.shutdown
         graceful_shutdown if @status == :stop
       ensure
         unless @status == :restart
@@ -270,72 +296,34 @@ module Puma
     # indicates that it supports keep alive, wait for another request before
     # returning.
     #
-    def process_client(client, proto_env)
-      parser = HttpParser.new
-      close_socket = true
-
+    def process_client(client)
       begin
-        while true
-          parser.reset
-
-          env = proto_env.dup
-          data = client.readpartial(CHUNK_SIZE)
-          nparsed = 0
-
-          # Assumption: nparsed will always be less since data will get filled
-          # with more after each parsing.  If it doesn't get more then there was
-          # a problem with the read operation on the client socket. 
-          # Effect is to stop processing when the socket can't fill the buffer
-          # for further parsing.
-          while nparsed < data.bytesize
-            nparsed = parser.execute(env, data, nparsed)
-
-            if parser.finished?
-              cl = env[CONTENT_LENGTH]
-
-              case handle_request(env, client, parser.body, cl)
-              when false
-                return
-              when :async
-                close_socket = false
-                return
-              end
-
-              nparsed += parser.body.bytesize if cl
-
-              if data.bytesize > nparsed
-                data.slice!(0, nparsed)
-                parser.reset
-                env = @proto_env.dup
-                nparsed = 0
-              else
-                unless ret = IO.select([client, @persistent_check], nil, nil, @persistent_timeout)
-                  raise EOFError, "Timed out persistent connection"
-                end
+        close_socket = true
 
-                return if ret.first.include? @persistent_check
-              end
-            else
-              # Parser is not done, queue up more data to read and continue parsing
-              chunk = client.readpartial(CHUNK_SIZE)
-              return if !chunk or chunk.length == 0  # read failed, stop processing
-
-              data << chunk
-              if data.bytesize >= MAX_HEADER
-                raise HttpParserError,
-                  "HEADER is longer than allowed, aborting client early."
-              end
+        while true
+          case handle_request(client)
+          when false
+            return
+          when :async
+            close_socket = false
+            return
+          when true
+            unless client.reset
+              close_socket = false
+              client.set_timeout @persistent_timeout
+              @reactor.add client
+              return
             end
           end
         end
 
       # The client disconnected while we were reading data
-      rescue EOFError, SystemCallError
+      rescue IOError, SystemCallError => e
         # Swallow them. The ensure tries to close +client+ down
 
       # The client doesn't know HTTP well
       rescue HttpParserError => e
-        @events.parse_error self, env, e
+        @events.parse_error self, client.env, e
 
       # Server error
       rescue StandardError => e
@@ -390,10 +378,6 @@ module Puma
       env[REMOTE_ADDR] = client.peeraddr.last
     end
 
-    # The object used for a request with no body. All requests with
-    # no body share this one object since it has no state.
-    EmptyBody = NullIO.new
-
     # Given the request +env+ from +client+ and a partial request body
     # in +body+, finish reading the body if there is one and invoke
     # the rack app. Then construct the response and write it back to
@@ -403,17 +387,15 @@ module Puma
     # was one. This is an optimization to keep from having to look
     # it up again.
     #
-    def handle_request(env, client, body, cl)
+    def handle_request(req)
+      env = req.env
+      client = req.io
+
       normalize_env env, client
 
       env[PUMA_SOCKET] = client
 
-      if cl
-        body = read_body env, client, body, cl
-        return false unless body
-      else
-        body = EmptyBody
-      end
+      body = req.body
 
       env[RACK_INPUT] = body
       env[RACK_URL_SCHEME] =  env[HTTPS_KEY] ? HTTPS : HTTP

data/lib/puma/thread_pool.rb

@@ -37,7 +37,7 @@ module Puma
       end
     end
 
-    attr_reader :spawned
+    attr_reader :spawned, :trim_requested
 
     # How many objects have yet to be processed by the pool?
     #

data/puma.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-07-19"
+  s.date = "2012-08-12"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = [".travis.yml", "COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
+  s.files = [".travis.yml", "COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "examples/CA/cacert.pem", "examples/CA/newcerts/cert_1.pem", "examples/CA/newcerts/cert_2.pem", "examples/CA/private/cakeypair.pem", "examples/CA/serial", "examples/config.rb", "examples/puma/cert_puma.pem", "examples/puma/csr_puma.pem", "examples/puma/puma_keypair.pem", "examples/qc_config.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/jruby_restart.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/config/app.rb", "test/hello-post.ru", "test/hello.ru", "test/lobster.ru", "test/mime.yaml", "test/slow.ru", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.18"
+  s.rubygems_version = "1.8.24"
   s.summary = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications"
   s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 

data/test/hello-post.ru

@@ -0,0 +1,4 @@
+run lambda { |env|
+  p :body => env['rack.input'].read
+  [200, {"Content-Type" => "text/plain"}, ["Hello World"]]
+}

data/test/test_persistent.rb

@@ -22,8 +22,12 @@ class TestPersistent < Test::Unit::TestCase
       [status, @headers, @body]
     end
 
+    @host = "127.0.0.1"
+    @port = 9988
+
     @server = Puma::Server.new @simple
     @server.add_tcp_listener "127.0.0.1", 9988
+    @server.max_threads = 1
     @server.run
 
     @client = TCPSocket.new "127.0.0.1", 9988
@@ -212,7 +216,23 @@ class TestPersistent < Test::Unit::TestCase
 
     assert_kind_of Puma::NullIO, @inputs[0]
     assert_kind_of Puma::NullIO, @inputs[1]
+  end
+
+  def test_keepalive_doesnt_starve_clients
+    sz = @body[0].size.to_s
+
+    @client << @valid_request
+
+    c2 = TCPSocket.new @host, @port
+    c2 << @valid_request
+
+    out = IO.select([c2], nil, nil, 1)
+
+    assert out, "select returned nil"
+    assert_equal c2, out.first.first
 
+    assert_equal "HTTP/1.1 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4, c2)
+    assert_equal "Hello", c2.read(5)
   end
 
 end

data/test/test_thread_pool.rb

@@ -113,11 +113,11 @@ class TestThreadPool < Test::Unit::TestCase
     pool.trim
     pool.trim
 
+    assert_equal 0, pool.trim_requested
+
     finish = true
 
     pause
-
-    assert_equal 2, pool.spawned
   end
 
   def test_autotrim

metadata

@@ -1,102 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puma
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-description: |-
-  Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.
-  
-  Under the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!
-  
-  With Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.
-  
-  On MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org).
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'Puma is a simple, fast, and highly concurrent HTTP 1.1 server for
+  Ruby web applications. It can be used with any application that supports Rack, and
+  is considered the replacement for Webrick and Mongrel. It was designed to be the
+  go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and
+  MRI. Puma is intended for use in both development and production environments.
+
+
+  Under the hood, Puma processes requests using a C-optimized Ragel extension (inherited
+  from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable
+  way. Puma then serves the request in a thread from an internal thread pool (which
+  you can control). This allows Puma to provide real concurrency for your web application!
+
+
+  With Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning
+  you won''t have to spawn multiple processes to increase throughput. You can expect
+  to see a similar benefit from JRuby.
+
+
+  On MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can
+  be run at a time. But if you''re doing a lot of blocking IO (such as HTTP calls
+  to external APIs like Twitter), Puma still improves MRI''s throughput by allowing
+  blocking IO to be run concurrently (EventMachine-based servers such as Thin turn
+  off this ability, requiring you to use special libraries). Your mileage may vary.
+  In order to get the best throughput, it is highly recommended that you use a Ruby
+  implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org).'
+email:
 - evan@phx.io
-executables: 
+executables:
 - puma
 - pumactl
-extensions: 
+extensions:
 - ext/puma_http11/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+files:
 - .travis.yml
 - COPYING
 - Gemfile
@@ -132,6 +146,7 @@ files:
 - lib/puma.rb
 - lib/puma/app/status.rb
 - lib/puma/cli.rb
+- lib/puma/client.rb
 - lib/puma/compat.rb
 - lib/puma/configuration.rb
 - lib/puma/const.rb
@@ -140,12 +155,14 @@ files:
 - lib/puma/jruby_restart.rb
 - lib/puma/null_io.rb
 - lib/puma/rack_patch.rb
+- lib/puma/reactor.rb
 - lib/puma/server.rb
 - lib/puma/thread_pool.rb
 - lib/rack/handler/puma.rb
 - puma.gemspec
 - test/ab_rs.rb
 - test/config/app.rb
+- test/hello-post.ru
 - test/hello.ru
 - test/lobster.ru
 - test/mime.yaml
@@ -168,41 +185,32 @@ files:
 - tools/trickletest.rb
 homepage: http://puma.io
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: puma
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications
-test_files: 
+summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web
+  applications
+test_files:
 - test/test_app_status.rb
 - test/test_cli.rb
 - test/test_config.rb