puma 2.7.1-java → 2.8.0-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 604797b820e7795890f76c88044863ef3a43d0e8
+  data.tar.gz: 393dcdd1212faebe9ec608666cb6050efe2f596b
+SHA512:
+  metadata.gz: 680abe37fe6c5c7052d67306501c8a2f0a0a0c35716d2a5efb181f09ed3b1c0793e5f37344fb3236a2334171814ce7acb2421526fd9d93778a71d4e800475e24
+  data.tar.gz: 413b9efbec3292e0c7d87933bb0bd568c8f3afea0e8207e3e92d14d6e785de2ef1f6565d659fd282c32eef60319a3e9b3b33c9c7b19ade607b0ccd86a97b6852

data/Gemfile

@@ -10,3 +10,8 @@ gem "rack"
 gem 'minitest', '~> 4.0'
 
 gem "jruby-openssl", :platform => "jruby"
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end
+

data/History.txt

@@ -1,3 +1,46 @@
+=== 2.8.0 / 2014-02-28
+
+* 8 minor features:
+  * Add ability to autoload a config file. Fixes #438
+  * Add ability to detect and terminate hung workers. Fixes #333
+  * Add booted_workers to stats response
+  * Add config to customize the default error message
+  * Add prune_bundler option
+  * Add worker indexes, expose them via on_worker_boot. Fixes #440
+  * Add pretty process name
+  * Show the ruby version in use
+
+* 7 bug fixes:
+  * Added 408 status on timeout.
+  * Be more hostile with sockets that write block. Fixes #449
+  * Expect at_exit to exclusively remove the pidfile. Fixes #444
+  * Expose latency and listen backlog via bind query. Fixes #370
+  * JRuby raises IOError if the socket is there. Fixes #377
+  * Process requests fairly. Fixes #406
+  * Rescue SystemCallError as well. Fixes #425
+
+* 4 doc changes:
+  * Add 2.1.0 to the matrix
+  * Add Code Climate badge to README
+  * Create signals.md
+  * Set the license to BSD. Fixes #432
+
+* 14 PRs merged:
+  * Merge pull request #428 from alexeyfrank/capistrano_default_hooks
+  * Merge pull request #429 from namusyaka/revert-const_defined
+  * Merge pull request #431 from mrb/master
+  * Merge pull request #433 from alepore/process-name
+  * Merge pull request #437 from ibrahima/master
+  * Merge pull request #446 from sudara/master
+  * Merge pull request #451 from pwiebe/status_408
+  * Merge pull request #453 from joevandyk/patch-1
+  * Merge pull request #470 from arthurnn/fix_458
+  * Merge pull request #472 from rubencaro/master
+  * Merge pull request #480 from jjb/docs-on-running-test-suite
+  * Merge pull request #481 from schneems/master
+  * Merge pull request #482 from prathamesh-sonpatki/signals-doc-cleanup
+  * Merge pull request #483 from YotpoLtd/master
+
 === 2.7.1 / 2013-12-05
 
 * 1 bug fix:

data/Manifest.txt

@@ -9,6 +9,7 @@ bin/puma
 bin/pumactl
 docs/config.md
 docs/nginx.md
+docs/signals.md
 ext/puma_http11/PumaHttp11Service.java
 ext/puma_http11/ext_help.h
 ext/puma_http11/extconf.rb

data/README.md

@@ -1,6 +1,6 @@
 # Puma: A Ruby Web Server Built For Concurrency
 
