thin 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b86053bf6306bf5e74447c600d9f21a4367bac0
-  data.tar.gz: 44c44115170e5a9c1631d0801325544c029ed33a
+  metadata.gz: e842069e783c48060e71f494c190904609d5a587
+  data.tar.gz: dbc7a2d780bde4e6420f59432966bf359f6b1dd8
 SHA512:
-  metadata.gz: 8ef281669d02cb8f02435c98ad999237cbafeff621223636add422a3dd563d9b18a60ff189f94f658917c23b0ca50669c02e4d1da824458cfe5439ca21146ed0
-  data.tar.gz: 1d998ca3f97df8f31a41ad9fb1c92e4ee2ba3f2400c5e6052ba8318b3d777aa7d1dac02d71b29f079cb7b8b83b9d1efb232c5a96f11e022b790732b8aaa6c4e3
+  metadata.gz: a95d911c6bfa01811a38e5f383cc7c8b021c04af04770fa7f21c4685e37ddb9425eada286a141ccff47df9e0b91321c338f68f9ae2c3956c17276ce66f43cb67
+  data.tar.gz: 942aa9be0433894ccef664400e1b8aff0a34e03b9fcc449dc1b13f3c4dc1d87034203748694b65bddc616e0beee9624b8c5990c32f79ffa9373b8acd0803a9fa

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 1.6.2 Doc Brown
+ * No longer replace response's body on HEAD request. Ensuring body.close will be called.
+ * Remove `---ssl-verify` option as EventMachine doesn't verify the certificate.
+ * Fix env['rack.peer_cert'] to return SSL certifcate.
+
 == 1.6.1 Death Proof
  * Regression: Default logger to STDOUT when using outside of CLI.
  * Regression: Downgrade Rack required version back to 1.0 to work w/ prior Rails versions.

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake'
+require 'rake/clean'
 load 'thin.gemspec'
 
 # Load tasks in tasks/
@@ -21,4 +22,4 @@ task :install => :build do
 end
 
 desc "Release version #{Thin::VERSION::STRING}"
-task :release => [:tag, :push]
+task :release => [:tag, :push]

data/lib/thin/connection.rb

@@ -10,8 +10,6 @@ module Thin
     # This is a template async response. N.B. Can't use string for body on 1.9
     AsyncResponse = [-1, {}, []].freeze
 
-    EMPTY_BODY = [].freeze
-
     # Rack application (adapter) served by this connection.
     attr_accessor :app
 
@@ -56,6 +54,12 @@ module Thin
       end
     end
 
+    def ssl_verify_peer(cert)
+      # In order to make the cert available later we have to have made at least
+      # a show of verifying it.
+      true
+    end
+
     def pre_process
       # Add client info to the request env
       @request.remote_address = remote_address
@@ -101,7 +105,7 @@ module Thin
                 "Probably you wanted it to be an empty string?") if @response.body.nil?
 
       # HEAD requests should not return a body.
-      @response.body = EMPTY_BODY if @request.head?
+      @response.skip_body! if @request.head?
 
       # Make the response persistent if requested by the client
       @response.persistent! if @request.persistent?

data/lib/thin/controllers/controller.rb

@@ -55,7 +55,7 @@ module Thin
         # ssl support
         if @options[:ssl]
           server.ssl = true
-          server.ssl_options = { :private_key_file => @options[:ssl_key_file], :cert_chain_file => @options[:ssl_cert_file], :verify_peer => @options[:ssl_verify] }
+          server.ssl_options = { :private_key_file => @options[:ssl_key_file], :cert_chain_file => @options[:ssl_cert_file], :verify_peer => true }
         end
 
         # Detach the process, after this line the current process returns

data/lib/thin/response.rb

@@ -27,6 +27,7 @@ module Thin
       @headers    = Headers.new
       @status     = 200
       @persistent = false
+      @skip_body  = false
     end
 
     # String representation of the headers
@@ -87,10 +88,13 @@ module Thin
     # define your own +each+ method on +body+.
     def each
       yield head
-      if @body.is_a?(String)
-        yield @body
-      else
-        @body.each { |chunk| yield chunk }
+
+      unless @skip_body
+        if @body.is_a?(String)
+          yield @body
+        else
+          @body.each { |chunk| yield chunk }
+        end
       end
     end
 
@@ -105,5 +109,9 @@ module Thin
     def persistent?
       (@persistent && @headers.has_key?(CONTENT_LENGTH)) || PERSISTENT_STATUSES.include?(@status)
     end
+
+    def skip_body!
+      @skip_body = true
+    end
   end
 end

data/lib/thin/runner.rb

@@ -79,7 +79,6 @@ module Thin
         opts.on(      "--ssl", "Enables SSL")                                           { @options[:ssl] = true }
         opts.on(      "--ssl-key-file PATH", "Path to private key")                     { |path| @options[:ssl_key_file] = path }
         opts.on(      "--ssl-cert-file PATH", "Path to certificate")                    { |path| @options[:ssl_cert_file] = path }
-        opts.on(      "--ssl-verify", "Enables SSL certificate verification")           { @options[:ssl_verify] = true }
 
         opts.separator ""
         opts.separator "Adapter options:"

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 6
-    TINY     = 1
+    TINY     = 2
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Death Proof".freeze
+    CODENAME = "Doc Brown".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack