puma 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a23e7e6ba37bf306a2ae94c314daa0abf2f592
-  data.tar.gz: c9228af1cebabc34902fd222965a4c851efd84e0
+  metadata.gz: 87918f1205dd9605cd8198bcd466597af1ed4c72
+  data.tar.gz: 59a5c11d9424f550c702a018a6e6ca10cb44318b
 SHA512:
-  metadata.gz: 91433445f3ec432dfe5dd29361c06d8726e6c253351d2a66906442329edc6fe7e6b4dc47f120786a7a1adc11aae6b650ce7f0f6e829f63979ee8aa738d33e0ca
-  data.tar.gz: 2aea9f4334fdf09dd1ff5ff8b6a71a61ad0ef5527f3e08d98a73b17cf940d85c56e5bae6221ea4ddc09d8b12cc368359227462b3fc93a372da0327041300c397
+  metadata.gz: b40c7149a0ce6d7a8374239bd2ad3c877bf448f19ea321517ff639f8a10ceef73fae6223b57d88e4301e742607144f8c91a9486d898f12a102d184bd51375b3b
+  data.tar.gz: 29af2339e95062708ae7445f64fad0076e1805fab766deebff3c337d374a6014500bc89decc1ee6117a6323e4d2b9aba77d3ea4056e2dccf75f299cf6bb03391

data/History.txt

