thin 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52ecc8925833038f1f9b6ac7b421032e9524d79
-  data.tar.gz: 5270eac2bbf836f0574704b908c7db468e05d977
+  metadata.gz: 59e48abc41d2a88e89281a8902c419f1eecfb5ac
+  data.tar.gz: 2a10974b8d31419469cee3940e9a206f8217f4de
 SHA512:
-  metadata.gz: 992772f4b87b8086f5a99323cefd7ec748b89148d58f2758c9e911b84f1bc72f5c8181460145f92660ba0def62d2c8fcb4a9d4aca7aa32eae98805ea316ec654
-  data.tar.gz: 1617c532da78f8a0173e933dee24c03ac521cdbd41ef79e83fc2543a993dbccc1bd528638c0fac3668996cc1939c9e233f75f5fda78240460333cdabb23be2b1
+  metadata.gz: 19c24955dc648213173e227df391a325c4de88b48d59c37929977b5524e9cdc834717430cfb6b294fa9d0b59f4205776a2918a64db4f3985fe5d5c6ea0b62708
+  data.tar.gz: 98e01afb757f4e7258b73799bee4a83daf05786edf771025da785b354d12be70444aae73f222d9c19859f9574e1a4002b3fbea934e178b841a5dbb8fbd08a8fa

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 1.6.4 Gob Bluth
+ * Increase REQUEST_PATH to 2048 symbols [X2rdas]
+ * Fix warning in logger [tenderlove]
+ * Add :timeout option for Rack::Server.new [sugitak]
+ * When restarting, exit on a next tick so we can send response back to a client [rsamoilov]
+ * Check for empty PID files [z1dane]
+ * Update Event Machine version to 1.0.4, Ruby 2.2.0 fix [freemanoid]
+
+
 == 1.6.3 Protein Powder
  * Add HTTP 422 status code [rajcybage]
  * Add warning about EM reactor still running when stopping.

data/ext/thin_parser/thin.c

@@ -67,7 +67,7 @@ DEF_MAX_LENGTH(FIELD_NAME, 256);
 DEF_MAX_LENGTH(FIELD_VALUE, 80 * 1024);
 DEF_MAX_LENGTH(REQUEST_URI, 1024 * 12);
 DEF_MAX_LENGTH(FRAGMENT, 1024); /* Don't know if this length is specified somewhere or not */
-DEF_MAX_LENGTH(REQUEST_PATH, 1024);
+DEF_MAX_LENGTH(REQUEST_PATH, 2048);
 DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10));
 DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32)));
 

data/lib/thin/backends/base.rb

@@ -3,7 +3,7 @@ module Thin
     # A Backend connects the server to the client. It handles:
     # * connection/disconnection to the server
     # * initialization of the connections
-    # * manitoring of the active connections.
+    # * monitoring of the active connections.
     #
     # == Implementing your own backend
     # You can create your own minimal backend by inheriting this class and

data/lib/thin/controllers/service.rb

@@ -61,6 +61,7 @@ module Thin
       private
         def run(command)
           Dir[config_path + '/*'].each do |config|
+            next if config.end_with?("~")
             log_info "[#{command}] #{config} ..."
             Command.run(command, :config => config, :daemonize => true)
           end

data/lib/thin/daemonizing.rb

@@ -32,7 +32,7 @@ module Thin
     end
     
     def pid
-      File.exist?(pid_file) ? open(pid_file).read.to_i : nil
+      File.exist?(pid_file) && !File.zero?(pid_file) ? open(pid_file).read.to_i : nil
     end
     
     # Turns the current script into a daemon process that detaches from the console.
@@ -95,7 +95,7 @@ module Thin
         stop
         remove_pid_file
         @on_restart.call
-        exit!
+        EM.next_tick { exit! }
       end
     end
     

data/lib/thin/logging.rb

@@ -17,6 +17,8 @@ module Thin
       end
     end
 
+    @trace_logger = nil
+
     class << self
       attr_reader :logger
       attr_reader :trace_logger
@@ -152,7 +154,10 @@ module Thin
 
     # Log a message at ERROR level (and maybe a backtrace)
     def log_error(msg, e=nil)
-      log_msg = msg + ": #{e}\n\t" + e.backtrace.join("\n\t") + "\n" if e
+      log_msg = msg
+      if e
+        log_msg += ": #{e}\n\t" + e.backtrace.join("\n\t") + "\n"
+      end
       Logging.log_msg(log_msg, Logger::ERROR)
     end
     module_function :log_error

data/lib/thin/request.rb

@@ -15,7 +15,7 @@ module Thin
 
     INITIAL_BODY      = ''
     # Force external_encoding of request's body to ASCII_8BIT
-    INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode!)
+    INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode!) && defined?(Encoding::ASCII_8BIT)
 
     # Freeze some HTTP header names & values
     SERVER_SOFTWARE   = 'SERVER_SOFTWARE'.freeze

data/lib/thin/server.rb

@@ -125,7 +125,7 @@ module Thin
       # Set defaults
       @backend.maximum_connections            = DEFAULT_MAXIMUM_CONNECTIONS
       @backend.maximum_persistent_connections = DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
-      @backend.timeout                        = DEFAULT_TIMEOUT
+      @backend.timeout                        = options[:timeout] || DEFAULT_TIMEOUT
       
       # Allow using Rack builder as a block
       @app = Rack::Builder.new(&block).to_app if block

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 6
-    TINY     = 3
+    TINY     = 4
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Protein Powder".freeze
+    CODENAME = "Gob Bluth".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.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement