puma 2.0.0.b4 → 2.0.0.b5

data/History.txt

@@ -1,3 +1,20 @@
+=== 2.0.0.b5 / 2013-02-05
+
+* 2 major features:
+  * Add phased worker upgrade
+  * Add support for the rack hijack protocol
+
+* 2 minor features:
+  * Add -R to specify the restart command
+  * Add config file option to specify the restart command
+
+* 5 bug fixes:
+  * Cleanup pipes properly. Fixes #182
+  * Daemonize earlier so that we don't lose app threads. Fixes #183
+  * Drain the notification pipe. Fixes #176, thanks @cryo28
+  * Move write_pid to after we daemonize. Fixes #180
+  * Redirect IO properly and emit message for checkpointing
+
 === 2.0.0.b4 / 2012-12-12
 
 * 4 bug fixes:

data/Manifest.txt

@@ -48,6 +48,7 @@ lib/puma/rack_patch.rb
 lib/puma/reactor.rb
 lib/puma/server.rb
 lib/puma/thread_pool.rb
+lib/puma/util.rb
 lib/rack/handler/puma.rb
 puma.gemspec
 tools/jungle/README.md

data/Rakefile

@@ -19,7 +19,7 @@ HOE = Hoe.spec "puma" do
 
   require_ruby_version ">= 1.8.7"
 
-  dependency "rack", "~> 1.2"
+  dependency "rack", [">= 1.1", "< 2.0"]
 
   extra_dev_deps << ["rake-compiler", "~> 0.8.0"]
 end

data/lib/puma/cli.rb

@@ -7,6 +7,7 @@ require 'puma/configuration'
 require 'puma/binder'
 require 'puma/detect'
 require 'puma/daemon_ext'
+require 'puma/util'
 
 require 'rack/commonlogger'
 require 'rack/utils'
@@ -27,6 +28,7 @@ module Puma
       @stdout = stdout
       @stderr = stderr
 
+      @phase = 0
       @workers = []
 
       @events = Events.new @stdout, @stderr
@@ -35,6 +37,7 @@ module Puma
       @status = nil
 
       @restart = false
+      @phased_state = :idle
 
       ENV['NEWRELIC_DISPATCHER'] ||= "puma"
 
@@ -82,6 +85,10 @@ module Puma
           arg0 = [Gem.ruby, "-S", $0]
         end
 
+        # Detect and reinject -Ilib from the command line
+        lib = File.expand_path "lib"
+        arg0[1,0] = ["-I", lib] if $:[0] == lib
+
         @restart_argv = arg0 + ARGV
       end
     end
@@ -225,7 +232,7 @@ module Puma
           @options[:quiet] = true
         end
 
-        o.on "--restart-cmd CMD",
+        o.on "-R", "--restart-cmd CMD",
              "The puma command to run during a hot restart",
              "Default: inferred" do |cmd|
           @options[:restart_cmd] = cmd
@@ -291,6 +298,8 @@ module Puma
     end
 
     def write_state
+      write_pid
+
       require 'yaml'
 
       if path = @options[:state]
@@ -334,10 +343,12 @@ module Puma
 
       if stdout
         STDOUT.reopen stdout, (append ? "a" : "w")
+        STDOUT.puts "=== puma startup: #{Time.now} ==="
       end
 
       if stderr
-        STDOUT.reopen stderr, (append ? "a" : "w")
+        STDERR.reopen stderr, (append ? "a" : "w")
+        STDERR.puts "=== puma startup: #{Time.now} ==="
       end
     end
 
@@ -364,9 +375,6 @@ module Puma
 
       set_rack_environment
 
-      write_pid
-      write_state
-
       if clustered
         run_cluster
       else
@@ -375,6 +383,8 @@ module Puma
     end
 
     def run_single
+      write_state
+
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
@@ -384,6 +394,10 @@ module Puma
 
       @binder.parse @options[:binds], self
 
+      if @options[:daemon]
+        Process.daemon(true, true)
+      end
+
       server = Puma::Server.new @config.app, @events
       server.binder = @binder
       server.min_threads = min_t
@@ -441,9 +455,7 @@ module Puma
         log "*** Sorry signal SIGTERM not implemented, gracefully stopping feature disabled!"
       end
 
-      if @options[:daemon]
-        Process.daemon(true)
-      else
+      unless @options[:daemon]
         log "Use Ctrl-C to stop"
       end
 
@@ -473,6 +485,7 @@ module Puma
       $0 = "puma: cluster worker: #{@master_pid}"
       Signal.trap "SIGINT", "IGNORE"
 
+      @master_read.close
       @suicide_pipe.close
 
       Thread.new do
@@ -493,7 +506,12 @@ module Puma
         server.stop
       end
 
+      @worker_write << "b#{Process.pid}\n"
+
       server.run.join
+
+    ensure
+      @worker_write.close
     end
 
     def stop_workers
@@ -509,12 +527,27 @@ module Puma
       end
     end
 
+    def start_phased_restart
+      @phase += 1
+      log "- Starting phased worker restart, phase: #{@phase}"
+    end
+
     class Worker
-      def initialize(pid)
+      def initialize(pid, phase)
         @pid = pid
+        @phase = phase
+        @stage = :started
       end
 
-      attr_reader :pid
+      attr_reader :pid, :phase
+
+      def booted?
+        @stage == :booted
+      end
+
+      def boot!
+        @stage = :booted
+      end
 
       def term
         begin
@@ -530,8 +563,16 @@ module Puma
       diff.times do
         pid = fork { worker }
         debug "Spawned worker: #{pid}"
-        @workers << Worker.new(pid)
+        @workers << Worker.new(pid, @phase)
       end
+
+      if diff > 0
+        @phased_state = :idle
+      end
+    end
+
+    def all_workers_booted?
+      @workers.count { |w| !w.booted? } == 0
     end
 
     def check_workers
@@ -543,6 +584,20 @@ module Puma
       end
 
       spawn_workers
+
+      if @phased_state == :idle && all_workers_booted?
+        # If we're running at proper capacity, check to see if
+        # we need to phase any workers out (which will restart
+        # in the right phase).
+        #
+        w = @workers.find { |x| x.phase != @phase }
+
+        if w
+          @phased_state = :waiting
+          log "- Stopping #{w.pid} for phased upgrade..."
+          w.term
+        end
+      end
     end
 
     def run_cluster
@@ -555,7 +610,7 @@ module Puma
 
       @master_pid = Process.pid
 
-      read, write = IO.pipe
+      read, write = Puma::Util.pipe
 
       Signal.trap "SIGCHLD" do
         write.write "!"
@@ -580,21 +635,34 @@ module Puma
       rescue Exception
       end
 
+      phased_restart = false
+
+      begin
+        Signal.trap "SIGUSR1" do
+          phased_restart = true
+          write.write "!"
+        end
+      rescue Exception
+      end
+
       # Used by the workers to detect if the master process dies.
       # If select says that @check_pipe is ready, it's because the
       # master has exited and @suicide_pipe has been automatically
       # closed.
       #
-      @check_pipe, @suicide_pipe = IO.pipe
+      @check_pipe, @suicide_pipe = Puma::Util.pipe
 
       if @options[:daemon]
-        Process.daemon(true)
+        Process.daemon(true, true)
       else
         log "Use Ctrl-C to stop"
       end
 
       redirect_io
 
+      write_state
+
+      @master_read, @worker_write = read, write
       spawn_workers
 
       Signal.trap "SIGINT" do
@@ -605,8 +673,30 @@ module Puma
       begin
         while !stop
           begin
-            IO.select([read], nil, nil, 5)
+            res = IO.select([read], nil, nil, 5)
+
+            if res
+              req = read.read_nonblock(1)
+
+              if req == "b"
+                pid = read.gets.to_i
+                w = @workers.find { |w| w.pid == pid }
+                if w
+                  w.boot!
+                  log "- Worker #{pid} booted, phase: #{w.phase}"
+                else
+                  log "! Out-of-sync worker list, no #{pid} worker"
+                end
+              end
+            end
+
             check_workers
+
+            if phased_restart
+              start_phased_restart
+              phased_restart = false
+            end
+
           rescue Interrupt
             stop = true
           end
@@ -615,6 +705,10 @@ module Puma
         stop_workers
       ensure
         delete_pidfile
+        @check_pipe.close
+        @suicide_pipe.close
+        read.close
+        write.close
       end
 
       if @restart

data/lib/puma/client.rb

@@ -36,14 +36,22 @@ module Puma
       @timeout_at = nil
 
       @requests_served = 0
+      @hijacked = false
     end
 
-    attr_reader :env, :to_io, :body, :io, :timeout_at, :ready
+    attr_reader :env, :to_io, :body, :io, :timeout_at, :ready, :hijacked
 
     def inspect
       "#<Puma::Client:0x#{object_id.to_s(16)} @ready=#{@ready.inspect}>"
     end
 
+    # For the hijack protocol (allows us to just put the Client object
+    # into the env)
+    def call
+      @hijacked = true
+      env[HIJACK_IO] ||= @io
+    end
+
     def set_timeout(val)
       @timeout_at = Time.now + val
     end

data/lib/puma/configuration.rb

@@ -176,6 +176,14 @@ module Puma
         @options[:on_restart] << blk
       end
 
+      # Command to use to restart puma. This should be just how to
+      # load puma itself (ie. 'ruby -Ilib bin/puma'), not the arguments
+      # to puma, as those are the same as the original process.
+      #
+      def restart_command(cmd)
+        @options[:request_cmd] = cmd
+      end
+
       # Store the pid of the server in the file at +path+.
       def pidfile(path)
         @options[:pidfile] = path

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.0.0.b4".freeze
+    PUMA_VERSION = VERSION = "2.0.0.b5".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
@@ -147,5 +147,9 @@ module Puma
     COLON = ": ".freeze
 
     NEWLINE = "\n".freeze
+
+    HIJACK_P = "rack.hijack?".freeze
+    HIJACK = "rack.hijack".freeze
+    HIJACK_IO = "rack.hijack_io".freeze
   end
 end

data/lib/puma/reactor.rb

@@ -1,3 +1,5 @@
+require 'puma/util'
+
 module Puma
   class Reactor
     DefaultSleepFor = 5
@@ -8,7 +10,7 @@ module Puma
       @app_pool = app_pool
 
       @mutex = Mutex.new
-      @ready, @trigger = IO.pipe
+      @ready, @trigger = Puma::Util.pipe
       @input = []
       @sleep_for = DefaultSleepFor
       @timeouts = []
@@ -89,6 +91,9 @@ module Puma
           calculate_sleep
         end
       end
+    ensure
+      @trigger.close
+      @ready.close
     end
 
     def run_in_thread
@@ -135,11 +140,18 @@ module Puma
 
     # Close all watched sockets and clear them from being watched
     def clear!
-      @trigger << "c"
+      begin
+        @trigger << "c"
+      rescue IOError
+      end
     end
 
     def shutdown
-      @trigger << "!"
+      begin
+        @trigger << "!"
+      rescue IOError
+      end
+
       @thread.join
     end
   end

data/lib/puma/server.rb

@@ -11,6 +11,7 @@ require 'puma/client'
 require 'puma/binder'
 require 'puma/delegation'
 require 'puma/accept_nonblock'
+require 'puma/util'
 
 require 'puma/puma_http11'
 
@@ -49,7 +50,7 @@ module Puma
       @app = app
       @events = events
 
-      @check, @notify = IO.pipe
+      @check, @notify = Puma::Util.pipe
 
       @status = :stop
 
@@ -61,7 +62,6 @@ module Puma
       @thread_pool = nil
 
       @persistent_timeout = PERSISTENT_TIMEOUT
-      @persistent_check, @persistent_wakeup = IO.pipe
 
       @binder = Binder.new(events)
       @first_data_timeout = FIRST_DATA_TIMEOUT
@@ -191,8 +191,10 @@ module Puma
 
         @reactor.shutdown
       ensure
+        @check.close
+        @notify.close
+
         unless @status == :restart
-          @check.close
           @binder.close
         end
       end
@@ -330,6 +332,9 @@ module Puma
 
       env[PUMA_SOCKET] = client
 
+      env[HIJACK_P] = true
+      env[HIJACK] = req
+
       body = req.body
 
       env[RACK_INPUT] = body
@@ -343,6 +348,9 @@ module Puma
       begin
         begin
           status, headers, res_body = @app.call(env)
+
+          return :async if req.hijacked
+
           status = status.to_i
 
           if status == -1
@@ -404,6 +412,8 @@ module Puma
           end
         end
 
+        response_hijack = nil
+
         headers.each do |k, vs|
           case k
           when CONTENT_LENGTH2
@@ -414,6 +424,9 @@ module Puma
             content_length = nil
           when CONTENT_TYPE
             next if no_body
+          when HIJACK
+            response_hijack = vs
+            next
           end
 
           vs.split(NEWLINE).each do |v|
@@ -433,18 +446,25 @@ module Puma
           lines << CONNECTION_CLOSE
         end
 
-        if content_length
-          lines.append CONTENT_LENGTH_S, content_length.to_s, line_ending
-          chunked = false
-        elsif allow_chunked
-          lines << TRANSFER_ENCODING_CHUNKED
-          chunked = true
+        unless response_hijack
+          if content_length
+            lines.append CONTENT_LENGTH_S, content_length.to_s, line_ending
+            chunked = false
+          elsif allow_chunked
+            lines << TRANSFER_ENCODING_CHUNKED
+            chunked = true
+          end
         end
 
         lines << line_ending
 
         fast_write client, lines.to_s
 
+        if response_hijack
+          response_hijack.call client
+          return :async
+        end
+
         res_body.each do |part|
           if chunked
             client.syswrite part.bytesize.to_s(16)
@@ -545,21 +565,18 @@ module Puma
     # off the request queue before finally exiting.
     #
     def stop(sync=false)
-      @persistent_wakeup.close
       @notify << STOP_COMMAND
 
       @thread.join if @thread && sync
     end
 
     def halt(sync=false)
-      @persistent_wakeup.close
       @notify << HALT_COMMAND
 
       @thread.join if @thread && sync
     end
 
     def begin_restart
-      @persistent_wakeup.close
       @notify << RESTART_COMMAND
     end
 

data/lib/puma/util.rb

@@ -0,0 +1,9 @@
+module Puma
+  module Util
+    module_function
+
+    def pipe
+      IO.pipe
+    end
+  end
+end

data/puma.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.0.0.b4"
+  s.version = "2.0.0.b5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-12-13"
+  s.date = "2013-02-06"
   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 = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "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/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.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/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.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", "tools/jungle/README.md", "tools/jungle/puma", "tools/jungle/run-puma", "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_iobuffer.rb", "test/test_minissl.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"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "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/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.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/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.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/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/puma", "tools/jungle/run-puma", "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_iobuffer.rb", "test/test_minissl.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"]
   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.24"
+  s.rubygems_version = "1.8.25"
   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_iobuffer.rb", "test/test_minissl.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"]
 
@@ -26,18 +26,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.2"])
+      s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
       s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.2"])
+    s.add_dependency(%q<rack>, ["< 2.0", ">= 1.1"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
     s.add_dependency(%q<hoe>, ["~> 3.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.0.0.b4
+  version: 2.0.0.b5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +167,7 @@ files:
 - lib/puma/reactor.rb
 - lib/puma/server.rb
 - lib/puma/thread_pool.rb
+- lib/puma/util.rb
 - lib/rack/handler/puma.rb
 - puma.gemspec
 - tools/jungle/README.md
@@ -204,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: puma
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web