puma 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 830c9d3efc0d75b127a845f9598ae5c1059de586
-  data.tar.gz: 1dda7e6c8f4de27b0443f8a686ec251251ac40da
+  metadata.gz: a8b54fddb15d1859af7c94fe4dc95d34af40e876
+  data.tar.gz: 90eda7e0a364e1e1ef1e887a7c74324c3c6cecd0
 SHA512:
-  metadata.gz: 967d992a2f7d569ba91881649d7acdc8a9782ec3ee0a992d5eee4b4ab999b786189b6c5b33f530c63ca6bb4cc42ac0ddf22b0061da0c6dd656c28fd71594c40f
-  data.tar.gz: 43a7eb4409820f3b031f9bb5684c60787e755862c1cf249d66bf9a35e1b48e35dc383b74983838091463abca4c5bd154a9cef8fed4234e81ecefbf08c612dcb2
+  metadata.gz: c8197313239e459ed3f37c86e1445b5799cc899e53bbde54408cf2f51a730195674c5fb0e2ca614d926ceaaa928b3085a40762ff79542a8177eec00e22e1d284
+  data.tar.gz: fdd6b229cb07839741bbe9612c18ef84b856f9dea72d7cc35ed5224d254e94db285025599015ea2c2cbe80df5282a9a05b10671c8576ba656d5f1f99aced7caf

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: ruby
 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
   name: rdoc