puma 2.9.2 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ba7fc9d6258288ee3ccd24615ee3f1cb9bb24e
-  data.tar.gz: 7acc27c67161d2ccb65cd8dfeabca6bbbafcdc14
+  metadata.gz: 2765b2cc720002160a156261825e5c66dcb9fba4
+  data.tar.gz: d86005b282c74c803e773f12deeff31f039ee38b
 SHA512:
-  metadata.gz: 21029428eda1b5b455a3e8257438211d6635da18ee17375af4ee588a0b968c8d542b86e8d3f73629926b690071c184e47db5e2af159a8ab24302be9f56aad9c4
-  data.tar.gz: e6e4b25b8e2aa6c8aee2ec52b274ef9af44b2fab47d99396c0cc4f207f394727d4a804348d13008e17a5db6b32e27989ce373a3f2d1af338453c0c03d05c18a4
+  metadata.gz: 50322764a2f4962dbda6b6f042a7172493363928829140e4b896cf359285cc8ea4de0830afb9c21bed42aae465f4a04cfce700a9d9cb9a6cfe9e77084ee58e5e
+  data.tar.gz: a8e2ea53d31c3f6418fcd9aa2e6d87ae17068fd8bb393d72ec46596b89996b0ab7199a6a6ec747697f4e2977af4229a87fcb3507dac7964e2670fbda16820f1b

data/History.txt

@@ -1,4 +1,33 @@
-=== 2.9.2 / 1024-10-25
+=== 2.10.0 / 2014-11-23
+
+* 3 minor features:
+  * Added on_worker_shutdown hook mechanism
+  * Allow binding to ipv6 addresses for ssl URIs
+  * Warn about any threads started during app preload
+
+* 5 bug fixes:
+  * Clean out a threads local data before doing work
+  * Disable SSLv3. Fixes #591
+  * First change the directory to use the correct Gemfile.
+  * Only use config.ru binds if specified. Fixes #606
+  * Strongish cipher suite with FS support for some browsers
+
+* 2 doc changes:
+  * Change umask examples to more permissive values
+  * fix typo in README.md
+
+* 9 Merged PRs:
+  * Merge pull request #560 from raskhadafi/prune_bundler-bug
+  * Merge pull request #566 from sheltond/master
+  * Merge pull request #593 from andruby/patch-1
+  * Merge pull request #594 from hassox/thread-cleanliness
+  * Merge pull request #596 from burningTyger/patch-1
+  * Merge pull request #601 from sorentwo/friendly-umask
+  * Merge pull request #602 from 1334/patch-1
+  * Merge pull request #608 from Gu1/master
+  * Merge remote-tracking branch 'origin/pr/538'
+
+=== 2.9.2 / 2014-10-25
 
 * 8 bug fixes:
   * Fix puma-wild handling a restart properly. Fixes #550

data/README.md

@@ -116,7 +116,7 @@ If you're preloading your application and using ActiveRecord, it's recommend you
         ActiveRecord::Base.establish_connection
       end
     end
-    
+
 When you use preload_app, your new code goes all in the master process, and is then copied in the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you probably should not use preload_app.
 
 Note that preload_app can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and preload_app is all about copying the code of master into the workers.