-[![Build Status](https://secure.travis-ci.org/puma/puma.png)](http://travis-ci.org/puma/puma) [![Dependency Status](https://gemnasium.com/puma/puma.png)](https://gemnasium.com/puma/puma)
+[![Build Status](https://secure.travis-ci.org/puma/puma.png)](http://travis-ci.org/puma/puma) [![Dependency Status](https://gemnasium.com/puma/puma.png)](https://gemnasium.com/puma/puma) <a href="https://codeclimate.com/github/puma/puma"><img src="https://codeclimate.com/github/puma/puma.png" /></a>
 
 ## Description
 
@@ -82,7 +82,7 @@ Puma 2 offers clustered mode, allowing you to use forked processes to handle mul
 On a ruby implementation that offers native threads, you should tune this number to match the number of cores available.
 Note that threads are still used in clustered mode, and the `-t` thread flag setting is per worker, so `-w 2 -t 16:16` will be 32 threads.
 
-If you're running in Clustered Mode you can optionally choose to preload your application before starting up the workers. This is necessary in order to take advantate of the [Copy on Write](http://en.wikipedia.org/wiki/Copy-on-write) feature introduced in [MRI Ruby 2.0](https://blog.heroku.com/archives/2013/3/6/matz_highlights_ruby_2_0_at_waza). To do this simply specify the `--preload` flag in invocation:
+If you're running in Clustered Mode you can optionally choose to preload your application before starting up the workers. This is necessary in order to take advantage of the [Copy on Write](http://en.wikipedia.org/wiki/Copy-on-write) feature introduced in [MRI Ruby 2.0](https://blog.heroku.com/archives/2013/3/6/matz_highlights_ruby_2_0_at_waza). To do this simply specify the `--preload` flag in invocation:
 
     # CLI invocation
     $ puma -t 8:32 -w 3 --preload
@@ -205,6 +205,14 @@ $ bundle exec cap puma:stop
 $ bundle exec cap puma:phased_restart
 ```
 
+## Contributing
+
+To run the test suite:
+
+```bash
+$ bundle install
+$ bundle exec rake
+```
 
 ## License
 

data/Rakefile

@@ -12,6 +12,7 @@ HOE = Hoe.spec "puma" do
   self.readme_file    = "README.md"
   self.urls = %w!http://puma.io https://github.com/puma/puma!
 
+  license "BSD"
   developer 'Evan Phoenix', 'evan@phx.io'
 
   spec_extras[:extensions]  = ["ext/puma_http11/extconf.rb"]

data/docs/signals.md

@@ -0,0 +1,42 @@
+The [unix signal](http://en.wikipedia.org/wiki/Unix_signal) is a method of sending messages between [processes](http://en.wikipedia.org/wiki/Process_(computing)). When a signal is sent, the operating system interrupts the target process's normal flow of execution. There are standard signals that are used to stop a process but there are also custom signals that can be used for other purposes. This document is an attempt to list all supported signals that Puma will respond to. In general, signals need only be sent to the master process of a cluster.
+
+## Sending Signals
+
+If you are new to signals it can be useful to see how they can be used. When a process is created in a *nix like operating system it will have a [PID - or process identifier](http://en.wikipedia.org/wiki/Process_identifier) that can be used to send signals to the process. For demonstration we will create an infinitely running process by tailing a file:
+
+```sh
+$ echo "foo" >> my.log
+$ irb
+> pid = Process.spawn 'tail -f my.log'
+```
+
+From here we can see that the tail process is running by using the `ps` command:
+
+```sh
+$ ps aux | grep tail
+schneems        87152   0.0  0.0  2432772    492 s032  S+   12:46PM   0:00.00 tail -f my.log
+```
+
+You can send a signal in Ruby using the [Process module](http://www.ruby-doc.org/core-2.1.1/Process.html#kill-method):
+
+```
+$ irb
+> puts pid
+=> 87152
+Process.detach(pid) # http://ruby-doc.org/core-2.1.1/Process.html#method-c-detach
+Process.kill("TERM", pid)
+```
+
+Now you will see via `ps` that there is no more `tail` process. Sometimes when referring to signals the `SIG` prefix will be used for instance `SIGTERM` is equivalent to sending `TERM` via `Process.kill`.
+
+## Puma Signals
+
+Puma cluster responds to these signals:
+
+- `TTIN` increment the worker count by 1
+- `TTOU` decrement the worker count by 1
+- `TERM` send `TERM` to worker. Worker will attempt to finish then exit.
+- `USR2` restart workers
+- `USR1` restart workers in phases, a rolling restart.
+- `INT` equivalent of sending Ctrl-C to cluster. Will attempt to finish then exit.
+- `CHLD`

data/lib/puma/binder.rb

@@ -87,8 +87,13 @@ module Puma
             logger.log "* Inherited #{str}"
             io = inherit_tcp_listener uri.host, uri.port, fd
           else
+            params = Rack::Utils.parse_query uri.query
+
+            opt = params.key?('low_latency')
+            bak = params.fetch('backlog', 1024).to_i
+
             logger.log "* Listening on #{str}"
-            io = add_tcp_listener uri.host, uri.port
+            io = add_tcp_listener uri.host, uri.port, opt, bak
           end
 
           @listeners << [str, io]
@@ -256,10 +261,10 @@ module Puma
       begin
         old_mask = File.umask(umask)
 
-        if File.exists? path
+        if File.exist? path
           begin
             old = UNIXSocket.new path
-          rescue SystemCallError
+          rescue SystemCallError, IOError
             File.unlink path
           else
             old.close

data/lib/puma/capistrano.rb

@@ -1,13 +1,11 @@
 Capistrano::Configuration.instance.load do
-  after 'deploy:stop', 'puma:stop'
-  after 'deploy:start', 'puma:start'
-  after 'deploy:restart', 'puma:restart'
 
   # Ensure the tmp/sockets directory is created by the deploy:setup task and
   # symlinked in by the deploy:update task. This is not handled by Capistrano
   # v2 but is fixed in v3.
   shared_children.push('tmp/sockets')
 
+  _cset(:puma_default_hooks)    { true }
   _cset(:puma_cmd)    { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
   _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
   _cset(:puma_env)    { fetch(:rack_env, fetch(:rails_env, 'production')) }
@@ -15,6 +13,12 @@ Capistrano::Configuration.instance.load do
   _cset(:puma_socket) { "unix://#{shared_path}/sockets/puma.sock" }
   _cset(:puma_role)   { :app }
 
+  if fetch(:puma_default_hooks)
+    after 'deploy:stop', 'puma:stop'
+    after 'deploy:start', 'puma:start'
+    after 'deploy:restart', 'puma:restart'
+  end
+
   namespace :puma do
     desc 'Start puma'
     task :start, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do

data/lib/puma/cli.rb

@@ -99,7 +99,8 @@ module Puma
         :binds => [],
         :workers => 0,
         :daemon => false,
-        :worker_boot => []
+        :before_worker_boot => [],
+        :after_worker_boot => []
       }
 
       @parser = OptionParser.new do |o|
@@ -161,6 +162,10 @@ module Puma
           @options[:preload_app] = true
         end
 
+        o.on "--prune-bundler", "Prune out the bundler env if possible" do
+          @options[:prune_bundler] = true
+        end
+
         o.on "-q", "--quiet", "Quiet down the output" do
           @options[:quiet] = true
         end
@@ -200,6 +205,9 @@ module Puma
           @options[:workers] = arg.to_i
         end
 
+        o.on "--tag NAME", "Additional text to display in process listing" do |arg|
+          @options[:tag] = arg
+        end
       end
 
       @parser.banner = "puma <options> <rackup file>"
@@ -220,7 +228,7 @@ module Puma
 
         cfg = @config.dup
 
-        [ :logger, :worker_boot, :on_restart ].each { |o| cfg.options.delete o }
+        [ :logger, :before_worker_boot, :after_worker_boot, :on_restart ].each { |o| cfg.options.delete o }
 
         state["config"] = cfg
 
@@ -263,10 +271,31 @@ module Puma
 
     def delete_pidfile
       if path = @options[:pidfile]
-        File.unlink path if File.exists? path
+        File.unlink path if File.exist? path
       end
     end
 
+    def find_config
+      if cfg = @options[:config_file]
+        # Allow - to disable config finding
+        if cfg == "-"
+          @options[:config_file] = nil
+          return
+        end
+
+        return
+      end
+
+      pos = []
+
+      if env = (@options[:environment] || ENV['RACK_ENV'])
+        pos << "config/puma/#{env}.rb"
+      end
+
+      pos << "config/puma.rb"
+      @options[:config_file] = pos.find { |f| File.exist? f }
+    end
+
     # :nodoc:
     def parse_options
       @parser.parse! @argv
@@ -275,6 +304,8 @@ module Puma
         @options[:rackup] = @argv.shift
       end
 
+      find_config
+
       @config = Puma::Configuration.new @options
 
       # Advertise the Configuration
@@ -328,7 +359,7 @@ module Puma
         # it the same, otherwise add -S on there because it was
         # picked up in PATH.
         #
-        if File.exists?($0)
+        if File.exist?($0)
           arg0 = [Gem.ruby, $0]
         else
           arg0 = [Gem.ruby, "-S", $0]
@@ -410,6 +441,10 @@ module Puma
       end
     end
 
+    def prune_bundler?
+      @options[:prune_bundler] && clustered? && !@options[:preload_app]
+    end
+
     # Parse the options, load the rackup, start the server and wait
     # for it to finish.
     #
@@ -420,6 +455,21 @@ module Puma
         exit 1
       end
 
+      if prune_bundler? && defined?(Bundler)
+        puma_lib_dir = $:.detect { |d| File.exist? File.join(d, "puma", "const.rb") }
+
+        if puma_lib_dir
+          log "* Pruning Bundler environment"
+          Bundler.with_clean_env do
+            Kernel.exec(Gem.ruby, "-I", puma_lib_dir,
+                        File.expand_path(puma_lib_dir + "/../bin/puma"),
+                        *@original_argv)
+          end
+        end
+
+        log "! Unable to prune Bundler environment, continuing"
+      end
+
       if dir = @options[:directory]
         Dir.chdir dir
       end
@@ -436,6 +486,7 @@ module Puma
       end
 
       setup_signals
+      set_process_title
 
       @status = :run
 
@@ -453,9 +504,6 @@ module Puma
       when :exit
         # nothing
       end
-
-    ensure
-      delete_pidfile
     end
 
     def setup_signals
@@ -518,5 +566,16 @@ module Puma
       @status = :halt
       @runner.halt
     end
+
+  private
+    def title
+      buffer = "puma #{Puma::Const::VERSION} (#{@options[:binds].join(',')})"
+      buffer << " [#{@options[:tag]}]" if @options[:tag]
+      buffer
+    end
+
+    def set_process_title
+      Process.respond_to?(:setproctitle) ? Process.setproctitle(title) : $0 = title
+    end
   end
 end

data/lib/puma/client.rb

@@ -59,6 +59,10 @@ module Puma
       env[HIJACK_IO] ||= @io
     end
 
+    def in_data_phase
+      !@read_header
+    end
+
     def set_timeout(val)
       @timeout_at = Time.now + val
     end
@@ -100,6 +104,7 @@ module Puma
     EmptyBody = NullIO.new
 
     def setup_body
+      @in_data_phase = true
       body = @parser.body
       cl = @env[CONTENT_LENGTH]
 
@@ -267,6 +272,13 @@ module Puma
       end
     end
 
+    def write_408
+      begin
+        @io << ERROR_408_RESPONSE
+      rescue StandardError
+      end
+    end
+
     def write_500
       begin
         @io << ERROR_500_RESPONSE

data/lib/puma/cluster.rb

@@ -7,6 +7,7 @@ module Puma
 
       @phase = 0
       @workers = []
+      @next_check = nil
 
       @phased_state = :idle
       @phased_restart = false
@@ -29,23 +30,34 @@ module Puma
     end
 
     class Worker
-      def initialize(pid, phase)
+      def initialize(idx, pid, phase)
+        @index = idx
         @pid = pid
         @phase = phase
         @stage = :started
         @signal = "TERM"
+        @last_checkin = Time.now
       end
 
-      attr_reader :pid, :phase, :signal
+      attr_reader :index, :pid, :phase, :signal, :last_checkin
 
       def booted?
         @stage == :booted
       end
 
       def boot!
+        @last_checkin = Time.now
         @stage = :booted
       end
 
+      def ping!
+        @last_checkin = Time.now
+      end
+
+      def ping_timeout?(which)
+        Time.now - @last_checkin > which
+      end
+
       def term
         begin
           if @first_term_sent && (Time.new - @first_term_sent) > 30
@@ -58,6 +70,11 @@ module Puma
         rescue Errno::ESRCH
         end
       end
+
+      def kill
+        Process.kill "KILL", @pid
+      rescue Errno::ESRCH
+      end
     end
 
     def spawn_workers
@@ -68,9 +85,12 @@ module Puma
       master = Process.pid
 
       diff.times do
-        pid = fork { worker(upgrade, master) }
+        idx = next_worker_index
+
+        pid = fork { worker(idx, upgrade, master) }
         @cli.debug "Spawned worker: #{pid}"
-        @workers << Worker.new(pid, @phase)
+        @workers << Worker.new(idx, pid, @phase)
+        @options[:after_worker_boot].each { |h| h.call }
       end
 
       if diff > 0
@@ -78,11 +98,36 @@ module Puma
       end
     end
 
+    def next_worker_index
+      all_positions =  0...@options[:workers] 
+      occupied_positions = @workers.map { |w| w.index }
+      available_positions = all_positions.to_a - occupied_positions 
+      available_positions.first
+    end
+
     def all_workers_booted?
       @workers.count { |w| !w.booted? } == 0
     end
 
     def check_workers
+      return if @next_check && @next_check >= Time.now
+
+      @next_check = Time.now + 5
+
+      any = false
+
+      @workers.each do |w|
+        if w.ping_timeout?(@options[:worker_timeout])
+          log "! Terminating timed out worker: #{w.pid}"
+          w.kill
+          any = true
+        end
+      end
+
+      # If we killed any timed out workers, try to catch them
+      # during this loop by giving the kernel time to kill them.
+      sleep 1 if any
+
       while @workers.any?
         pid = Process.waitpid(-1, Process::WNOHANG)
         break unless pid
@@ -118,8 +163,8 @@ module Puma
       end
     end
 
-    def worker(upgrade, master)
-      $0 = "puma: cluster worker: #{master}"
+    def worker(index, upgrade, master)
+      $0 = "puma: cluster worker #{index}: #{master}"
       Signal.trap "SIGINT", "IGNORE"
 
       @master_read.close
@@ -140,10 +185,16 @@ module Puma
         end
       end
 
+      # If we're not running under a Bundler context, then
+      # report the info about the context we will be using
+      if !ENV['BUNDLER_GEMFILE'] and File.exist?("Gemfile")
+        log "+ Gemfile in context: #{File.expand_path("Gemfile")}"
+      end
+
       # Invoke any worker boot hooks so they can get
       # things in shape before booting the app.
-      hooks = @options[:worker_boot]
-      hooks.each { |h| h.call }
+      hooks = @options[:before_worker_boot]
+      hooks.each { |h| h.call(index) }
 
       server = start_server
 
@@ -158,6 +209,15 @@ module Puma
         return
       end
 
+      Thread.new(@worker_write) do |io|
+        payload = "p#{Process.pid}\n"
+
+        while true
+          sleep 5
+          io << payload
+        end
+      end
+
       server.run.join
 
     ensure
@@ -196,7 +256,7 @@ module Puma
     end
 
     def stats
-      %Q!{ "workers": #{@workers.size}, "phase": #{@phase} }!
+      %Q!{ "workers": #{@workers.size}, "phase": #{@phase}, "booted_workers": #{@workers.count{|w| w.booted?}} }!
     end
 
     def preload?
@@ -292,15 +352,20 @@ module Puma
             if res
               req = read.read_nonblock(1)
 
-              if req == "b"
-                pid = read.gets.to_i
-                w = @workers.find { |x| x.pid == pid }
-                if w
+              next if !req || req == "!"
+
+              pid = read.gets.to_i
+
+              if w = @workers.find { |x| x.pid == pid }
+                case req
+                when "b"
                   w.boot!
-                  log "- Worker #{pid} booted, phase: #{w.phase}"
-                else
-                  log "! Out-of-sync worker list, no #{pid} worker"
+                  log "- Worker #{w.index} (pid: #{pid}) booted, phase: #{w.phase}"
+                when "p"
+                  w.ping!
                 end
+              else
+                log "! Out-of-sync worker list, no #{pid} worker"
               end
             end
 

data/lib/puma/configuration.rb

@@ -14,13 +14,16 @@ module Puma
 
     DefaultTCPHost = "0.0.0.0"
     DefaultTCPPort = 9292
+    DefaultWorkerTimeout = 60
 
     def initialize(options)
       @options = options
       @options[:mode] ||= :http
       @options[:binds] ||= []
       @options[:on_restart] ||= []
-      @options[:worker_boot] ||= []
+      @options[:before_worker_boot] ||= []
+      @options[:after_worker_boot] ||= []
+      @options[:worker_timeout] ||= DefaultWorkerTimeout
     end
 
     attr_reader :options
@@ -72,7 +75,7 @@ module Puma
     # Indicate if there is a properly configured app
     #
     def app_configured?
-      @options[:app] || File.exists?(rackup)
+      @options[:app] || File.exist?(rackup)
     end
 
     def rackup
@@ -86,7 +89,7 @@ module Puma
       app = @options[:app]
 
       unless app
-        unless File.exists?(rackup)
+        unless File.exist?(rackup)
           raise "Missing rackup file '#{rackup}'"
         end
 
@@ -127,7 +130,7 @@ module Puma
 
       if defined? OpenSSL::Random
         bytes = OpenSSL::Random.random_bytes(count)
-      elsif File.exists?("/dev/urandom")
+      elsif File.exist?("/dev/urandom")
         File.open("/dev/urandom") do |f|
           bytes = f.read(count)
         end
@@ -304,7 +307,16 @@ module Puma
       # This can be called multiple times to add hooks.
       #
       def on_worker_boot(&block)
-        @options[:worker_boot] << block
+        @options[:before_worker_boot] << block
+      end
+
+      # *Cluster mode only* Code to run when a worker boots to setup
+      # the process after booting the app.
+      #
+      # This can be called multiple times to add hooks.
+      #
+      def after_worker_boot(&block)
+        @options[:after_worker_boot] << block
       end
 
       # The directory to operate out of.
@@ -325,6 +337,31 @@ module Puma
       def preload_app!(answer=true)
         @options[:preload_app] = answer
       end
+
+      # Use +obj+ or +block+ as the low lever error handler. This allows a config file to
+      # change the default error on the server.
+      #
+      def lowlevel_error_handler(obj=nil, &block)
+        obj ||= block
+        raise "Provide either a #call'able or a block" unless obj
+        @options[:lowlevel_error_handler] = obj
+      end
+
+      # This option is used to allow your app and it's gems to be
+      # properly reloaded when not using preload.
+      #
+      # When set, if puma detects that it's been invoked in the
+      # context of Bundler, it will cleanup the environment and
+      # re-run itself outside the Bundler environment, but directly
+      # using the files that Bundler has setup.
+      #
+      # This means that puma is now decoupled from your Bundler
+      # context and when each worker loads, it will be loading a
+      # new Bundler context and thus can float around as the release
+      # dictates.
+      def prune_bundler(answer=true)
+        @options[:prune_bundler] = answer
+      end
     end
   end
 end

data/lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.7.1".freeze
-    CODE_NAME = "Earl of Sandwich Partition"
+    PUMA_VERSION = VERSION = "2.8.0".freeze
+    CODE_NAME = "Sir Edmund Percival Hillary"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
@@ -41,6 +41,10 @@ module Puma
     # for the request
     FIRST_DATA_TIMEOUT = 30
 
+    # How long to wait when getting some write blocking on the socket when
+    # sending data back
+    WRITE_TIMEOUT = 10
+
     DATE = "Date".freeze
 
     SCRIPT_NAME = "SCRIPT_NAME".freeze
@@ -59,6 +63,9 @@ module Puma
     # The standard empty 404 response for bad requests.  Use Error4040Handler for custom stuff.
     ERROR_404_RESPONSE = "HTTP/1.1 404 Not Found\r\nConnection: close\r\nServer: Puma #{PUMA_VERSION}\r\n\r\nNOT FOUND".freeze
 
+    # The standard empty 408 response for requests that timed out.
+    ERROR_408_RESPONSE = "HTTP/1.1 408 Request Timeout\r\nConnection: close\r\nServer: Puma #{PUMA_VERSION}\r\n\r\n".freeze
+
     CONTENT_LENGTH = "CONTENT_LENGTH".freeze
 
     # Indicate that there was an internal error, obviously.

data/lib/puma/reactor.rb

@@ -98,8 +98,9 @@ module Puma
 
             while @timeouts.first.timeout_at < now
               c = @timeouts.shift
-              sockets.delete c
+              c.write_408 if c.in_data_phase
               c.close
+              sockets.delete c
 
               break if @timeouts.empty?
             end

data/lib/puma/runner.rb

@@ -62,12 +62,20 @@ module Puma
       @control = control
     end
 
+    def ruby_engine
+      if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
+        "ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+      else
+        "#{RUBY_ENGINE} #{RUBY_VERSION}"
+      end
+    end
+
     def output_header(mode)
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
       log "Puma starting in #{mode} mode..."
-      log "* Version #{Puma::Const::PUMA_VERSION}, codename: #{Puma::Const::CODE_NAME}"
+      log "* Version #{Puma::Const::PUMA_VERSION} (#{ruby_engine}), codename: #{Puma::Const::CODE_NAME}"
       log "* Min threads: #{min_t}, max threads: #{max_t}"
       log "* Environment: #{ENV['RACK_ENV']}"
 

data/lib/puma/server.rb

@@ -17,7 +17,7 @@ require 'puma/rack_patch'
 
 require 'puma/puma_http11'
 
-unless Puma.const_defined?("IOBuffer", false)
+unless Puma.const_defined? "IOBuffer"
   require 'puma/io_buffer'
 end
 
@@ -39,6 +39,7 @@ module Puma
     attr_accessor :max_threads
     attr_accessor :persistent_timeout
     attr_accessor :auto_trim_time
+    attr_accessor :first_data_timeout
 
     # Create a server for the rack app +app+.
     #
@@ -102,13 +103,16 @@ module Puma
       # 3 == TCP_CORK
       # 1/0 == turn on/off
       def cork_socket(socket)
-        socket.setsockopt(6, 3, 1) if socket.kind_of? TCPSocket
+        begin
+          socket.setsockopt(6, 3, 1) if socket.kind_of? TCPSocket
+        rescue IOError, SystemCallError
+        end
       end
 
       def uncork_socket(socket)
         begin
           socket.setsockopt(6, 3, 0) if socket.kind_of? TCPSocket
-        rescue IOError
+        rescue IOError, SystemCallError
         end
       end
     else
@@ -326,7 +330,7 @@ module Puma
 
     # :nodoc:
     def handle_check
-      cmd = @check.read(1) 
+      cmd = @check.read(1)
 
       case cmd
       when STOP_COMMAND
@@ -703,6 +707,10 @@ module Puma
     # A fallback rack response if +@app+ raises as exception.
     #
     def lowlevel_error(e)
+      if handler = @options[:lowlevel_error_handler]
+        return handler.call(e)
+      end
+
       if @leak_stack_on_error
         [500, {}, ["Puma caught this error: #{e.message} (#{e.class})\n#{e.backtrace.join("\n")}"]]
       else
@@ -775,10 +783,13 @@ module Puma
         begin
           n = io.syswrite str
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-          IO.select(nil, [io], nil, 1)
+          if !IO.select(nil, [io], nil, WRITE_TIMEOUT)
+            raise ConnectionError, "Socket timeout writing data"
+          end
+
           retry
         rescue  Errno::EPIPE, SystemCallError, IOError
-          return false
+          raise ConnectionError, "Socket timeout writing data"
         end
 
         return if n == str.bytesize

data/lib/puma/thread_pool.rb

@@ -84,7 +84,7 @@ module Puma
               @waiting -= 1
             end
 
-            work = todo.pop if continue
+            work = todo.shift if continue
           end
 
           break unless continue

data/puma.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.files = `git ls-files`.split($/)
   s.homepage = "http://puma.io"
+  s.license = "BSD"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")

data/test/test_config.rb

@@ -13,4 +13,14 @@ class TestConfigFile < Test::Unit::TestCase
 
     assert_equal [200, {}, ["embedded app"]], app.call({})
   end
+
+  def test_lowleve_error_handler_DSL
+    opts = { :config_file => "test/config/app.rb" }
+    conf = Puma::Configuration.new opts
+    conf.load
+
+    app = conf.options[:lowlevel_error_handler]
+
+    assert_equal [200, {}, ["error page"]], app.call({})
+  end
 end

data/test/test_http11.rb

@@ -94,7 +94,7 @@ class Http11ParserTest < Test::Unit::TestCase
     parser.reset
 
     # Raise exception if URI path length > 2048
-    path = "/" + rand_data(2048, 100)
+    path = "/" + rand_data(2049, 100)
     http = "GET #{path} HTTP/1.1\r\n\r\n"
     assert_raises Puma::HttpParserError do
       parser.execute(req, http, 0)

data/test/test_puma_server.rb

@@ -220,6 +220,23 @@ class TestPumaServer < Test::Unit::TestCase
     data = sock.read
 
     assert_not_match(/don't leak me bro/, data)
+    assert_match(/HTTP\/1.0 500 Internal Server Error/, data)
+  end
+
+  def test_prints_custom_error
+    @events = Puma::Events.strings
+    re = lambda { |err| [302, {'Content-Type' => 'text', 'Location' => 'foo.html'}, ['302 found']] }
+    @server = Puma::Server.new @app, @events, {lowlevel_error_handler: re}
+
+    @server.app = proc { |e| raise "don't leak me bro" }
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+    sock << "GET / HTTP/1.0\r\n\r\n"
+
+    data = sock.read
+    assert_match(/HTTP\/1.0 302 Found/, data)
   end
 
   def test_custom_http_codes_10
@@ -289,4 +306,18 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal [:booting, :running, :stop, :done], states
   end
+
+  def test_timeout_in_data_phase
+    @server.first_data_timeout = 2
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    client = TCPSocket.new @host, @port
+
+    client << "POST / HTTP/1.1\r\nHost: test.com\r\nContent-Type: text/plain\r\nContent-Length: 5\r\n\r\n"
+
+    data = client.gets
+
+    assert_equal "HTTP/1.1 408 Request Timeout\r\n", data
+  end
 end

data/test/test_unix_socket.rb

@@ -21,7 +21,7 @@ unless defined?(JRUBY_VERSION) || RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
   
     def teardown
       @server.stop(true)
-      File.unlink Path if File.exists? Path
+      File.unlink Path if File.exist? Path
     end
   
     def test_server

data/tools/jungle/upstart/puma.conf

@@ -39,7 +39,7 @@ exec /bin/bash <<'EOT'
   export HOME="$(eval echo ~$(id -un))"
 
   if [ -d "$HOME/.rbenv/bin" ]; then
-    export PATH="$HOME/.rbenv/bin:$PATH"
+    export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
   elif [ -f  /etc/profile.d/rvm.sh ]; then
     source /etc/profile.d/rvm.sh
   elif [ -f /usr/local/rvm/scripts/rvm ]; then

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 2.7.1
+  version: 2.8.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -21,7 +20,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -30,7 +28,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -40,13 +37,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -56,13 +51,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -71,14 +64,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
-    none: false
+        version: '3.9'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
-    none: false
+        version: '3.9'
   prerelease: false
   type: :development
 description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby.
@@ -94,6 +85,7 @@ extra_rdoc_files:
 - README.md
 - docs/config.md
 - docs/nginx.md
+- docs/signals.md
 - tools/jungle/README.md
 - tools/jungle/init.d/README.md
 - tools/jungle/upstart/README.md
@@ -109,6 +101,7 @@ files:
 - bin/pumactl
 - docs/config.md
 - docs/nginx.md
+- docs/signals.md
 - ext/puma_http11/PumaHttp11Service.java
 - ext/puma_http11/ext_help.h
 - ext/puma_http11/extconf.rb
@@ -182,7 +175,9 @@ files:
 - test/test_ws.rb
 - lib/puma/puma_http11.jar
 homepage: http://puma.io
-licenses: []
+licenses:
+- BSD
+metadata: {}
 post_install_message:
 rdoc_options:
 - --main
@@ -194,18 +189,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: puma
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications
 test_files:
 - test/test_app_status.rb