puma 3.0.0.rc1 → 5.0.0.beta1

data/lib/puma/util.rb

@@ -1,14 +1,6 @@
-major, minor, patch = RUBY_VERSION.split('.').map { |v| v.to_i }
-
-if major == 1 && minor < 9
-  require 'puma/rack/backports/uri/common_18'
-elsif major == 1 && minor == 9 && patch == 2 && RUBY_PATCHLEVEL <= 328 && RUBY_ENGINE != 'jruby'
-  require 'puma/rack/backports/uri/common_192'
-elsif major == 1 && minor == 9 && patch == 3 && RUBY_PATCHLEVEL < 125
-  require 'puma/rack/backports/uri/common_193'
-else
-  require 'uri/common'
-end
+# frozen_string_literal: true
+
+require 'uri/common'
 
 module Puma
   module Util

data/lib/rack/handler/puma.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'rack/handler'
-require 'puma'
 
 module Rack
   module Handler
@@ -9,30 +10,57 @@ module Rack
         :Silent  => false
       }
 
-      def self.run(app, options = {})
-        options  = DEFAULT_OPTIONS.merge(options)
+      def self.config(app, options = {})
+        require 'puma'
+        require 'puma/configuration'
+        require 'puma/events'
+        require 'puma/launcher'
+
+        default_options = DEFAULT_OPTIONS.dup
+
+        # Libraries pass in values such as :Port and there is no way to determine
+        # if it is a default provided by the library or a special value provided
+        # by the user. A special key `user_supplied_options` can be passed. This
+        # contains an array of all explicitly defined user options. We then
+        # know that all other values are defaults
+        if user_supplied_options = options.delete(:user_supplied_options)
+          (options.keys - user_supplied_options).each do |k|
+            default_options[k] = options.delete(k)
+          end
+        end
 
-        conf = ::Puma::Configuration.new do |c|
+        conf = ::Puma::Configuration.new(options, default_options) do |user_config, file_config, default_config|
           if options.delete(:Verbose)
             app = Rack::CommonLogger.new(app, STDOUT)
           end
 
           if options[:environment]
-            c.environment options[:environment]
+            user_config.environment options[:environment]
           end
 
           if options[:Threads]
             min, max = options.delete(:Threads).split(':', 2)
-            c.threads min, max
+            user_config.threads min, max
           end
 
-          host = options[:Host] || ::Puma::Configuration::DefaultTCPHost
-          port = options[:Port] || ::Puma::Configuration::DefaultTCPPort
+          if options[:Host] || options[:Port]
+            host = options[:Host] || default_options[:Host]
+            port = options[:Port] || default_options[:Port]
+            self.set_host_port_to_config(host, port, user_config)
+          end
 
-          c.port port, host
+          if default_options[:Host]
+            file_config.set_default_host(default_options[:Host])
+          end
+          self.set_host_port_to_config(default_options[:Host], default_options[:Port], default_config)
 
-          c.app app
+          user_config.app app
         end
+        conf
+      end
+
+      def self.run(app, **options)
+        conf   = self.config(app, options)
 
         events = options.delete(:Silent) ? ::Puma::Events.strings : ::Puma::Events.stdio
 
@@ -56,9 +84,30 @@ module Rack
           "Verbose"         => "Don't report each request (default: false)"
         }
       end
+
+      def self.set_host_port_to_config(host, port, config)
+        config.clear_binds! if host || port
+
+        if host && (host[0,1] == '.' || host[0,1] == '/')
+          config.bind "unix://#{host}"
+        elsif host && host =~ /^ssl:\/\//
+          uri = URI.parse(host)
+          uri.port ||= port || ::Puma::Configuration::DefaultTCPPort
+          config.bind uri.to_s
+        else
+
+          if host
+            port ||= ::Puma::Configuration::DefaultTCPPort
+          end
+
+          if port
+            host ||= ::Puma::Configuration::DefaultTCPHost
+            config.port port, host
+          end
+        end
+      end
     end
 
     register :puma, Puma
   end
 end
-

data/tools/Dockerfile

@@ -0,0 +1,16 @@
+# Use this Dockerfile to create minimal reproductions of issues
+
+FROM ruby:2.6
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN bundle config --global frozen 1
+
+WORKDIR /usr/src/app
+
+COPY . .
+RUN gem install bundler
+RUN bundle install
+RUN bundle exec rake compile
+
+EXPOSE 9292
+CMD bundle exec bin/puma test/rackup/hello.ru

data/tools/trickletest.rb

@@ -31,14 +31,13 @@ st = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\nCon
 puts "length: #{content.length}"
 
 threads = []
-ARGV[1].to_i.times do 
+ARGV[1].to_i.times do
   t = Thread.new do
     size = 100
     puts ">>>> #{size} sized chunks"
     do_test(st, size)
   end
 
-  t.abort_on_exception = true
   threads << t
 end
 

metadata

@@ -1,81 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '2.0'
 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.
+  environments. It's great for highly concurrent Ruby implementations such as Rubinius
+  and JRuby as well as as providing process worker support to support CRuby well.
 email:
 - evan@phx.io
 executables:
@@ -83,32 +35,32 @@ executables:
 - pumactl
 extensions:
 - ext/puma_http11/extconf.rb
-extra_rdoc_files:
-- DEPLOYMENT.md
-- History.txt
-- Manifest.txt
-- 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
+extra_rdoc_files: []
 files:
-- COPYING
-- DEPLOYMENT.md
-- Gemfile
-- History.txt
+- History.md
 - LICENSE
-- Manifest.txt
 - README.md
-- Rakefile
 - bin/puma
 - bin/puma-wild
 - bin/pumactl
-- docs/config.md
+- docs/architecture.md
+- docs/deployment.md
+- docs/fork_worker.md
+- docs/images/puma-connection-flow-no-reactor.png
+- docs/images/puma-connection-flow.png
+- docs/images/puma-general-arch.png
+- docs/jungle/README.md
+- docs/jungle/rc.d/README.md
+- docs/jungle/rc.d/puma
+- docs/jungle/rc.d/puma.conf
+- docs/jungle/upstart/README.md
+- docs/jungle/upstart/puma-manager.conf
+- docs/jungle/upstart/puma.conf
 - docs/nginx.md
+- docs/plugins.md
+- docs/restart.md
 - docs/signals.md
+- docs/systemd.md
 - ext/puma_http11/PumaHttp11Service.java
 - ext/puma_http11/ext_help.h
 - ext/puma_http11/extconf.rb
@@ -117,7 +69,6 @@ files:
 - 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
@@ -127,32 +78,24 @@ files:
 - 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/cluster.rb
 - lib/puma/commonlogger.rb
-- lib/puma/compat.rb
 - lib/puma/configuration.rb
 - lib/puma/const.rb
 - lib/puma/control_cli.rb
-- lib/puma/convenient.rb
-- lib/puma/daemon_ext.rb
-- lib/puma/delegation.rb
 - lib/puma/detect.rb
 - lib/puma/dsl.rb
 - lib/puma/events.rb
 - lib/puma/io_buffer.rb
-- lib/puma/java_io_buffer.rb
 - lib/puma/jruby_restart.rb
 - lib/puma/launcher.rb
 - lib/puma/minissl.rb
+- lib/puma/minissl/context_builder.rb
 - lib/puma/null_io.rb
 - lib/puma/plugin.rb
 - lib/puma/plugin/tmp_restart.rb
-- lib/puma/rack/backports/uri/common_18.rb
-- lib/puma/rack/backports/uri/common_192.rb
-- lib/puma/rack/backports/uri/common_193.rb
 - lib/puma/rack/builder.rb
 - lib/puma/rack/urlmap.rb
 - lib/puma/rack_default.rb
@@ -161,42 +104,35 @@ files:
 - lib/puma/server.rb
 - lib/puma/single.rb
 - lib/puma/state_file.rb
-- lib/puma/tcp_logger.rb
 - lib/puma/thread_pool.rb
 - lib/puma/util.rb
 - lib/rack/handler/puma.rb
-- puma.gemspec
-- tools/jungle/README.md
-- 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
+- tools/Dockerfile
 - tools/trickletest.rb
 homepage: http://puma.io
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/puma/puma/issues
+  changelog_uri: https://github.com/puma/puma/blob/master/History.md
+  homepage_uri: http://puma.io
+  source_code_uri: https://github.com/puma/puma
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for

data/COPYING

@@ -1,55 +0,0 @@
-Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
-<zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
-either the terms of the GPL or the conditions below:
-
-1. You may make and give away verbatim copies of the source form of the
-   software without restriction, provided that you duplicate all of the
-   original copyright notices and associated disclaimers.
-
-2. You may modify your copy of the software in any way, provided that
-   you do at least ONE of the following:
-
-     a) place your modifications in the Public Domain or otherwise make them
-     Freely Available, such as by posting said modifications to Usenet or an
-     equivalent medium, or by allowing the author to include your
-     modifications in the software.
-
-     b) use the modified software only within your corporation or
-        organization.
-
-     c) rename any non-standard executables so the names do not conflict with
-     standard executables, which must also be provided.
-
-     d) make other distribution arrangements with the author.
-
-3. You may distribute the software in object code or executable
-   form, provided that you do at least ONE of the following:
-
-     a) distribute the executables and library files of the software,
-     together with instructions (in the manual page or equivalent) on where
-     to get the original distribution.
-
-     b) accompany the distribution with the machine-readable source of the
-     software.
-
-     c) give non-standard executables non-standard names, with
-        instructions on where to get the original software distribution.
-
-     d) make other distribution arrangements with the author.
-
-4. You may modify and include the part of the software into any other
-   software (possibly commercial).  But some files in the distribution
-   are not written by the author, so that they are not under this terms.
-
-5. The scripts and library files supplied as input to or produced as 
-   output from the software do not automatically fall under the
-   copyright of the software, but belong to whomever generated them, 
-   and may be sold commercially, and may be aggregated with this
-   software.
-
-6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE.
-
-

data/Gemfile

@@ -1,13 +0,0 @@
-source "http://rubygems.org"
-
-gem "hoe"
-gem "hoe-git"
-gem "hoe-ignore"
-gem "rdoc"
-gem "rake-compiler"
-gem "test-unit", "~> 3.0"
-
-gem "rack"
-gem 'minitest', '~> 4.0'
-
-gem "jruby-openssl", :platform => "jruby"