@@ -133,7 +133,7 @@ Want to use UNIX Sockets instead of TCP (which can provide a 5-10% performance b
 
 If you need to change the permissions of the UNIX socket, just add a umask parameter:
 
-    $ puma -b 'unix:///var/run/puma.sock?umask=0777'
+    $ puma -b 'unix:///var/run/puma.sock?umask=0111'
 
 Need a bit of security? Use SSL sockets!
 

data/ext/puma_http11/mini_ssl.c

@@ -3,6 +3,7 @@
 #include <rubyio.h>
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
+#include <openssl/dh.h>
 #include <openssl/err.h>
 
 typedef struct {
@@ -36,6 +37,42 @@ ms_conn* engine_alloc(VALUE klass, VALUE* obj) {
   return conn;
 }
 
+DH *get_dh1024() {
+  /* `openssl dhparam 1024 -C`
+   * -----BEGIN DH PARAMETERS-----
+   * MIGHAoGBALPwcEv0OstmQCZdfHw0N5r+07lmXMxkpQacy1blwj0LUqC+Divp6pBk
+   * usTJ9W2/dOYr1X7zi6yXNLp4oLzc/31PUL3D9q8CpGS7vPz5gijKSw9BwCTT5z9+
+   * KF9v46qw8XqT5HHV87sWFlGQcVFq+pEkA2kPikkKZ/X/CCcpCAV7AgEC
+   * -----END DH PARAMETERS-----
+   */
+  static unsigned char dh1024_p[] = {
+    0xB3,0xF0,0x70,0x4B,0xF4,0x3A,0xCB,0x66,0x40,0x26,0x5D,0x7C,
+    0x7C,0x34,0x37,0x9A,0xFE,0xD3,0xB9,0x66,0x5C,0xCC,0x64,0xA5,
+    0x06,0x9C,0xCB,0x56,0xE5,0xC2,0x3D,0x0B,0x52,0xA0,0xBE,0x0E,
+    0x2B,0xE9,0xEA,0x90,0x64,0xBA,0xC4,0xC9,0xF5,0x6D,0xBF,0x74,
+    0xE6,0x2B,0xD5,0x7E,0xF3,0x8B,0xAC,0x97,0x34,0xBA,0x78,0xA0,
+    0xBC,0xDC,0xFF,0x7D,0x4F,0x50,0xBD,0xC3,0xF6,0xAF,0x02,0xA4,
+    0x64,0xBB,0xBC,0xFC,0xF9,0x82,0x28,0xCA,0x4B,0x0F,0x41,0xC0,
+    0x24,0xD3,0xE7,0x3F,0x7E,0x28,0x5F,0x6F,0xE3,0xAA,0xB0,0xF1,
+    0x7A,0x93,0xE4,0x71,0xD5,0xF3,0xBB,0x16,0x16,0x51,0x90,0x71,
+    0x51,0x6A,0xFA,0x91,0x24,0x03,0x69,0x0F,0x8A,0x49,0x0A,0x67,
+    0xF5,0xFF,0x08,0x27,0x29,0x08,0x05,0x7B
+  };
+  static unsigned char dh1024_g[] = { 0x02 };
+
+  DH *dh;
+  dh = DH_new();
+  dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
+  dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
+
+  if ((dh->p == NULL) || (dh->g == NULL)) {
+    DH_free(dh);
+    return NULL;
+  }
+
+  return dh;
+}
+
 VALUE engine_init_server(VALUE self, VALUE mini_ssl_ctx) {
   VALUE obj;
   SSL_CTX* ctx;
@@ -54,7 +91,20 @@ VALUE engine_init_server(VALUE self, VALUE mini_ssl_ctx) {
 
   SSL_CTX_use_certificate_file(ctx, RSTRING_PTR(cert), SSL_FILETYPE_PEM);
   SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM);
-  /* SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); */
+  
+  SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_SINGLE_DH_USE | SSL_OP_SINGLE_ECDH_USE);
+  SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
+
+  SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL@STRENGTH");
+
+  DH *dh = get_dh1024();
+  SSL_CTX_set_tmp_dh(ctx, dh);
+
+  EC_KEY *ecdh = EC_KEY_new_by_curve_name(NID_secp521r1);
+  if (ecdh) {
+    SSL_CTX_set_tmp_ecdh(ctx, ecdh);
+    EC_KEY_free(ecdh);
+  }
 
   ssl =  SSL_new(ctx);
   conn->ssl = ssl;

data/lib/puma/binder.rb

@@ -227,6 +227,7 @@ module Puma
                          optimize_for_latency=true, backlog=1024)
       require 'puma/minissl'
 
+      host = host[1..-2] if host[0..0] == '['
       s = TCPServer.new(host, port)
       if optimize_for_latency
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)

data/lib/puma/cli.rb

@@ -99,6 +99,7 @@ module Puma
         :binds => [],
         :workers => 0,
         :daemon => false,
+        :before_worker_shutdown => [],
         :before_worker_boot => [],
         :after_worker_boot => []
       }
@@ -228,7 +229,7 @@ module Puma
 
         cfg = @config.dup
 
-        [ :logger, :before_worker_boot, :after_worker_boot, :on_restart ].each { |o| cfg.options.delete o }
+        [ :logger, :before_worker_shutdown, :before_worker_boot, :after_worker_boot, :on_restart ].each { |o| cfg.options.delete o }
 
         state["config"] = cfg
 
@@ -454,6 +455,10 @@ module Puma
         exit 1
       end
 
+      if dir = @options[:directory]
+        Dir.chdir dir
+      end
+
       if prune_bundler? && defined?(Bundler)
         puma = Bundler.rubygems.loaded_specs("puma")
 
@@ -483,10 +488,6 @@ module Puma
         log "! Unable to prune Bundler environment, continuing"
       end
 
-      if dir = @options[:directory]
-        Dir.chdir dir
-      end
-
       set_rack_environment
 
       if clustered?

data/lib/puma/cluster.rb

@@ -73,7 +73,7 @@ module Puma
 
       def term
         begin
-          if @first_term_sent && (Time.new - @first_term_sent) > 30
+          if @first_term_sent && (Time.new - @first_term_sent) > @options[:worker_shutdown_timeout]
             @signal = "KILL"
           else
             @first_term_sent ||= Time.new
@@ -228,6 +228,10 @@ module Puma
 
       server.run.join
 
+      # Invoke any worker shutdown hooks so they can prevent the worker
+      # exiting until any background operations are completed
+      hooks = @options[:before_worker_shutdown]
+      hooks.each { |h| h.call(index) }
     ensure
       @worker_write.close
     end
@@ -278,9 +282,25 @@ module Puma
 
       log "* Process workers: #{@options[:workers]}"
 
+      before = Thread.list
+
       if preload?
         log "* Preloading application"
         load_and_bind
+
+        after = Thread.list
+
+        if after.size > before.size
+          threads = (after - before)
+          if threads.first.respond_to? :backtrace
+            log "! WARNING: Detected #{after.size-before.size} Thread(s) started in app boot:"
+            threads.each do |t|
+              log "! #{t.inspect} - #{t.backtrace.first}"
+            end
+          else
+            log "! WARNING: Detected #{after.size-before.size} Thread(s) started in app boot"
+          end
+        end
       else
         log "* Phased restart available"
 

data/lib/puma/configuration.rb

@@ -1,6 +1,6 @@
 module Puma
 
-  # The CLI exports it's Configuration object here to allow
+  # The CLI exports its Configuration object here to allow
   # apps to pick it up. An app needs to use it conditionally though
   # since it is not set if the app is launched via another
   # mechanism than the CLI class.
@@ -15,15 +15,18 @@ module Puma
     DefaultTCPHost = "0.0.0.0"
     DefaultTCPPort = 9292
     DefaultWorkerTimeout = 60
+    DefaultWorkerShutdownTimeout = 30
 
     def initialize(options)
       @options = options
       @options[:mode] ||= :http
       @options[:binds] ||= []
       @options[:on_restart] ||= []
+      @options[:before_worker_shutdown] ||= []
       @options[:before_worker_boot] ||= []
       @options[:after_worker_boot] ||= []
       @options[:worker_timeout] ||= DefaultWorkerTimeout
+      @options[:worker_shutdown_timeout] ||= DefaultWorkerShutdownTimeout
     end
 
     attr_reader :options
@@ -82,7 +85,7 @@ module Puma
       @options[:rackup] || DefaultRackup
     end
 
-    # Load the specified rackup file, pull an options from
+    # Load the specified rackup file, pull options from
     # the rackup file, and set @app.
     #
     def app
@@ -96,11 +99,15 @@ module Puma
         app, options = Rack::Builder.parse_file rackup
         @options.merge! options
 
+        config_ru_binds = []
+
         options.each do |key,val|
           if key.to_s[0,4] == "bind"
-            @options[:binds] << val
+            config_ru_binds << val
           end
         end
+
+        @options[:binds] = config_ru_binds unless config_ru_binds.empty?
       end
 
       if @options[:mode] == :tcp
@@ -301,6 +308,17 @@ module Puma
         @options[:workers] = count.to_i
       end
 
+      # *Cluster mode only* Code to run immediately before a worker shuts
+      # down (after it has finished processing HTTP requests). These hooks
+      # can block if necessary to wait for background operations unknown
+      # to puma to finish before the process terminates.
+      #
+      # This can be called multiple times to add hooks.
+      #
+      def on_worker_shutdown(&block)
+        @options[:before_worker_shutdown] << block
+      end
+
       # *Cluster mode only* Code to run when a worker boots to setup
       # the process before booting the app.
       #
@@ -338,7 +356,7 @@ module Puma
         @options[:preload_app] = answer
       end
 
-      # Use +obj+ or +block+ as the low lever error handler. This allows a config file to
+      # Use +obj+ or +block+ as the low level error handler. This allows a config file to
       # change the default error on the server.
       #
       def lowlevel_error_handler(obj=nil, &block)
@@ -347,7 +365,7 @@ module Puma
         @options[:lowlevel_error_handler] = obj
       end
 
-      # This option is used to allow your app and it's gems to be
+      # This option is used to allow your app and its gems to be
       # properly reloaded when not using preload.
       #
       # When set, if puma detects that it's been invoked in the
@@ -372,6 +390,11 @@ module Puma
       def worker_timeout(timeout)
         @options[:worker_timeout] = timeout
       end
+
+      # *Cluster mode only* Set the timeout for worker shutdown
+      def worker_shutdown_timeout(timeout)
+        @options[:worker_shutdown_timeout] = timeout
+      end
     end
   end
 end

data/lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.9.2".freeze
-    CODE_NAME = "Team High Five".freeze
+    PUMA_VERSION = VERSION = "2.10.0".freeze
+    CODE_NAME = "Robots on Comets".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/thread_pool.rb

@@ -89,6 +89,10 @@ module Puma
 
           break unless continue
 
+          Thread.current.keys.each do |key|
+            Thread.current[key] = nil unless key == :__recursive_key__
+          end
+
           block.call(work, *extra)
         end
 
@@ -176,7 +180,9 @@ module Puma
 
       # Use this instead of #each so that we don't stop in the middle
       # of each and see a mutated object mid #each
-      @workers.first.join until @workers.empty?
+      if !@workers.empty?
+          @workers.first.join until @workers.empty?
+      end
 
       @spawned = 0
       @workers = []

data/test/test_thread_pool.rb

@@ -153,4 +153,28 @@ class TestThreadPool < Test::Unit::TestCase
 
     assert_equal 1, pool.spawned
   end
+
+  def test_cleanliness
+    values = []
+    n = 100
+    mutex = Mutex.new
+
+    finished = false
+
+    pool = new_pool(1,1) {
+      mutex.synchronize { values.push Thread.current[:foo] }
+      Thread.current[:foo] = :hai
+      Thread.pass until finished
+    }
+
+    n.times { pool << 1 }
+
+    finished = true
+
+    pause
+
+    assert_equal n,  values.length
+
+    assert_equal [], values.compact
+  end
 end

data/tools/jungle/init.d/README.md

@@ -26,7 +26,7 @@ Puma apps are held in /etc/puma.conf by default. It's mainly a CSV file and ever
 
 You can add an instance by editing the file or running the following command:
 
-    sudo /etc/init.d/puma add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log
+    sudo /etc/init.d/puma add /path/to/app user /path/to/app/config/puma.rb /path/to/app/log/puma.log
 
 The config and log paths are optional parameters and default to:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.12'
 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