thin 1.6.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a52ecc8925833038f1f9b6ac7b421032e9524d79
-  data.tar.gz: 5270eac2bbf836f0574704b908c7db468e05d977
+SHA256:
+  metadata.gz: 285d7efc73ff2e6e29a8789706c605cc2a2b5a1d25313a53d72954dd5a8adbe7
+  data.tar.gz: 24642b42692477ba60cb63cb0ffa49dcf63cc0634708a349d8fac94d08989b74
 SHA512:
-  metadata.gz: 992772f4b87b8086f5a99323cefd7ec748b89148d58f2758c9e911b84f1bc72f5c8181460145f92660ba0def62d2c8fcb4a9d4aca7aa32eae98805ea316ec654
-  data.tar.gz: 1617c532da78f8a0173e933dee24c03ac521cdbd41ef79e83fc2543a993dbccc1bd528638c0fac3668996cc1939c9e233f75f5fda78240460333cdabb23be2b1
+  metadata.gz: ab7de3338f8d8694ed44a04cf785e78a0ce85de874d7bde4d96c6801b1e85190a3cbd33d8fe16a32aedc09eab9f1caad4a37ce51dc5997c32b5550da6d2fcffc
+  data.tar.gz: 19c45bc3a6f403daffe6a6c66b89bca01c597edb5b8c6ada110834c52fac0f639746f9b51ce5a3ca42c8f2fa013c929929b64b3737819ce83e5dff257e8a328a

data/CHANGELOG

@@ -1,3 +1,25 @@
+== 1.7.2 Bachmanity
+ * Add config support for ssl_version and ssl_cipher_list [frameworked]
+
+== 1.7.1 Muffin Mode
+ * Ruby 2.4 support (Fixnum deprecation) [nimish-mehta]
+ * Allow ERB templates in config files [markets]
+
+== 1.7.0 Dunder Mifflin
+ * Rack 2 support
+ * Ensure Response body.close is called in the same thread
+   Fixes issues with ActiveRecord connection management [#307]
+ * Fix TCP/IP Backend reports incorrect port when asked to bind to 0 [meschbach]
+ * Work with ruby 2.3's --enable-frozen-string-literal [jeremyevans]
+
+== 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/README.md

@@ -1,35 +1,17 @@
-Thin
-====
+# Thin
 
-Tiny, fast & funny HTTP server
-
-Thin is a Ruby web server that glues together 3 of the best Ruby libraries in web history:
-
-  * The Mongrel parser: the root of Mongrel speed and security
-  * Event Machine: a network I/O library with extremely high scalability, performance and stability
-  * Rack: a minimal interface between webservers and Ruby frameworks
-
-Which makes it, with all humility, the most secure, stable, fast and extensible Ruby web server
-bundled in an easy to use gem for your own pleasure.
-
-    Site:  http://code.macournoyer.com/thin/
-    Group: http://groups.google.com/group/thin-ruby/topics
-    Bugs:  http://github.com/macournoyer/thin/issues
-    Code:  http://github.com/macournoyer/thin
-    IRC:   #thin on freenode
+A small and fast Ruby web server
 
 ## Installation
 
-For the latest stable version:
-
-`gem install thin`
+```
+gem install thin
+```
 
-Or from source:
+Or add `thin` to your `Gemfile`:
 
-```
-git clone git://github.com/macournoyer/thin.git
-cd thin
-rake install
+```ruby
+gem 'thin'
 ```
 
 ## Usage
@@ -37,18 +19,30 @@ rake install
 A +thin+ script offers an easy way to start your Rack application:
 
 ```
-cd to/your/app
 thin start
 ```
 
-When using with Rails and Bundler, make sure to add `gem 'thin'`
-to your Gemfile.
+Browse the `example` directory for sample applications.
+
+## Usage with Rails Action Cable
+
+To use Thin with Action Cable, add the following to your `Gemfile`:
+
+```ruby
+gem 'faye-websocket'
+gem 'thin' # If not already done
+```
+
+Create a `config/initializers/thin_action_cable.rb`:
 
-See example directory for samples.
+```ruby
+Rails.application.config.action_cable.use_faye = true
+Faye::WebSocket.load_adapter 'thin'
+```
 
-### Command Line Examples
+### CLI
 
-Use a rackup file and bind to localhost port 8080:
+Use a rackup (config.ru) file and bind to localhost port 8080:
 
 ```
 thin -R config.ru -a 127.0.0.1 -p 8080 start
@@ -60,11 +54,15 @@ Store the server process ID, log to a file and daemonize:
 thin -p 9292 -P tmp/pids/thin.pid -l logs/thin.log -d start
 ```
 
-Thin is quite flexible in that many options can be specified at the command line (see below for usage).
+Thin is quite flexible in that many options can be specified at the command line (see `thin -h` for more).
 
 ### Configuration files
 
-You can create configuration files in yaml format and feed them to thin using `thin -C config.yml`.  Here is an example config file:
+You can create a configuration file using `thin config -C config/thin.yml`.
+
+You can then use it with all commands, such as: `thin start -C config/thin.yml`.
+
+Here is an example config file:
 
 ```yaml
 --- 
@@ -87,79 +85,13 @@ chdir: /path/to/your/apps/root
 tag: a-name-to-show-up-in-ps aux
 ```
 
-### Command Line Options
-
-This is the usage for the thin command which can be obtained by running `thin -h` at the command line.
-
-```sh
-Usage: thin [options] start|stop|restart|config|install
-
-Server options:
-    -a, --address HOST               bind to HOST address (default: 0.0.0.0)
-    -p, --port PORT                  use PORT (default: 3000)
-    -S, --socket FILE                bind to unix domain socket
-    -y, --swiftiply [KEY]            Run using swiftiply
-    -A, --adapter NAME               Rack adapter to use (default: autodetect)
-                                     (rack, rails, ramaze, merb, file)
-    -R, --rackup FILE                Load a Rack config file instead of Rack adapter
-    -c, --chdir DIR                  Change to dir before starting
-        --stats PATH                 Mount the Stats adapter under PATH
-
-SSL options:
-        --ssl                        Enables SSL
-        --ssl-key-file PATH          Path to private key
-        --ssl-cert-file PATH         Path to certificate
-        --ssl-disable-verify         Disables (optional) client cert requests
-
-Adapter options:
-    -e, --environment ENV            Framework environment (default: development)
-        --prefix PATH                Mount the app under PATH (start with /)
-
-Daemon options:
-    -d, --daemonize                  Run daemonized in the background
-    -l, --log FILE                   File to redirect output (default: /home/robert/log/thin.log)
-    -P, --pid FILE                   File to store PID (default: tmp/pids/thin.pid)
-    -u, --user NAME                  User to run daemon as (use with -g)
-    -g, --group NAME                 Group to run daemon as (use with -u)
-        --tag NAME                   Additional text to display in process listing
-
-Cluster options:
-    -s, --servers NUM                Number of servers to start
-    -o, --only NUM                   Send command to only one server of the cluster
-    -C, --config FILE                Load options from config file
-        --all [DIR]                  Send command to each config files in DIR
-    -O, --onebyone                   Restart the cluster one by one (only works with restart command)
-    -w, --wait NUM                   Maximum wait time for server to be started in seconds (use with -O)
-
-Tuning options:
-    -b, --backend CLASS              Backend to use, full classname
-    -t, --timeout SEC                Request or command timeout in sec (default: 30)
-    -f, --force                      Force the execution of the command
-        --max-conns NUM              Maximum number of open file descriptors (default: 1024)
-                                     Might require sudo to set higher than 1024
-        --max-persistent-conns NUM   Maximum number of persistent connections
-                                     (default: 100)
-        --threaded                   Call the Rack application in threads [experimental]
-        --threadpool-size NUM        Sets the size of the EventMachine threadpool.
-                                     (default: 20)
-        --no-epoll                   Disable the use of epoll
-
-Common options:
-    -r, --require FILE               require the library
-    -q, --quiet                      Silence all logging
-    -D, --debug                      Enable debug logging
-    -V, --trace                      Set tracing on (log raw request/response)
-    -h, --help                       Show this message
-    -v, --version                    Show version
-```
-
 ## License
 
 Ruby License, http://www.ruby-lang.org/en/LICENSE.txt.
 
 ## Credits
 
-The parser was stolen from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
+The parser was originally from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed under
 the Ruby license and the GPL2.
 
@@ -167,4 +99,4 @@ Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com>
 
 Get help at http://groups.google.com/group/thin-ruby/
 Report bugs at https://github.com/macournoyer/thin/issues
-and major security issues directly to me macournoyer@gmail.com.
+and major security issues directly to me at macournoyer@gmail.com.

data/ext/thin_parser/parser.c

@@ -1437,11 +1437,6 @@ int thin_http_parser_is_finished(http_parser *parser) {
 
 int thin_http_parser_finish(http_parser *parser)
 {
-  int cs = parser->cs;
-
-
-  parser->cs = cs;
-
   if (thin_http_parser_has_error(parser) ) {
     return -1;
   } else if (thin_http_parser_is_finished(parser) ) {

data/ext/thin_parser/parser.h

@@ -38,11 +38,11 @@ typedef struct http_parser {
   
 } http_parser;
 
-int http_parser_init(http_parser *parser);
-int http_parser_finish(http_parser *parser);
-size_t http_parser_execute(http_parser *parser, const char *data, size_t len, size_t off);
-int http_parser_has_error(http_parser *parser);
-int http_parser_is_finished(http_parser *parser);
+int thin_http_parser_init(http_parser *parser);
+int thin_http_parser_finish(http_parser *parser);
+size_t thin_http_parser_execute(http_parser *parser, const char *data, size_t len, size_t off);
+int thin_http_parser_has_error(http_parser *parser);
+int thin_http_parser_is_finished(http_parser *parser);
 
 #define http_parser_nread(parser) (parser)->nread 
 

data/ext/thin_parser/parser.rl

@@ -142,11 +142,6 @@ int thin_http_parser_is_finished(http_parser *parser) {
 
 int thin_http_parser_finish(http_parser *parser)
 {
-  int cs = parser->cs;
-
-
-  parser->cs = cs;
-
   if (thin_http_parser_has_error(parser) ) {
     return -1;
   } else if (thin_http_parser_is_finished(parser) ) {

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/rack/handler/thin.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "thin"
+require "thin/server"
+require "thin/logging"
+require "thin/backends/tcp_server"
+
+module Rack
+  module Handler
+    class Thin
+      def self.run(app, **options)
+        environment  = ENV['RACK_ENV'] || 'development'
+        default_host = environment == 'development' ? 'localhost' : '0.0.0.0'
+
+        host = options.delete(:Host) || default_host
+        port = options.delete(:Port) || 8080
+        args = [host, port, app, options]
+
+        server = ::Thin::Server.new(*args)
+        yield server if block_given?
+
+        server.start
+      end
+
+      def self.valid_options
+        environment  = ENV['RACK_ENV'] || 'development'
+        default_host = environment == 'development' ? 'localhost' : '0.0.0.0'
+
+        {
+          "Host=HOST" => "Hostname to listen on (default: #{default_host})",
+          "Port=PORT" => "Port to listen on (default: 8080)",
+        }
+      end
+    end
+
+    register :thin, ::Rack::Handler::Thin
+  end
+end

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
@@ -51,9 +51,11 @@ module Thin
         @maximum_connections            = Server::DEFAULT_MAXIMUM_CONNECTIONS
         @maximum_persistent_connections = Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
         @no_epoll                       = false
+        @running                        = false
         @ssl                            = nil
-        @threaded                       = nil
         @started_reactor                = false
+        @stopping                       = false
+        @threaded                       = nil
       end
       
       # Start the backend and connect it.

data/lib/thin/backends/tcp_server.rb

@@ -4,26 +4,31 @@ module Thin
     class TcpServer < Base
       # Address and port on which the server is listening for connections.
       attr_accessor :host, :port
-      
+
       def initialize(host, port)
         @host = host
         @port = port
         super()
       end
-      
+
       # Connect the server
       def connect
         @signature = EventMachine.start_server(@host, @port, Connection, &method(:initialize_connection))
+        binary_name = EventMachine.get_sockname( @signature )
+        port_name = Socket.unpack_sockaddr_in( binary_name )
+        @port = port_name[0]
+        @host = port_name[1]
+        @signature
       end
-      
+
       # Stops the server
       def disconnect
         EventMachine.stop_server(@signature)
       end
-            
+
       def to_s
         "#{@host}:#{@port}"
       end
     end
   end
-end
+end

data/lib/thin/connection.rb

@@ -47,7 +47,7 @@ module Thin
     def process
       if threaded?
         @request.threaded = true
-        EventMachine.defer(method(:pre_process), method(:post_process))
+        EventMachine.defer { post_process(pre_process) }
       else
         @request.threaded = false
         post_process(pre_process)

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_disable_verify] }
+          server.ssl_options = { :private_key_file => @options[:ssl_key_file], :cert_chain_file => @options[:ssl_cert_file], :verify_peer => !@options[:ssl_disable_verify], :ssl_version => @options[:ssl_version], :cipher_list => @options[:ssl_cipher_list]}
         end
 
         # Detach the process, after this line the current process returns

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

@@ -30,11 +30,17 @@ module Thin
     def self.included(base)
       base.extend ClassMethods
     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
-    
+
+    def kill(timeout = 60)
+      if File.exist?(@pid_file)
+        self.class.kill(@pid_file, timeout)
+      end
+    end
+
     # Turns the current script into a daemon process that detaches from the console.
     def daemonize
       raise PlatformNotSupported, 'Daemonizing is not supported on Windows'     if Thin.win?
@@ -78,6 +84,10 @@ module Thin
         Process.initgroups(user, target_gid)
         Process::GID.change_privilege(target_gid)
         Process::UID.change_privilege(target_uid)
+
+        # Correct environment variables
+        ENV.store('USER', user)
+        ENV.store('HOME', File.expand_path("~#{user}"))
       end
     rescue Errno::EPERM => e
       log_info "Couldn't change user and group to #{user}:#{group}: #{e}"
@@ -95,7 +105,7 @@ module Thin
         stop
         remove_pid_file
         @on_restart.call
-        exit!
+        EM.next_tick { exit! }
       end
     end
     
@@ -116,14 +126,23 @@ module Thin
       def restart(pid_file)
         send_signal('HUP', pid_file)
       end
-      
+
+      def monotonic_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
       # Send a +signal+ to the process which PID is stored in +pid_file+.
       def send_signal(signal, pid_file, timeout=60)
         if pid = read_pid_file(pid_file)
           Logging.log_info "Sending #{signal} signal to process #{pid} ... "
+
           Process.kill(signal, pid)
-          Timeout.timeout(timeout) do
-            sleep 0.1 while Process.running?(pid)
+
+          # This loop seems kind of racy to me...
+          started_at = monotonic_time
+          while Process.running?(pid)
+            sleep 0.1
+            raise Timeout::Error if (monotonic_time - started_at) > timeout
           end
         else
           raise PidFileNotFound, "Can't stop process, no PID found in #{pid_file}"

data/lib/thin/logging.rb

@@ -13,10 +13,12 @@ module Thin
     # Taken from ActiveSupport
     class SimpleFormatter < Logger::Formatter
       def call(severity, timestamp, progname, msg)
-        "#{String === msg ? msg : msg.inspect}\n"
+        "#{timestamp} #{String === msg ? msg : msg.inspect}\n"
       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

@@ -13,9 +13,9 @@ module Thin
     BODY_TMPFILE      = 'thin-body'.freeze
     MAX_HEADER        = 1024 * (80 + 32)
 
-    INITIAL_BODY      = ''
+    INITIAL_BODY      = String.new
     # 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
@@ -52,7 +52,7 @@ module Thin
 
     def initialize
       @parser   = Thin::HttpParser.new
-      @data     = ''
+      @data     = String.new
       @nparsed  = 0
       @body     = StringIO.new(INITIAL_BODY.dup)
       @env      = {
@@ -75,7 +75,9 @@ module Thin
     # Raises an +InvalidRequest+ if invalid.
     # Returns +true+ if the parsing is complete.
     def parse(data)
-      if @parser.finished?  # Header finished, can only be some more body
+      if data.size > 0 && finished? # headers and body already fully satisfied. more data is erroneous.
+        raise InvalidRequest, 'Content longer than specified'
+      elsif @parser.finished?  # Header finished, can only be some more body
         @body << data
       else                  # Parse more header using the super parser
         @data << data

data/lib/thin/runner.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'optparse'
 require 'yaml'
+require 'erb'
 
 module Thin
   # CLI runner.
@@ -80,6 +81,8 @@ module Thin
         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-disable-verify", "Disables (optional) client cert requests") { @options[:ssl_disable_verify] = true }
+        opts.on(      "--ssl-version VERSION", "TLSv1, TLSv1_1, TLSv1_2")               { |version| @options[:ssl_version] = version }
+        opts.on(      "--ssl-cipher-list STRING", "Example: HIGH:!ADH:!RC4:-MEDIUM:-LOW:-EXP:-CAMELLIA") { |cipher| @options[:ssl_cipher_list] = cipher }
 
         opts.separator ""
         opts.separator "Adapter options:"
@@ -219,7 +222,7 @@ module Thin
     private
       def load_options_from_config_file!
         if file = @options.delete(:config)
-          YAML.load_file(file).each { |key, value| @options[key.to_sym] = value }
+          YAML.load(ERB.new(File.read(file)).result).each { |key, value| @options[key.to_sym] = value }
         end
       end
 

data/lib/thin/server.rb

@@ -1,10 +1,10 @@
 module Thin
-  # The uterly famous Thin HTTP server.
-  # It listen for incoming request through a given +backend+
-  # and forward all request to +app+.
+  # The utterly famous Thin HTTP server.
+  # It listens for incoming requests through a given +backend+
+  # and forwards all requests to +app+.
   #
   # == TCP server
-  # Create a new TCP server on bound to <tt>host:port</tt> by specifiying +host+
+  # Create a new TCP server bound to <tt>host:port</tt> by specifiying +host+
   # and +port+ as the first 2 arguments.
   #
   #   Thin::Server.start('0.0.0.0', 3000, app)
@@ -18,12 +18,12 @@ module Thin
   #
   # == Using a custom backend
   # You can implement your own way to connect the server to its client by creating your
-  # own Backend class and pass it as the :backend option.
+  # own Backend class and passing it as the :backend option.
   #
   #   Thin::Server.start('galaxy://faraway', 1345, app, :backend => Thin::Backends::MyFancyBackend)
   #
   # == Rack application (+app+)
-  # All requests will be processed through +app+ that must be a valid Rack adapter.
+  # All requests will be processed through +app+, which must be a valid Rack adapter.
   # A valid Rack adapter (application) must respond to <tt>call(env#Hash)</tt> and
   # return an array of <tt>[status, headers, body]</tt>.
   #
@@ -76,10 +76,10 @@ module Thin
     # Maximum number of file or socket descriptors that the server may open.
     def_delegators :backend, :maximum_connections, :maximum_connections=
     
-    # Maximum number of connection that can be persistent at the same time.
-    # Most browser never close the connection so most of the time they are closed
-    # when the timeout occur. If we don't control the number of persistent connection,
-    # if would be very easy to overflow the server for a DoS attack.
+    # Maximum number of connections that can be persistent at the same time.
+    # Most browsers never close the connection so most of the time they are closed
+    # when the timeout occurs. If we don't control the number of persistent connections,
+    # it would be very easy to overflow the server for a DoS attack.
     def_delegators :backend, :maximum_persistent_connections, :maximum_persistent_connections=
     
     # Allow using threads in the backend.
@@ -104,9 +104,9 @@ module Thin
       # received in any order.
       args.each do |arg|
         case arg
-        when Fixnum, /^\d+$/ then port    = arg.to_i
-        when String          then host    = arg
-        when Hash            then options = arg
+        when 0.class, /^\d+$/ then port    = arg.to_i
+        when String           then host    = arg
+        when Hash             then options = arg
         else
           @app = arg if arg.respond_to?(:call)
         end
@@ -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
@@ -166,7 +166,7 @@ module Thin
     # == Gracefull shutdown
     # Stops the server after processing all current connections.
     # As soon as this method is called, the server stops accepting
-    # new requests and wait for all current connections to finish.
+    # new requests and waits for all current connections to finish.
     # Calling twice is the equivalent of calling <tt>stop!</tt>.
     def stop
       if running?

data/lib/thin/statuses.rb

@@ -33,12 +33,16 @@ module Thin
     413  => 'Request Entity Too Large', 
     414  => 'Request-URI Too Large', 
     415  => 'Unsupported Media Type',
-    422  => 'Unprocessable Entity',   
-    500  => 'Internal Server Error', 
+    422  => 'Unprocessable Entity',
+    428  => 'Precondition Required',
+    429  => 'Too Many Requests',
+    431  => 'Request Header Fields Too Large',
+    500  => 'Internal Server Error',
     501  => 'Not Implemented', 
     502  => 'Bad Gateway', 
     503  => 'Service Unavailable', 
     504  => 'Gateway Time-out', 
-    505  => 'HTTP Version not supported'
+    505  => 'HTTP Version not supported',
+    511  => 'Network Authentication Required'
   }
-end
+end

data/lib/thin/version.rb

@@ -1,22 +1,22 @@
-module Thin  
+module Thin
   # Raised when a feature is not supported on the
   # current platform.
   class PlatformNotSupported < RuntimeError; end
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 6
-    TINY     = 3
+    MINOR    = 8
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Protein Powder".freeze
+    CODENAME = "Possessed Pickle".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end
   
   NAME    = 'thin'.freeze
-  SERVER  = "#{NAME} #{VERSION::STRING} codename #{VERSION::CODENAME}".freeze  
+  SERVER  = "#{NAME} #{VERSION::STRING} codename #{VERSION::CODENAME}".freeze
   
   def self.win?
     RUBY_PLATFORM =~ /mswin|mingw/

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: thin
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,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 +47,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
@@ -58,7 +70,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.9
-description: A thin and fast web server
+description:
 email: macournoyer@gmail.com
 executables:
 - thin
@@ -92,6 +104,7 @@ files:
 - ext/thin_parser/thin.c
 - lib/rack/adapter/loader.rb
 - lib/rack/adapter/rails.rb
+- lib/rack/handler/thin.rb
 - lib/thin.rb
 - lib/thin/backends/base.rb
 - lib/thin/backends/swiftiply_client.rb
@@ -114,12 +127,14 @@ files:
 - lib/thin/stats.rb
 - lib/thin/statuses.rb
 - lib/thin/version.rb
-homepage: http://code.macournoyer.com/thin/
+homepage: https://github.com/macournoyer/thin
 licenses:
-- GPLv2+
-- Ruby 1.8
-metadata: {}
-post_install_message: 
+- GPL-2.0+
+- Ruby
+metadata:
+  source_code_uri: https://github.com/macournoyer/thin
+  changelog_uri: https://github.com/macournoyer/thin/blob/master/CHANGELOG
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: thin
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A thin and fast web server
 test_files: []