puma 3.1.0-java → 3.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd667f4be1193acbc7a84148f9b993a3618d40a6
-  data.tar.gz: c108707140d918a74f59b31de2a6fcfa818f5768
+  metadata.gz: 013549c1c74b323e15771e89b2c1c0c27cdf53ad
+  data.tar.gz: 40fa22c3cfe076d1d8477029c292de4834a0f8a5
 SHA512:
-  metadata.gz: 4510ea74d1d6588cd34cb0c1b9d7283bb37fbead2722f11eae592867cc387e1ea432eac6f93125551026596bd394a78365486c24bd4cfb4273548fec65df1a8c
-  data.tar.gz: 2a7b31a4d8a65ecdceb3e183bbdbbee3155a636c91263d527c8089e3f39f589d6f3d3b40af083781531d67c6877a4a5dfaf335bc7b8965d1a86111ad8fb82acf
+  metadata.gz: c11697e44440b4f4572d4298d23f66e9cebd2f396e971b3ec6d1706988f63914b015876451783cf11fef7051d0e1003fc8d276ba28a8e61674491389df0b5699
+  data.tar.gz: 4e9a1422eeb368be02f8a43cbe9969e0a9f44213de3eb1fa41d913c0c6d536c75deecd8f6df046510e4b265476127c8ea5a0818c789365b888bc1d1520bd7692

data/History.txt

@@ -1,3 +1,16 @@
+=== 3.1.1 / 2016-03-17
+
+* 4 bug fixes:
+  * Disable USR1 usage on JRuby
+  * Fixes #922 - Correctly define file encoding as UTF-8
+  * Set a more explicit SERVER_SOFTWARE Rack variable
+  * Show RUBY_ENGINE_VERSION if available. Fixes #923
+
+* 3 PRs merged:
+  * Merge pull request #912 from tricknotes/fix-allow-failures-in-travis-yml
+  * Merge pull request #921 from swrobel/patch-1
+  * Merge pull request #924 from tbrisker/patch-1
+
 === 3.1.0 / 2016-03-05
 
 * 1 minor feature:

data/lib/puma/binder.rb

@@ -28,7 +28,7 @@ module Puma
 
         "QUERY_STRING".freeze => "",
         SERVER_PROTOCOL => HTTP_11,
-        SERVER_SOFTWARE => PUMA_VERSION,
+        SERVER_SOFTWARE => PUMA_SERVER_STRING,
         GATEWAY_INTERFACE => CGI_VER
       }
 

data/lib/puma/const.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Puma
   class UnsupportedOption < RuntimeError
   end
@@ -99,9 +100,10 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.1.0".freeze
+    PUMA_VERSION = VERSION = "3.1.1".freeze
     CODE_NAME = "El Niño Winter Wonderland".freeze
-
+    PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
+    
     FAST_TRACK_KA_TIMEOUT = 0.2
 
     # The default number of seconds for another request within a persistent

data/lib/puma/launcher.rb

@@ -361,12 +361,14 @@ module Puma
         log "*** SIGUSR2 not implemented, signal based restart unavailable!"
       end
 
-      begin
-        Signal.trap "SIGUSR1" do
-          phased_restart
+      unless Puma.jruby?
+        begin
+          Signal.trap "SIGUSR1" do
+            phased_restart
+          end
+        rescue Exception
+          log "*** SIGUSR1 not implemented, signal based restart unavailable!"
         end
-      rescue Exception
-        log "*** SIGUSR1 not implemented, signal based restart unavailable!"
       end
 
       begin

data/lib/puma/runner.rb

@@ -72,7 +72,11 @@ module Puma
       if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
         "ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
       else
-        "#{RUBY_ENGINE} #{RUBY_VERSION}"
+        if defined?(RUBY_ENGINE_VERSION)
+          "#{RUBY_ENGINE} #{RUBY_ENGINE_VERSION} - ruby #{RUBY_VERSION}"
+        else
+          "#{RUBY_ENGINE} #{RUBY_VERSION}"
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement