puma 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3c48f788e2c231b8c32f2fb614bfe64254d472
-  data.tar.gz: 15c2ef0421bfbdc5d865ff00120e2a403c10112b
+  metadata.gz: 3bc9c71db58f1613d19d40776fec460e6887909d
+  data.tar.gz: 21c878d86ea732127745213635b35f438b47369b
 SHA512:
-  metadata.gz: 994b8585be5cb983fed367e55fa47b92f433de644c791622f99b47fdc3006469f70d41b73ff6e691be6bd52cc79e55d5d7eb5956eea82cdc978b33a86eb8590f
-  data.tar.gz: 369f7e8e50ce92734b5d3d53bf2e26b3d1d3a6a0bc9f74f8d0c2f9c9ab9510a17cde417db19b322459184eca874e6997f22fdb930bd543dd88539d174cc6e3e1
+  metadata.gz: f60605510ca798f5eba6baca17b95038f3932ae80a656586c5f0f40061b29fbd669d20d7409813b775105495e83acc5f8c524cd45249e2e251c88c723a5ab756
+  data.tar.gz: 2467f31b4af42d9c8b2c483ebcc453d21e275f51233c03bf2656dc7d70d7fc1a624ffd7ea481d2b2fa9304bf012a3d43ae69bc1a54051e8576b1dbd654df6011

data/.github/issue_template.md

@@ -0,0 +1,20 @@
+### Steps to reproduce
+
+1) ...
+
+2) ...
+
+3) ...
+
+### Expected behavior
+
+Tell us what should happen ...
+
+### Actual behavior
+
+Tell us what happens instead ...
+
+### System configuration
+
+**Ruby version**:
+**Rails version**:

data/History.md

@@ -1,3 +1,9 @@
+## 3.7.1 / 2017-02-20
+
+* 2 bugfixes:
+  * Fix typo which blew up MiniSSL (#1182)
+  * Stop overriding command-line options with the config file (#1203)
+
 ## 3.7.0 / 2017-01-04
 
 * 6 minor features:

data/Manifest.txt

@@ -1,3 +1,4 @@
+.github/issue_template.md
 DEPLOYMENT.md
 Gemfile
 History.md
@@ -25,6 +26,7 @@ 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
+gemfiles/2.1-Gemfile
 lib/puma.rb
 lib/puma/accept_nonblock.rb
 lib/puma/app/status.rb

data/gemfiles/2.1-Gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+gem "hoe"
+gem "hoe-git"
+gem "hoe-ignore"
+gem "rdoc"
+gem "rake-compiler"
+
+gem "rack", "~> 1.6"
+gem "minitest", '~> 5.9'
+
+gem "jruby-openssl", :platform => "jruby"

data/lib/puma/binder.rb

@@ -299,7 +299,7 @@ module Puma
 
       if host == "localhost"
         localhost_addresses.each do |addr|
-          add_ssl_listener addr, port, optimize_for_latency, backlog
+          add_ssl_listener addr, port, ctx, optimize_for_latency, backlog
         end
         return
       end

data/lib/puma/configuration.rb

@@ -30,6 +30,11 @@ module Puma
       @set << @cur
     end
 
+    def reverse_shift
+      @cur = {}
+      @set.unshift(@cur)
+    end
+
     def [](key)
       @set.reverse_each do |o|
         if o.key? key
@@ -201,10 +206,11 @@ module Puma
       end
 
       files.each do |f|
-        @options.shift
+        @options.reverse_shift
 
         DSL.load @options, self, f
       end
+      @options.shift
     end
 
     # Call once all configuration (included from rackup files)

data/lib/puma/const.rb

@@ -95,7 +95,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.7.0".freeze
+    PUMA_VERSION = VERSION = "3.7.1".freeze
     CODE_NAME = "Snowy Sagebrush".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
 

data/tools/jungle/init.d/run-puma

@@ -8,6 +8,10 @@ if [ -d "$HOME/.rbenv/bin" ]; then
 elif [ -d "/usr/local/rbenv/bin" ]; then
   PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
   eval "$(rbenv init -)"
+elif [ -f /usr/local/rvm/scripts/rvm ]; then
+  source /etc/profile.d/rvm.sh
+elif [ -f "$HOME/.rvm/scripts/rvm" ]; then
+  source "$HOME/.rvm/scripts/rvm"
 fi
 
 app=$1; config=$2; log=$3;

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  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
@@ -58,20 +44,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  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: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 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
@@ -84,6 +84,7 @@ executables:
 extensions:
 - ext/puma_http11/extconf.rb
 extra_rdoc_files:
+- ".github/issue_template.md"
 - DEPLOYMENT.md
 - History.md
 - Manifest.txt
@@ -95,6 +96,7 @@ extra_rdoc_files:
 - tools/jungle/init.d/README.md
 - tools/jungle/upstart/README.md
 files:
+- ".github/issue_template.md"
 - DEPLOYMENT.md
 - Gemfile
 - History.md
@@ -122,6 +124,7 @@ files:
 - ext/puma_http11/org/jruby/puma/Http11Parser.java
 - ext/puma_http11/org/jruby/puma/MiniSSL.java
 - ext/puma_http11/puma_http11.c
+- gemfiles/2.1-Gemfile
 - lib/puma.rb
 - lib/puma/accept_nonblock.rb
 - lib/puma/app/status.rb
@@ -192,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for