@@ -1,3 +1,21 @@
+=== 3.6.1 / 2016-11-21
+
+* 8 bug fixes:
+
+  * Fix Puma start in init.d script.
+  * Fix default SSL mode back to none. Fixes #1036
+  * Fixed the issue of @listeners getting nil io, fix rails restart (#1120)
+  * More gracefully deal with SSL sessions. Fixes #1002
+  * Prevent short term thread churn.
+  * Provide write as <<. Fixes #1089
+  * Fix access priorities of each level in LeveledOptions - fixes TTIN.
+  * Stub description files updated for init.d.
+
+* 2 new project committers:
+
+  * Nate Berkopec (@nateberkopec)
+  * Richard Schneeman (@schneems)
+
 === 3.6.0 / 2016-07-24
 
 * 12 bug fixes:

data/ext/puma_http11/extconf.rb

@@ -3,6 +3,8 @@ require 'mkmf'
 dir_config("puma_http11")
 
 unless ENV["DISABLE_SSL"]
+  dir_config("openssl")
+
   if %w'crypto libeay32'.find {|crypto| have_library(crypto, 'BIO_read')} and
       %w'ssl ssleay32'.find {|ssl| have_library(ssl, 'SSL_CTX_new')}
 

data/ext/puma_http11/mini_ssl.c

@@ -327,6 +327,33 @@ VALUE engine_extract(VALUE self) {
   return Qnil;
 }
 
+VALUE engine_shutdown(VALUE self) {
+  ms_conn* conn;
+  int ok, err;
+  char buf[512];
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  ERR_clear_error();
+
+  ok = SSL_shutdown(conn->ssl);
+  if (ok == 0) {
+    return Qfalse;
+  }
+
+  return Qtrue;
+}
+
+VALUE engine_init(VALUE self) {
+  ms_conn* conn;
+  int ok, err;
+  char buf[512];
+
+  Data_Get_Struct(self, ms_conn, conn);
+
+  return SSL_in_init(conn->ssl) ? Qtrue : Qfalse;
+}
+
 VALUE engine_peercert(VALUE self) {
   ms_conn* conn;
   X509* cert;
@@ -394,6 +421,10 @@ void Init_mini_ssl(VALUE puma) {
   rb_define_method(eng, "write",  engine_write, 1);
   rb_define_method(eng, "extract", engine_extract, 0);
 
+  rb_define_method(eng, "shutdown", engine_shutdown, 0);
+
+  rb_define_method(eng, "init?", engine_init, 0);
+
   rb_define_method(eng, "peercert", engine_peercert, 0);
 }
 

data/lib/puma/binder.rb

@@ -102,7 +102,7 @@ module Puma
             io = add_tcp_listener uri.host, uri.port, opt, bak
           end
 
-          @listeners << [str, io]
+          @listeners << [str, io] if io
         when "unix"
           path = "#{uri.host}#{uri.path}".gsub("%20", " ")
 
@@ -206,7 +206,7 @@ module Puma
             io = add_ssl_listener uri.host, uri.port, ctx
           end
 
-          @listeners << [str, io]
+          @listeners << [str, io] if io
         else
           logger.error "Invalid URI: #{str}"
         end

data/lib/puma/configuration.rb

@@ -30,7 +30,7 @@ module Puma
     end
 
     def [](key)
-      @set.each do |o|
+      @set.reverse_each do |o|
         if o.key? key
           return o[key]
         end

data/lib/puma/const.rb

@@ -100,10 +100,10 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.6.0".freeze
+    PUMA_VERSION = VERSION = "3.6.1".freeze
     CODE_NAME = "Sleepy Sunday Serenity".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/dsl.rb

@@ -264,11 +264,13 @@ module Puma
     end
 
     def ssl_bind(host, port, opts)
+      verify = opts.fetch(:verify_mode, 'none')
+
       if defined?(JRUBY_VERSION)
         keystore_additions = "keystore=#{opts[:keystore]}&keystore-pass=#{opts[:keystore_pass]}"
-        bind "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}&#{keystore_additions}&verify_mode=#{opts[:verify_mode] || 'peer'}"
+        bind "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}&#{keystore_additions}&verify_mode=#{verify}"
       else
-        bind "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}&verify_mode=#{opts[:verify_mode] || 'peer'}"
+        bind "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}&verify_mode=#{verify}"
       end
     end
 

data/lib/puma/minissl.rb

@@ -75,13 +75,45 @@ module Puma
       end
 
       alias_method :syswrite, :write
+      alias_method :<<, :write
 
       def flush
         @socket.flush
       end
 
       def close
-        @socket.close
+        begin
+          # Try to setup (so that we can then close them) any
+          # partially initialized sockets.
+          while @engine.init?
+            # Don't let this socket hold this loop forever.
+            # If it can't send more packets within 1s, then
+            # give up.
+            return unless IO.select([@socket], nil, nil, 1)
+            begin
+              read_nonblock(1024)
+            rescue Errno::EAGAIN
+            end
+          end
+
+          done = @engine.shutdown
+
+          while true
+            enc = @engine.extract
+            @socket.write enc
+
+            notify = @socket.sysread(1024)
+
+            @engine.inject notify
+            done = @engine.shutdown
+
+            break if done
+          end
+        rescue IOError, SystemCallError
+          # nothing
+        ensure
+          @socket.close
+        end
       end
 
       def peeraddr

data/lib/puma/server.rb

@@ -57,7 +57,7 @@ module Puma
 
       @min_threads = 0
       @max_threads = 16
-      @auto_trim_time = 1
+      @auto_trim_time = 30
       @reaping_time = 1
 
       @thread = nil
@@ -358,7 +358,7 @@ module Puma
 
         graceful_shutdown if @status == :stop || @status == :restart
         if queue_requests
-          @reactor.clear! if @status == :restart
+          @reactor.clear!
           @reactor.shutdown
         end
       rescue Exception => e

data/lib/puma/thread_pool.rb

@@ -209,7 +209,7 @@ module Puma
       end
     end
 
-    def auto_trim!(timeout=5)
+    def auto_trim!(timeout=30)
       @auto_trim = AutoTrim.new(self, timeout)
       @auto_trim.start!
     end

data/tools/jungle/init.d/puma

@@ -5,9 +5,9 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Example initscript
-# Description:       This file should be used to construct scripts to be
-#                    placed in /etc/init.d.
+# Short-Description: Puma web server
+# Description:       A ruby web server built for concurrency http://puma.io
+#                    initscript to be placed in /etc/init.d.
 ### END INIT INFO
 
 # Author: Darío Javier Cravero <dario@exordo.com>
@@ -39,17 +39,7 @@ do_start() {
   log_daemon_msg "=> Running the jungle..."
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    environment=`echo $i | cut -d , -f 5`
-    do_start_one $dir $user $config_file $log_file $environment
+    do_start_one $dir
   done
 }
 
@@ -59,28 +49,41 @@ do_start_one() {
     PID=`cat $PIDFILE`
     # If the puma isn't running, run it, otherwise restart it.
     if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      do_start_one_do $1 $2 $3 $4 $5
+      do_start_one_do $1
     else
       do_restart_one $1
     fi
   else
-    do_start_one_do $1 $2 $3 $4 $5
+    do_start_one_do $1
   fi
 }
 
 do_start_one_do() {
-  log_daemon_msg "--> Woke up puma $1"
-  log_daemon_msg "user $2"
-  log_daemon_msg "log to $4"
+  i=`grep $1 $CONFIG`
+  dir=`echo $i | cut -d , -f 1`
+  user=`echo $i | cut -d , -f 2`
+  config_file=`echo $i | cut -d , -f 3`
+  if [ "$config_file" = "" ]; then
+    config_file="$dir/config/puma.rb"
+  fi
+  log_file=`echo $i | cut -d , -f 4`
+  if [ "$log_file" = "" ]; then
+    log_file="$dir/log/puma.log"
+  fi
+  environment=`echo $i | cut -d , -f 5`
+
+  log_daemon_msg "--> Woke up puma $dir"
+  log_daemon_msg "user $user"
+  log_daemon_msg "log to $log_file"
 
-  if [ ! -z "$5" ]; then
-    for e in $(echo "$5" | tr ';' '\n'); do
+  if [ ! -z "$environment" ]; then
+    for e in $(echo "$environment" | tr ';' '\n'); do
         log_daemon_msg "environment $e"
         v=${e%%\=*} ;  eval "$e" ; export $v
     done
   fi
 
-  start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 $3 $4
+  start-stop-daemon --verbose --start --chdir $dir --chuid $user --background --exec $RUNPUMA -- $dir $config_file $log_file
 }
 
 #
@@ -135,8 +138,6 @@ do_restart() {
 #
 do_restart_one() {
   PIDFILE=$1/tmp/puma/pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
 
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to restart puma $1"
@@ -144,17 +145,7 @@ do_restart_one() {
     # TODO Check if process exist
   else
     log_daemon_msg "--> Your puma was never playing... Let's get it out there first"
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    environment=`echo $i | cut -d , -f 5`
-    do_start_one $dir $user $config_file $log_file $environment
+    do_start_one $1
   fi
 	return 0
 }
@@ -174,26 +165,14 @@ do_phased_restart() {
 #
 do_phased_restart_one() {
   PIDFILE=$1/tmp/puma/pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
 
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to restart puma $1"
     kill -s USR1 `cat $PIDFILE`
     # TODO Check if process exist
   else
-    log_daemon_msg "--> Your puma was never playing... Let's get it out there first" 
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    environment=`echo $i | cut -d , -f 5`
-    do_start_one $dir $user $config_file $log_file $environment
+    log_daemon_msg "--> Your puma was never playing... Let's get it out there first"
+    do_start_one $1
   fi
 	return 0
 }
@@ -339,16 +318,7 @@ case "$1" in
     else
       i=`grep $2 $CONFIG`
       dir=`echo $i | cut -d , -f 1`
-      user=`echo $i | cut -d , -f 2`
-      config_file=`echo $i | cut -d , -f 3`
-      if [ "$config_file" = "" ]; then
-        config_file="$dir/config/puma.rb"
-      fi
-      log_file=`echo $i | cut -d , -f 4`
-      if [ "$log_file" = "" ]; then
-        log_file="$dir/log/puma.log"
-      fi
-      do_start_one $dir $user $config_file $log_file
+      do_start_one $dir
     fi
     case "$?" in
       0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
 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