puma 2.0.0.b6 → 2.0.0.b7

data/History.txt

@@ -1,3 +1,28 @@
+=== 2.0.0.b7 / 2013-03-18
+
+* 5 minor enhancements:
+
+  * Add -q option for :start
+  * Add -V, --version
+  * Add default Rack handler helper
+  * Upstart support
+  * Set worker directory from configuration file
+
+* 12 bug fixes:
+
+  * Close the binder in the right place. Fixes #192
+  * Handle early term in workers. Fixes #206
+  * Make sure that the default port is 80 when the request doesn't include HTTP_X_FORWARDED_PROTO.
+  * Prevent Errno::EBADF errors on restart when running ruby 2.0 
+  * Record the proper @master_pid
+  * Respect the header HTTP_X_FORWARDED_PROTO when the host doesn't include a port number.
+  * Retry EAGAIN/EWOULDBLOCK during syswrite
+  * Run exec properly to restart. Fixes #154
+  * Set Rack run_once to false
+  * Syncronize all access to @timeouts. Fixes #208
+  * Write out the state post-daemonize. Fixes #189
+  * Prevent crash when all workers are gone
+
 === 2.0.0.b6 / 2013-02-06
 
 * 2 minor enhancements:

data/Manifest.txt

@@ -44,6 +44,7 @@ lib/puma/java_io_buffer.rb
 lib/puma/jruby_restart.rb
 lib/puma/minissl.rb
 lib/puma/null_io.rb
+lib/puma/rack_default.rb
 lib/puma/rack_patch.rb
 lib/puma/reactor.rb
 lib/puma/server.rb
@@ -51,6 +52,9 @@ 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
+tools/jungle/init.d/README.md
+tools/jungle/init.d/puma
+tools/jungle/init.d/run-puma
+tools/jungle/upstart/README.md
+tools/jungle/upstart/puma-manager.conf
+tools/jungle/upstart/puma.conf

data/README.md

@@ -66,7 +66,7 @@ Puma provides numerous options for controlling the operation of the server. Cons
 Puma utilizes a dynamic thread pool which you can modify. You can set the minimum and maximum number of threads that are available in the pool with the `-t` (or `--threads`) flag:
 
     $ puma -t 8:32
-    
+
 Puma will automatically scale the number of threads based on how much traffic is present. The current default is `0:16`. Feel free to experiment, but be careful not to set the number of maximum threads to a very large number, as you may exhaust resources on the system (or hit resource limits).
 
 ### Binding TCP / Sockets
@@ -95,9 +95,21 @@ Puma comes with a builtin status/control app that can be used query and control
 
 This directs puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb to see what the app has available.
 
+### Configuration file
+
+You can also provide a configuration file which puma will use:
+
+    $ puma --config /path/to/config
+
+or
+
+    $ puma -C /path/to/config
+
+Take the following [sample configuration](https://github.com/puma/puma/blob/master/examples/config.rb) as inspiration or check out [configuration.rb](https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L138) to see all available options.
+
 ## Restart
 
-Puma includes the ability to restart itself, allowing for new versions to be easily upgraded to. When available (currently anywhere but JRuby), puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
+Puma includes the ability to restart itself, allowing for new versions to be easily upgraded to. When available (MRI, Rubinius, JRuby), puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
 
 To perform a restart, there are 2 builtin mechanism:
 
@@ -120,7 +132,7 @@ If you start puma with `-S some/path` then you can pass that same path to the `p
 
     $ pumactl -S some/path command
 
-or 
+or
 
     $ pumactl -C url -T token command
 
@@ -128,9 +140,28 @@ will cause the server to perform a restart. `pumactl` is a simple CLI frontend t
 
 Allowed commands: status, restart, halt, stop
 
-## Managing multiple Pumas / init.d script 
+## Managing multiple Pumas / init.d / upstart scripts
+
+If you want an easy way to manage multiple scripts at once check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for init.d and upstart scripts.
+
+## Capistrano deployment
+
+Puma has included Capistrano [deploy script](https://github.com/plentz/puma/blob/master/lib/puma/capistrano.rb), you just need require that:
+
+config/deploy.rb
+
+```ruby
+require 'puma/capistrano'
+```
+
+and then
+
+```bash
+$ bunde exec cap puma:start
+$ bunde exec cap puma:restart 
+$ bunde exec cap puma:stop
+```
 
-If you want an easy way to manage multiple scripts at once check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for an init.d script.
 
 ## License
 

data/lib/puma/binder.rb

@@ -15,7 +15,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

data/lib/puma/capistrano.rb

@@ -1,26 +1,28 @@
 Capistrano::Configuration.instance.load do
-  after "deploy:stop", "puma:stop"
-  after "deploy:start", "puma:start"
-  after "deploy:restart", "puma:restart"
+  after 'deploy:stop', 'puma:stop'
+  after 'deploy:start', 'puma:start'
+  after 'deploy:restart', 'puma:restart'
 
-  _cset(:puma_role)      { :app }
+  _cset(:puma_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
+  _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
+  _cset(:puma_state) { "#{shared_path}/sockets/puma.state" }
+  _cset(:puma_role) { :app }
 
   namespace :puma do
-    desc "Start puma"
+    desc 'Start puma'
     task :start, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      puma_env = fetch(:rack_env, fetch(:rails_env, "production"))
-      run "cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec puma -d -e #{puma_env} -b 'unix://#{shared_path}/sockets/puma.sock' -S #{shared_path}/sockets/puma.state --control 'unix://#{shared_path}/sockets/pumactl.sock'", :pty => false
+      puma_env = fetch(:rack_env, fetch(:rails_env, 'production'))
+      run "cd #{current_path} && #{fetch(:puma_cmd)} -q -d -e #{puma_env} -b 'unix://#{shared_path}/sockets/puma.sock' -S #{fetch(:puma_state)} --control 'unix://#{shared_path}/sockets/pumactl.sock'", :pty => false
     end
 
-    desc "Stop puma"
+    desc 'Stop puma'
     task :stop, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec pumactl -S #{shared_path}/sockets/puma.state stop"
+      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S fetch(:puma_state) stop"
     end
 
-    desc "Restart puma"
+    desc 'Restart puma'
     task :restart, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec pumactl -S #{shared_path}/sockets/puma.state restart"
+      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S fetch(:puma_state) restart"
     end
-
   end
 end

data/lib/puma/cli.rb

@@ -39,6 +39,9 @@ module Puma
       @restart = false
       @phased_state = :idle
 
+      @io_redirected = false
+
+
       ENV['NEWRELIC_DISPATCHER'] ||= "puma"
 
       setup_options
@@ -112,10 +115,12 @@ module Puma
         end
 
         require 'puma/jruby_restart'
-        JRubyRestart.chdir_exec(@restart_dir, Gem.ruby, *@restart_argv)
+        JRubyRestart.chdir_exec(@restart_dir, @restart_argv)
       else
+        redirects = {}
         @binder.listeners.each_with_index do |(l,io),i|
           ENV["PUMA_INHERIT_#{i}"] = "#{io.to_i}:#{l}"
+          redirects[io.to_i] = io.to_i
         end
 
         if cmd = @options[:restart_cmd]
@@ -125,6 +130,8 @@ module Puma
         end
 
         Dir.chdir @restart_dir
+
+        argv += [redirects] unless RUBY_VERSION < '1.9'
         Kernel.exec(*argv)
       end
     end
@@ -256,6 +263,11 @@ module Puma
           end
         end
 
+        o.on "-V", "--version", "Print the version information" do
+          puts "puma version #{Puma::Const::VERSION}"
+          exit 1
+        end
+
         o.on "-w", "--workers COUNT",
                    "Activate cluster mode: How many worker processes to create" do |arg|
           unsupported "-w not supported on JRuby and Windows",
@@ -309,7 +321,8 @@ module Puma
         state = { "pid" => Process.pid }
 
         cfg = @config.dup
-        cfg.options.delete :on_restart
+        
+        [ :logger, :worker_boot, :on_restart ].each { |o| cfg.options.delete o }
 
         state["config"] = cfg
 
@@ -349,6 +362,7 @@ module Puma
       append = @options[:redirect_append]
 
       if stdout
+        @io_redirected = true
         STDOUT.reopen stdout, (append ? "a" : "w")
         STDOUT.puts "=== puma startup: #{Time.now} ==="
       end
@@ -390,8 +404,6 @@ module Puma
     end
 
     def run_single
-      write_state
-
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
@@ -402,9 +414,11 @@ module Puma
       @binder.parse @options[:binds], self
 
       if @options[:daemon]
-        Process.daemon(true, true)
+        Process.daemon(true, @io_redirected)
       end
 
+      write_state
+
       server = Puma::Server.new @config.app, @events
       server.binder = @binder
       server.min_threads = min_t
@@ -521,7 +535,7 @@ module Puma
       server = Puma::Server.new @config.app, @events
       server.min_threads = min_t
       server.max_threads = max_t
-      server.binder = @binder
+      server.inherit_binder @binder
 
       Signal.trap "SIGTERM" do
         server.stop
@@ -599,7 +613,7 @@ module Puma
     end
 
     def check_workers
-      while true
+      while @workers.any?
         pid = Process.waitpid(-1, Process::WNOHANG)
         break unless pid
 
@@ -631,8 +645,6 @@ module Puma
 
       @binder.parse @options[:binds], self
 
-      @master_pid = Process.pid
-
       read, write = Puma::Util.pipe
 
       Signal.trap "SIGCHLD" do
@@ -650,10 +662,20 @@ module Puma
       rescue Exception
       end
 
+      master_pid = Process.pid
+
       begin
         Signal.trap "SIGTERM" do
-          stop = true
-          write.write "!"
+          # The worker installs there own SIGTERM when booted.
+          # Until then, this is run by the worker and the worker
+          # should just exit if they get it.
+          if Process.pid != master_pid
+            log "Early termination of worker"
+            exit! 0
+          else
+            stop = true
+            write.write "!"
+          end
         end
       rescue Exception
       end
@@ -676,11 +698,13 @@ module Puma
       @check_pipe, @suicide_pipe = Puma::Util.pipe
 
       if @options[:daemon]
-        Process.daemon(true, true)
+        Process.daemon(true, @io_redirected)
       else
         log "Use Ctrl-C to stop"
       end
 
+      @master_pid = Process.pid
+
       redirect_io
 
       write_state

data/lib/puma/configuration.rb

@@ -277,6 +277,7 @@ module Puma
       # The directory to operate out of.
       def directory(dir)
         @options[:directory] = dir.to_s
+        @options[:worker_directory] = dir.to_s
       end
     end
   end

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.0.0.b6".freeze
+    PUMA_VERSION = VERSION = "2.0.0.b7".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
@@ -101,6 +101,7 @@ module Puma
     SERVER_PORT = "SERVER_PORT".freeze
     HTTP_HOST = "HTTP_HOST".freeze
     PORT_80 = "80".freeze
+    PORT_443 = "443".freeze
     LOCALHOST = "localhost".freeze
 
     SERVER_PROTOCOL = "SERVER_PROTOCOL".freeze

data/lib/puma/jruby_restart.rb

@@ -8,12 +8,12 @@ module Puma
     attach_function :execlp, [:string, :varargs], :int
     attach_function :chdir, [:string], :int
 
-    def self.chdir_exec(dir, cmd, *argv)
+    def self.chdir_exec(dir, argv)
       chdir(dir)
-      argv.unshift(cmd)
+      cmd = argv.first
       argv = ([:string] * argv.size).zip(argv).flatten
-      argv <<:int
-      argv << 0
+      argv << :string
+      argv << nil
       execlp(cmd, *argv)
       raise SystemCallError.new(FFI.errno)
     end

data/lib/puma/minissl.rb

@@ -1,137 +1,139 @@
-module Puma::MiniSSL
-  class Socket
-    def initialize(socket, engine)
-      @socket = socket
-      @engine = engine
-    end
+module Puma
+  module MiniSSL
+    class Socket
+      def initialize(socket, engine)
+        @socket = socket
+        @engine = engine
+      end
 
-    def to_io
-      @socket
-    end
+      def to_io
+        @socket
+      end
 
-    def readpartial(size)
-      while true
-        output = @engine.read
-        return output if output
+      def readpartial(size)
+        while true
+          output = @engine.read
+          return output if output
 
-        data = @socket.readpartial(size)
-        @engine.inject(data)
-        output = @engine.read
+          data = @socket.readpartial(size)
+          @engine.inject(data)
+          output = @engine.read
 
-        return output if output
+          return output if output
 
-        while neg_data = @engine.extract
-          @socket.write neg_data
+          while neg_data = @engine.extract
+            @socket.write neg_data
+          end
         end
       end
-    end
 
-    def read_nonblock(size)
-      while true
-        output = @engine.read
-        return output if output
+      def read_nonblock(size)
+        while true
+          output = @engine.read
+          return output if output
 
-        data = @socket.read_nonblock(size)
+          data = @socket.read_nonblock(size)
 
-        @engine.inject(data)
-        output = @engine.read
+          @engine.inject(data)
+          output = @engine.read
 
-        return output if output
+          return output if output
 
-        while neg_data = @engine.extract
-          @socket.write neg_data
+          while neg_data = @engine.extract
+            @socket.write neg_data
+          end
         end
       end
-    end
 
-    def write(data)
-      need = data.size
+      def write(data)
+        need = data.size
 
-      while true
-        wrote = @engine.write data
-        enc = @engine.extract
+        while true
+          wrote = @engine.write data
+          enc = @engine.extract
 
-        if enc
-          @socket.syswrite enc
-        end
+          if enc
+            @socket.syswrite enc
+          end
 
-        need -= wrote
+          need -= wrote
 
-        return data.size if need == 0
+          return data.size if need == 0
 
-        data = data[need..-1]
+          data = data[need..-1]
+        end
       end
-    end
 
-    alias_method :syswrite, :write
+      alias_method :syswrite, :write
 
-    def flush
-      @socket.flush
-    end
+      def flush
+        @socket.flush
+      end
 
-    def close
-      @socket.close
-    end
+      def close
+        @socket.close
+      end
 
-    def peeraddr
-      @socket.peeraddr
+      def peeraddr
+        @socket.peeraddr
+      end
     end
-  end
 
-  class Context
-    attr_accessor :verify_mode
+    class Context
+      attr_accessor :verify_mode
 
-    attr_reader :key
-    attr_reader :cert
+      attr_reader :key
+      attr_reader :cert
 
-    def key=(key)
-      raise ArgumentError, "No such key file '#{key}'" unless File.exist? key
-      @key = key
-    end
+      def key=(key)
+        raise ArgumentError, "No such key file '#{key}'" unless File.exist? key
+        @key = key
+      end
 
-    def cert=(cert)
-      raise ArgumentError, "No such cert file '#{cert}'" unless File.exist? cert
-      @cert = cert
+      def cert=(cert)
+        raise ArgumentError, "No such cert file '#{cert}'" unless File.exist? cert
+        @cert = cert
+      end
     end
-  end
 
-  VERIFY_NONE = 0
-  VERIFY_PEER = 1
+    VERIFY_NONE = 0
+    VERIFY_PEER = 1
 
-  #if defined?(JRUBY_VERSION)
+    #if defined?(JRUBY_VERSION)
     #class Engine
-      #def self.server(key, cert)
-        #new(key, cert)
-      #end
+    #def self.server(key, cert)
+    #new(key, cert)
+    #end
+    #end
     #end
-  #end
 
-  class Server
-    def initialize(socket, ctx)
-      @socket = socket
-      @ctx = ctx
-    end
+    class Server
+      def initialize(socket, ctx)
+        @socket = socket
+        @ctx = ctx
+      end
 
-    def to_io
-      @socket
-    end
+      def to_io
+        @socket
+      end
 
-    def accept
-      io = @socket.accept
-      engine = Engine.server @ctx.key, @ctx.cert
+      def accept
+        io = @socket.accept
+        engine = Engine.server @ctx.key, @ctx.cert
 
-      Socket.new io, engine
-    end
+        Socket.new io, engine
+      end
 
-    def accept_nonblock
-      io = @socket.accept_nonblock
-      engine = Engine.server @ctx.key, @ctx.cert
+      def accept_nonblock
+        io = @socket.accept_nonblock
+        engine = Engine.server @ctx.key, @ctx.cert
 
-      Socket.new io, engine
-    end
+        Socket.new io, engine
+      end
 
-    def close
-      @socket.close
+      def close
+        @socket.close
+      end
     end
   end
 end

data/lib/puma/rack_default.rb

@@ -0,0 +1,7 @@
+require 'rack/handler/puma'
+
+module Rack::Handler
+  def self.default(options = {})
+    Rack::Handler::Puma
+  end
+end

data/lib/puma/reactor.rb

@@ -50,7 +50,9 @@ module Puma
               # list or we'll accidentally close the socket when
               # it's in use!
               if c.timeout_at
-                @timeouts.delete c
+                @mutex.synchronize do
+                  @timeouts.delete c
+                end
               end
 
               begin
@@ -78,17 +80,19 @@ module Puma
         end
 
         unless @timeouts.empty?
-          now = Time.now
+          @mutex.synchronize do
+            now = Time.now
 
-          while @timeouts.first.timeout_at < now
-            c = @timeouts.shift
-            sockets.delete c
-            c.close
+            while @timeouts.first.timeout_at < now
+              c = @timeouts.shift
+              sockets.delete c
+              c.close
 
-            break if @timeouts.empty?
-          end
+              break if @timeouts.empty?
+            end
 
-          calculate_sleep
+            calculate_sleep
+          end
         end
       end
     ensure

data/lib/puma/server.rb

@@ -64,6 +64,8 @@ module Puma
       @persistent_timeout = PERSISTENT_TIMEOUT
 
       @binder = Binder.new(events)
+      @own_binder = true
+
       @first_data_timeout = FIRST_DATA_TIMEOUT
 
       ENV['RACK_ENV'] ||= "development"
@@ -75,6 +77,11 @@ module Puma
     forward :add_ssl_listener,  :@binder
     forward :add_unix_listener, :@binder
 
+    def inherit_binder(bind)
+      @binder = bind
+      @own_binder = false
+    end
+
     # On Linux, use TCP_CORK to better control how the TCP stack
     # packetizes our stream. This improves both latency and throughput.
     #
@@ -190,11 +197,14 @@ module Puma
         @reactor.clear! if @status == :restart
 
         @reactor.shutdown
+      rescue Exception => e
+        STDERR.puts "Exception handling servers: #{e.message} (#{e.class})"
+        STDERR.puts e.backtrace
       ensure
         @check.close
         @notify.close
 
-        unless @status == :restart
+        if @status != :restart and @own_binder
           @binder.close
         end
       end
@@ -287,11 +297,11 @@ module Puma
           env[SERVER_PORT] = host[colon+1, host.bytesize]
         else
           env[SERVER_NAME] = host
-          env[SERVER_PORT] = PORT_80
+          env[SERVER_PORT] = default_server_port(env)
         end
       else
         env[SERVER_NAME] = LOCALHOST
-        env[SERVER_PORT] = PORT_80
+        env[SERVER_PORT] = default_server_port(env)
       end
 
       unless env[REQUEST_PATH]
@@ -315,6 +325,10 @@ module Puma
       env[REMOTE_ADDR] = client.peeraddr.last
     end
 
+    def default_server_port(env)
+      env['HTTP_X_FORWARDED_PROTO'] == 'https' ? PORT_443 : PORT_80
+    end
+
     # 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
@@ -581,19 +595,17 @@ module Puma
     end
 
     def fast_write(io, str)
-      n = io.syswrite str
-
-      # Fast path.
-      return if n == str.bytesize
-
-      pos = n
-      left = str.bytesize - n
-
-      until left == 0
-       n = io.syswrite str.byteslice(pos..-1)
+      n = 0
+      while true
+        begin
+          n = io.syswrite str
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+          IO.select(nil, [io], nil, 1)
+          retry
+        end
 
-       pos += n
-       left -= n
+        return if n == str.bytesize
+        str = str.byteslice(n..-1)
       end
     end
     private :fast_write

data/puma.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.0.0.b6"
+  s.version = "2.0.0.b7"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-02-07"
+  s.date = "2013-03-19"
   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/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.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_default.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/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "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"]
@@ -29,17 +29,17 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
     else
       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"])
+      s.add_dependency(%q<hoe>, ["~> 3.5"])
     end
   else
     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"])
+    s.add_dependency(%q<hoe>, ["~> 3.5"])
   end
 end

data/test/test_minissl.rb

@@ -1,5 +1,7 @@
 require 'test/unit'
 
+unless defined? JRUBY_VERSION
+
 require 'puma'
 require 'puma/minissl'
 
@@ -10,13 +12,14 @@ class TestMiniSSL < Test::Unit::TestCase
 
     exception = assert_raise(ArgumentError) { ctx.key = "/no/such/key" }
     assert_equal("No such key file '/no/such/key'", exception.message)
-  end unless defined? JRUBY_VERSION
+  end
 
   def test_raises_with_invalid_cert_file
     ctx = Puma::MiniSSL::Context.new
 
     exception = assert_raise(ArgumentError) { ctx.cert = "/no/such/cert" }
     assert_equal("No such cert file '/no/such/cert'", exception.message)
-  end unless defined? JRUBY_VERSION
+  end
+end
 
 end

data/test/test_puma_server.rb

@@ -125,4 +125,41 @@ class TestPumaServer < Test::Unit::TestCase
 
     assert_equal giant.bytesize, out.bytesize
   end
+
+  def test_respect_x_forwarded_proto
+    @server.app = proc do |env|
+      [200, {}, [env['SERVER_PORT']]]
+    end
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    req = Net::HTTP::Get.new("/")
+    req['HOST'] = "example.com"
+    req['X_FORWARDED_PROTO'] = "https"
+
+    res = Net::HTTP.start @host, @port do |http|
+      http.request(req)
+    end
+
+    assert_equal "443", res.body
+  end
+
+  def test_default_server_port
+    @server.app = proc do |env|
+      [200, {}, [env['SERVER_PORT']]]
+    end
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    req = Net::HTTP::Get.new("/")
+    req['HOST'] = "example.com"
+
+    res = Net::HTTP.start @host, @port do |http|
+      http.request(req)
+    end
+
+    assert_equal "80", res.body
+  end
 end

data/tools/jungle/upstart/README.md

@@ -0,0 +1,61 @@
+# Puma as a service using Upstart
+
+Manage multiple Puma servers as services on the same box using Ubuntu upstart.
+
+## Installation 
+
+    # Copy the scripts to services directory 
+    sudo cp puma.conf puma-manager.conf /etc/init
+    
+    # Create an empty configuration file
+    sudo touch /etc/puma.conf
+
+## Managing the jungle 
+
+Puma apps are referenced in /etc/puma.conf by default. Add each app's path as a new line, e.g.:
+
+```
+/home/apps/my-cool-ruby-app
+/home/apps/another-app/current
+```
+
+Start the jungle running:
+
+`sudo start puma-manager`
+
+This script will run at boot time.
+
+Start a single puma like this:
+
+`sudo start puma app=/path/to/app`
+
+## Logs
+
+Everything is logged by upstart, defaulting to `/var/log/upstart`.
+
+Each puma instance is named after its directory, so for an app called `/home/apps/my-app` the log file would be `/var/log/upstart/puma-_home_apps_my-app.log`.
+
+## Conventions 
+
+* The script expects:
+  * a config file to exist under `config/puma.rb` in your app. E.g.: `/home/apps/my-app/config/puma.rb`.
+  * a temporary folder to put the PID, socket and state files to exist called `tmp/puma`. E.g.: `/home/apps/my-app/tmp/puma`. Puma will take care of the files for you.
+
+You can always change those defaults by editing the scripts.
+
+## Here's what a minimal app's config file should have
+
+```
+pidfile "/path/to/app/tmp/puma/pid"
+state_path "/path/to/app/tmp/puma/state"
+activate_control_app
+```
+
+## Before starting...
+
+You need to customise `puma.conf` to:
+
+* Set the right user your app should be running on unless you want root to execute it!
+  * Look for `setuid apps` and `setgid apps`, uncomment those lines and replace `apps` to whatever your deployment user is.
+  * Replace `apps` on the paths (or set the right paths to your user's home) everywhere else.
+* Uncomment the source lines for `rbenv` or `rvm` support unless you use a system wide installation of Ruby.

data/tools/jungle/upstart/puma-manager.conf

@@ -0,0 +1,31 @@
+# /etc/init/puma-manager.conf - manage a set of Pumas
+
+# This example config should work with Ubuntu 12.04+.  It
+# allows you to manage multiple Puma instances with
+# Upstart, Ubuntu's native service management tool.
+#
+# See puma.conf for how to manage a single Puma instance.
+#
+# Use "stop workers" to stop all Puma instances.
+# Use "start workers" to start all instances.
+# Use "restart workers" to restart all instances.
+# Crazy, right?
+#
+
+description "Manages the set of puma processes"
+
+# This starts upon bootup and stops on shutdown
+start on runlevel [2345]
+stop on runlevel [06]
+
+# Set this to the number of Puma processes you want
+# to run on this machine
+env PUMA_CONF=/etc/puma.conf
+
+pre-start script
+  for i in `cat $PUMA_CONF`; do
+    app=`echo $i | cut -d , -f 1`
+    logger -t "puma-manager" "Starting $app" 
+    start puma app=$app
+  done
+end script

data/tools/jungle/upstart/puma.conf

@@ -0,0 +1,52 @@
+# /etc/init/puma.conf - Puma config
+
+# This example config should work with Ubuntu 12.04+.  It
+# allows you to manage multiple Puma instances with
+# Upstart, Ubuntu's native service management tool.
+#
+# See workers.conf for how to manage all Puma instances at once.
+#
+# Save this config as /etc/init/puma.conf then mange puma with:
+#   sudo start puma index=0
+#   sudo stop puma index=0
+#   sudo status puma index=0
+#
+# or use the service command:
+#   sudo service puma {start,stop,restart,status}
+#
+
+description "Puma Background Worker"
+
+# no "start on", we don't want to automatically start
+stop on (stopping puma-manager or runlevel [06])
+
+# change apps to match your deployment user if you want to use this as a less privileged user (recommended!) 
+# setuid apps 
+# setgid apps 
+
+respawn
+respawn limit 3 30
+
+instance ${app}
+
+script
+# this script runs in /bin/sh by default
+# respawn as bash so we can source in rbenv/rvm
+exec /bin/bash <<EOT
+  export HOME=/home/apps
+  
+  # Pick your poison :) Or none if you're using a system wide installed Ruby.
+  # rbenv
+  # source /home/apps/.bash_profile
+  # OR
+  # source /home/apps/.profile
+  #
+  # rvm
+  # source /home/apps/.rvm/scripts/rvm
+
+  logger -t puma "Starting server: $app"
+
+  cd $app
+  exec bundle exec puma -C config/puma.rb
+EOT
+end script

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.0.0.b6
+  version: 2.0.0.b7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 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
@@ -163,6 +163,7 @@ files:
 - lib/puma/jruby_restart.rb
 - lib/puma/minissl.rb
 - lib/puma/null_io.rb
+- lib/puma/rack_default.rb
 - lib/puma/rack_patch.rb
 - lib/puma/reactor.rb
 - lib/puma/server.rb
@@ -170,9 +171,12 @@ files:
 - lib/puma/util.rb
 - lib/rack/handler/puma.rb
 - puma.gemspec
-- tools/jungle/README.md
-- tools/jungle/puma
-- tools/jungle/run-puma
+- tools/jungle/init.d/README.md
+- tools/jungle/init.d/puma
+- tools/jungle/init.d/run-puma
+- tools/jungle/upstart/README.md
+- tools/jungle/upstart/puma-manager.conf
+- tools/jungle/upstart/puma.conf
 - test/test_app_status.rb
 - test/test_cli.rb
 - test/test_config.rb