puma 3.5.2-java → 3.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 732e9b2247b8ea7b6a35f9ee1dda1127c12ffcd2
-  data.tar.gz: 2066d7b84c35df5888f1fbfbc5f4cdf9d10fcb81
+  metadata.gz: 69d7cfd48187f55a4d8441677fa65cb719a9e13c
+  data.tar.gz: f59dedcc834c6a362e15412e1c7895be6c9f6047
 SHA512:
-  metadata.gz: 5298b67f23035da2fde3391cc67925684c6c583340293088942cc80922d099ce6e20106830970b2e8bf2349f9bb5b47321122a53e4b04fff8c4e09a86d427a79
-  data.tar.gz: b666baab73daf6190b2ebebd4fcbe49702d28ec7afc66afdac341eaef00fa66aec6752f8eb6a47606c01e73396441ca78d454aca8144780bc5f3e37d8da06817
+  metadata.gz: 68b8d50366e7b4f995f1def7133a978b1ad21b14a7a2fa9b2ed8ab69e286fc2ea2e10f55a5f311e792e967574cfa5e96207cde99f15dc68a2c39601967ff7b5b
+  data.tar.gz: 314f66c4717357b191a7ef59b47efb2dda12d8280ab3e913436fa39021c92c74f67204e78fcb795673ebd7157fad9bfc7772cb4c1e2abe8301fdde4659e1e09e

data/History.txt

@@ -1,3 +1,19 @@
+=== 3.6.0 / 2016-07-24
+
+* 12 bug fixes:
+  * Add ability to detect a shutting down server. Fixes #932
+  * Add support for Expect: 100-continue. Fixes #519
+  * Check SSLContext better. Fixes #828
+  * Clarify behavior of '-t <num>'. Fixes #984
+  * Don't default to VERIFY_PEER. Fixes #1028
+  * Don't use ENV['PWD'] on windows. Fixes #1023
+  * Enlarge the scope of catching app exceptions. Fixes #1027
+  * Execute background hooks after daemonizing. Fixes #925
+  * Handle HUP as a stop unless there is IO redirection. Fixes #911
+  * Implement chunked request handling. Fixes #620
+  * Just rescue exception to return a 500. Fixes #1027
+  * Redirect IO in the jruby daemon mode. Fixes #778
+
 === 3.5.2 / 2016-07-20
 
 * 1 bug fix:

data/ext/puma_http11/mini_ssl.c

@@ -134,9 +134,13 @@ VALUE engine_init_server(VALUE self, VALUE mini_ssl_ctx) {
   ID sym_key = rb_intern("key");
   VALUE key = rb_funcall(mini_ssl_ctx, sym_key, 0);
 
+  StringValue(key);
+
   ID sym_cert = rb_intern("cert");
   VALUE cert = rb_funcall(mini_ssl_ctx, sym_cert, 0);
 
+  StringValue(cert);
+
   ID sym_ca = rb_intern("ca");
   VALUE ca = rb_funcall(mini_ssl_ctx, sym_ca, 0);
 
@@ -150,6 +154,7 @@ VALUE engine_init_server(VALUE self, VALUE mini_ssl_ctx) {
   SSL_CTX_use_PrivateKey_file(ctx, RSTRING_PTR(key), SSL_FILETYPE_PEM);
 
   if (!NIL_P(ca)) {
+    StringValue(ca);
     SSL_CTX_load_verify_locations(ctx, RSTRING_PTR(ca), NULL);
   }
   

data/lib/puma/binder.rb

@@ -181,7 +181,7 @@ module Puma
             ctx.ca = params['ca'] if params['ca']
           end
 
-          if  params['verify_mode']
+          if params['verify_mode']
             ctx.verify_mode = case params['verify_mode']
                               when "peer"
                                 MiniSSL::VERIFY_PEER
@@ -193,8 +193,6 @@ module Puma
                                 @events.error "Please specify a valid verify_mode="
                                 MiniSSL::VERIFY_NONE
                               end
-          else
-            ctx.verify_mode = MiniSSL::VERIFY_PEER
           end
 
           if fd = @inherited_fds.delete(str)

data/lib/puma/cli.rb

@@ -170,7 +170,7 @@ module Puma
             if max
               c.threads min, max
             else
-              c.threads 0, max
+              c.threads min, min
             end
           end
 

data/lib/puma/client.rb

@@ -8,6 +8,7 @@ end
 
 require 'puma/detect'
 require 'puma/delegation'
+require 'tempfile'
 
 if Puma::IS_JRUBY
   # We have to work around some OpenSSL buffer/io-readiness bugs
@@ -117,9 +118,116 @@ module Puma
     # no body share this one object since it has no state.
     EmptyBody = NullIO.new
 
+    def setup_chunked_body(body)
+      @chunked_body = true
+      @partial_part_left = 0
+      @prev_chunk = ""
+
+      @body = Tempfile.new(Const::PUMA_TMP_BASE)
+      @body.binmode
+      @tempfile = @body
+
+      return decode_chunk(body)
+    end
+
+    def decode_chunk(chunk)
+      if @partial_part_left > 0
+        if @partial_part_left <= chunk.size
+          @body << chunk[0..(@partial_part_left-3)] # skip the \r\n
+          chunk = chunk[@partial_part_left..-1]
+        else
+          @body << chunk
+          @partial_part_left -= chunk.size
+          return false
+        end
+      end
+
+      if @prev_chunk.empty?
+        io = StringIO.new(chunk)
+      else
+        io = StringIO.new(@prev_chunk+chunk)
+        @prev_chunk = ""
+      end
+
+      while !io.eof?
+        line = io.gets
+        if line.end_with?("\r\n")
+          len = line.strip.to_i(16)
+          if len == 0
+            @body.rewind
+            @buffer = nil
+            @requests_served += 1
+            @ready = true
+            return true
+          end
+
+          len += 2
+
+          part = io.read(len)
+
+          unless part
+            @partial_part_left = len
+            next
+          end
+
+          got = part.size
+
+          case
+          when got == len
+            @body << part[0..-3] # to skip the ending \r\n
+          when got <= len - 2
+            @body << part
+            @partial_part_left = len - part.size
+          when got == len - 1 # edge where we get just \r but not \n
+            @body << part[0..-2]
+            @partial_part_left = len - part.size
+          end
+        else
+          @prev_chunk = line
+          return false
+        end
+      end
+
+      return false
+    end
+
+    def read_chunked_body
+      while true
+        begin
+          chunk = @io.read_nonblock(4096)
+        rescue Errno::EAGAIN
+          return false
+        rescue SystemCallError, IOError
+          raise ConnectionError, "Connection error detected during read"
+        end
+
+        # No chunk means a closed socket
+        unless chunk
+          @body.close
+          @buffer = nil
+          @requests_served += 1
+          @ready = true
+          raise EOFError
+        end
+
+        return true if decode_chunk(chunk)
+      end
+    end
+
     def setup_body
       @in_data_phase = true
+      @read_header = false
+
       body = @parser.body
+
+      te = @env[TRANSFER_ENCODING2]
+
+      if te == CHUNKED
+        return setup_chunked_body(body)
+      end
+
+      @chunked_body = false
+
       cl = @env[CONTENT_LENGTH]
 
       unless cl
@@ -154,8 +262,6 @@ module Puma
 
       @body_remain = remain
 
-      @read_header = false
-
       return false
     end
 
@@ -246,6 +352,10 @@ module Puma
     end
 
     def read_body
+      if @chunked_body
+        return read_chunked_body
+      end
+
       # Read an odd sized chunk so we can read even sized ones
       # after this
       remain = @body_remain

data/lib/puma/cluster.rb

@@ -413,10 +413,12 @@ module Puma
 
       redirect_io
 
-      start_control
+      Plugins.fire_background
 
       @launcher.write_state
 
+      start_control
+
       @master_read, @worker_write = read, @wakeup
 
       @launcher.config.run_hooks :before_fork, nil

data/lib/puma/const.rb

@@ -100,8 +100,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.5.2".freeze
-    CODE_NAME = "Amateur Raccoon Rocketry".freeze
+    PUMA_VERSION = VERSION = "3.6.0".freeze
+    CODE_NAME = "Sleepy Sunday Serenity".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
     
     FAST_TRACK_KA_TIMEOUT = 0.2
@@ -219,7 +219,10 @@ module Puma
 
     HTTP_VERSION = "HTTP_VERSION".freeze
     HTTP_CONNECTION = "HTTP_CONNECTION".freeze
+    HTTP_EXPECT = "HTTP_EXPECT".freeze
+    CONTINUE = "100-continue".freeze
 
+    HTTP_11_100 = "HTTP/1.1 100 Continue\r\n\r\n".freeze
     HTTP_11_200 = "HTTP/1.1 200 OK\r\n".freeze
     HTTP_10_200 = "HTTP/1.0 200 OK\r\n".freeze
 
@@ -229,6 +232,7 @@ module Puma
     CONTENT_LENGTH2 = "content-length".freeze
     CONTENT_LENGTH_S = "Content-Length: ".freeze
     TRANSFER_ENCODING = "transfer-encoding".freeze
+    TRANSFER_ENCODING2 = "HTTP_TRANSFER_ENCODING".freeze
 
     CONNECTION_CLOSE = "Connection: close\r\n".freeze
     CONNECTION_KEEP_ALIVE = "Connection: Keep-Alive\r\n".freeze
@@ -236,6 +240,8 @@ module Puma
     TRANSFER_ENCODING_CHUNKED = "Transfer-Encoding: chunked\r\n".freeze
     CLOSE_CHUNKED = "0\r\n\r\n".freeze
 
+    CHUNKED = "chunked".freeze
+
     COLON = ": ".freeze
 
     NEWLINE = "\n".freeze

data/lib/puma/detect.rb

@@ -6,6 +6,6 @@ module Puma
   end
 
   def self.windows?
-    RUBY_PLATFORM =~ /mswin32|ming32/
+    RUBY_PLATFORM =~ /mswin|ming|cygwin/
   end
 end

data/lib/puma/launcher.rb

@@ -316,6 +316,11 @@ module Puma
       if dir = @options[:directory]
         @restart_dir = dir
 
+      elsif Puma.windows?
+        # I guess the value of PWD is garbage on windows so don't bother
+        # using it.
+        @restart_dir = Dir.pwd
+
         # Use the same trick as unicorn, namely favor PWD because
         # it will contain an unresolved symlink, useful for when
         # the pwd is /data/releases/current.
@@ -382,7 +387,11 @@ module Puma
 
       begin
         Signal.trap "SIGHUP" do
-          @runner.redirect_io
+          if @runner.redirected_io?
+            @runner.redirect_io
+          else
+            stop
+          end
         end
       rescue Exception
         log "*** SIGHUP not implemented, signal based logs reopening unavailable!"

data/lib/puma/minissl.rb

@@ -118,6 +118,11 @@ module Puma
           raise ArgumentError, "No such keystore file '#{keystore}'" unless File.exist? keystore
           @keystore = keystore
         end
+
+        def check
+          raise "Keystore not configured" unless @keystore
+        end
+
       else
         # non-jruby Context properties
         attr_reader :key
@@ -138,6 +143,11 @@ module Puma
           raise ArgumentError, "No such ca file '#{ca}'" unless File.exist? ca
           @ca = ca
         end
+
+        def check
+          raise "Key not configured" unless @key
+          raise "Cert not configured" unless @cert
+        end
       end
     end
 
@@ -156,6 +166,7 @@ module Puma
       end
 
       def accept
+        @ctx.check
         io = @socket.accept
         engine = Engine.server @ctx
 
@@ -163,6 +174,7 @@ module Puma
       end
 
       def accept_nonblock
+        @ctx.check
         io = @socket.accept_nonblock
         engine = Engine.server @ctx
 

data/lib/puma/plugin.rb

@@ -28,6 +28,7 @@ module Puma
   class PluginRegistry
     def initialize
       @plugins = {}
+      @background = []
     end
 
     def register(name, cls)
@@ -53,6 +54,16 @@ module Puma
 
       raise UnknownPlugin, "file failed to register a plugin"
     end
+
+    def add_background(blk)
+      @background << blk
+    end
+
+    def fire_background
+      @background.each do |b|
+        Thread.new(&b)
+      end
+    end
   end
 
   Plugins = PluginRegistry.new
@@ -93,7 +104,7 @@ module Puma
     end
 
     def in_background(&blk)
-      Thread.new(&blk)
+      Plugins.add_background blk
     end
 
     def workers_supported?

data/lib/puma/runner.rb

@@ -94,6 +94,10 @@ module Puma
       end
     end
 
+    def redirected_io?
+      @options[:redirect_stdout] || @options[:redirect_stderr]
+    end
+
     def redirect_io
       stdout = @options[:redirect_stdout]
       stderr = @options[:redirect_stderr]

data/lib/puma/server.rb

@@ -242,6 +242,10 @@ module Puma
       @thread_pool = ThreadPool.new(@min_threads,
                                     @max_threads,
                                     IOBuffer) do |client, buffer|
+
+        # Advertise this server into the thread
+        Thread.current[ThreadLocalKey] = self
+
         process_now = false
 
         begin
@@ -399,6 +403,11 @@ module Puma
     #
     def process_client(client, buffer)
       begin
+
+        if client.env[HTTP_EXPECT] == CONTINUE
+          client.io << HTTP_11_100
+        end
+
         clean_thread_locals = @options[:clean_thread_locals]
         close_socket = true
 
@@ -587,7 +596,7 @@ module Puma
           headers = {}
           res_body = ["Request was internally terminated early\n"]
 
-        rescue StandardError => e
+        rescue Exception => e
           @events.unknown_error self, e, "Rack app", env
 
           status, headers, res_body = lowlevel_error(e, env)
@@ -911,5 +920,15 @@ module Puma
       end
     end
     private :fast_write
+
+    ThreadLocalKey = :puma_server
+
+    def self.current
+      Thread.current[ThreadLocalKey]
+    end
+
+    def shutting_down?
+      @status == :stop || @status == :restart
+    end
   end
 end

data/lib/puma/single.rb

@@ -44,6 +44,7 @@ module Puma
         if JRubyRestart.daemon?
           # load and bind before redirecting IO so errors show up on stdout/stderr
           load_and_bind
+          redirect_io
         end
 
         already_daemon = JRubyRestart.daemon_init
@@ -84,6 +85,8 @@ module Puma
         load_and_bind
       end
 
+      Plugins.fire_background
+
       @launcher.write_state
 
       start_control

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement