puma 3.7.0-java → 3.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f271f2efd0ff7b8b3c443d4814c3ea279b2bb9e
-  data.tar.gz: 7c0db5969b785e24a2641193e83f57c43e590bb1
+  metadata.gz: 180128e31be6cc2343149d33cb9d66866989f986
+  data.tar.gz: f21f8d1a2e14c563fdd241f5c57f5ff49da6d013
 SHA512:
-  metadata.gz: 313789ebf7d084752664e837eb8cbfdfaf2bebcef93e1ce0ac84412be047d18ca18fe608e648da8b1f8ff70032a89de9b3c64d13e629c0848dcc12bdea04a224
-  data.tar.gz: ceb08309ae5a9de9247545d572fddfa43be12845b506ad2f8156069dd213d11f701b74e031b62b5649c7660a241841a6620bf2493e9c73523f446122c332e886
+  metadata.gz: 298bb1d1f186e3b618358daf4a4a5525946b3081e6c82f2cee87c03b8b4770c884f42b5d063ce06f2d55c77ab2ce65ed227648a05ab6e26b24422511bff36a3a
+  data.tar.gz: 9b508d7efd5718744cee7d105250f04715f280a20757f52004daefd5821de867994df2528a694feadcdbb6399f411f2ab1a021df806b088c62645100e0f1bce7

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: java
 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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  name: rdoc
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -63,7 +49,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '4.0'
+  name: rdoc
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.15'
   name: hoe
   prerelease: false
   type: :development
@@ -71,7 +71,7 @@ dependencies:
     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 you use a  Ruby implementation with real threads like Rubinius or JRuby.
 email:
 - evan@phx.io
@@ -80,6 +80,7 @@ executables:
 - pumactl
 extensions: []
 extra_rdoc_files:
+- ".github/issue_template.md"
 - DEPLOYMENT.md
 - History.md
 - Manifest.txt
@@ -91,6 +92,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
@@ -118,6 +120,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