puma 2.12.2 → 2.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc6978f0afad6cb3d2f28d834f2c60c08f6f6a9
-  data.tar.gz: 24c4f715b9b474a438567ce91314ce24e17f1acb
+  metadata.gz: 8fb289c9463eb0aec389606cde7abca74b3ba737
+  data.tar.gz: 0f81b87b1bd9c0fa43d9c67e6d8b5c2f4a4b97a9
 SHA512:
-  metadata.gz: 115b5753fb3487f7a6e3ae3e0009c75bea89d2cbe9b1b67bf1de52e6795f7788123034a54627b38be5585061ce34db46ba7108f8cff03abef478fc6081cf3854
-  data.tar.gz: 9b7198cca050cc284a335184a7ab3ec630ec5bfe081a44e0760abf1b748ae0388c4b0171b609574ba27748445be5ecf16a62b371aa0dfe58e9dbc05454018420
+  metadata.gz: bf53fee269a717c206e9031cfb26c6e7924eb346d7d17f5accf57d858813fb6302aecb1832385b2a87a94e68f452fae50f218cfe2f941617df8370c712e20d9f
+  data.tar.gz: 92daf0ecf12fb7abda0655461ec72bff29f96dbf955f3434049f00e1e4de87b4b2672db36f03fe62ed36b0df0ea28305bd2dab80fa3de90ac3742a5954a42397

data/Gemfile

@@ -11,7 +11,3 @@ gem "rack"
 gem 'minitest', '~> 4.0'
 
 gem "jruby-openssl", :platform => "jruby"
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-end

data/History.txt

@@ -1,3 +1,24 @@
+=== 2.12.3 / 2015-08-03
+
+* 8 minor bugs fixed:
+  * Fix Capistrano 'uninitialized constant Puma' error.
+  * Fix some ancient and incorrect error handling code
+  * Fix uninitialized constant error
+  * Remove toplevel rack interspection, require rack on load instead
+  * Skip empty parts when chunking
+  * Switch from inject to each in config_ru_binds iteration
+  * Wrap SSLv3 spec in version guard.
+  * ruby 1.8.7 compatibility patches
+
+* 4 PRs merged:
+  * Merge pull request #742 from deivid-rodriguez/fix_missing_require
+  * Merge pull request #743 from matthewd/skip-empty-chunks
+  * Merge pull request #749 from huacnlee/fix-cap-uninitialized-puma-error
+  * Merge pull request #751 from costi/compat_1_8_7
+
+* 1 test fix:
+  * Add 1.8.7, rbx-1 (allow failures) to Travis.
+
 === 2.12.2 / 2015-07-17
 
 * 2 bug fix:

data/lib/puma/capistrano.rb

@@ -82,6 +82,7 @@ Capistrano::Configuration.instance.load do
   end
 
   def configuration
+    require 'puma'
     require 'puma/configuration'
 
     config = Puma::Configuration.new(:config_file => config_file)

data/lib/puma/configuration.rb

@@ -104,8 +104,9 @@ module Puma
       rack_app, rack_options = Puma::Rack::Builder.parse_file(rackup)
       @options.merge!(rack_options)
 
-      config_ru_binds = rack_options.each_with_object([]) do |(k, v), b|
-        b << v if k.to_s.start_with?("bind")
+      config_ru_binds = []
+      rack_options.each do |k, v|
+        config_ru_binds << v if k.to_s.start_with?("bind")
       end
       @options[:binds] = config_ru_binds unless config_ru_binds.empty?
 

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.12.2".freeze
+    PUMA_VERSION = VERSION = "2.12.3".freeze
     CODE_NAME = "Plutonian Photo Shoot".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/rack/builder.rb

@@ -1,16 +1,3 @@
-module PumaRackCompat
-  BINDING = binding
-
-  def self.const_missing(cm)
-    if cm == :Rack
-      require 'rack'
-      Rack
-    else
-      raise NameError, "constant undefined: #{cm}"
-    end
-  end
-end
-
 module Puma::Rack
   class Options
     def parse!(args)
@@ -181,11 +168,19 @@ module Puma::Rack
 
     def self.new_from_string(builder_script, file="(rackup)")
       eval "Puma::Rack::Builder.new {\n" + builder_script + "\n}.to_app",
-        PumaRackCompat::BINDING, file, 0
+        TOPLEVEL_BINDING, file, 0
     end
 
     def initialize(default_app = nil,&block)
       @use, @map, @run, @warmup = [], nil, default_app, nil
+
+      # Conditionally load rack now, so that any rack middlewares,
+      # etc are available.
+      begin
+        require 'rack'
+      rescue LoadError
+      end
+
       instance_eval(&block) if block_given?
     end
 

data/lib/puma/reactor.rb

@@ -1,4 +1,5 @@
 require 'puma/util'
+require 'puma/minissl'
 
 module Puma
   class Reactor

data/lib/puma/server.rb

@@ -189,12 +189,13 @@ module Puma
                     pool << client
                   end
                 rescue SystemCallError
+                  # nothing
+                rescue Errno::ECONNABORTED
+                  # client closed the socket even before accept
+                  io.close rescue nil
                 end
               end
             end
-          rescue Errno::ECONNABORTED
-            # client closed the socket even before accept
-            client.close rescue nil
           rescue Object => e
             @events.unknown_error self, e, "Listen loop"
           end
@@ -320,12 +321,13 @@ module Puma
                     pool.wait_until_not_full unless queue_requests
                   end
                 rescue SystemCallError
+                  # nothing
+                rescue Errno::ECONNABORTED
+                  # client closed the socket even before accept
+                  io.close rescue nil
                 end
               end
             end
-          rescue Errno::ECONNABORTED
-            # client closed the socket even before accept
-            client.close rescue nil
           rescue Object => e
             @events.unknown_error self, e, "Listen loop"
           end
@@ -663,6 +665,7 @@ module Puma
         begin
           res_body.each do |part|
             if chunked
+              next if part.bytesize.zero?
               fast_write client, part.bytesize.to_s(16)
               fast_write client, line_ending
               fast_write client, part

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.12.3
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc