thin 1.4.1 → 1.5.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 1.5.0 Knife
+ * Fix compilation under Ubuntu 12.04 with -Werror=format-security option.
+ * Raise an error when no PID file.
+ * Prevent duplicate response headers.
+ * Make proper response on exception [MasterLambaster].
+ * Automatically close idling pipeline connections on server stop [MasterLambaster].
+
 == 1.4.1 Chromeo Fix
  * Fix error when sending USR1 signal and no log file is supplied.
 

data/README.md

@@ -42,28 +42,10 @@ cd to/your/app
 thin start
 ```
 
-But Thin is also usable with a Rack config file.
-You need to setup a config.ru file and pass it to the thin script:
-
-```ruby
-#cat config.ru
-app = proc do |env|
- [
-   200,
-   {
-     'Content-Type' => 'text/html',
-     'Content-Length' => '2'
-   },
-   ['hi']
- ]
-end
-
-run app
-```
-
-` thin start -R config.ru `
+When using with Rails and Bundler, make sure to add `gem 'thin'`
+to your Gemfile.
 
-See example directory for more samples and run 'thin -h' for usage.
+See example directory for samples and run 'thin -h' for usage.
 
 License
 =======
@@ -72,9 +54,8 @@ Ruby License, http://www.ruby-lang.org/en/LICENSE.txt.
 Credits
 =======
 The parser was stolen from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
-Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
-<zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
-either the terms of the GPL.
+Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed under
+the Ruby license and the GPL2.
 
 Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com>
 

data/Rakefile

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

data/ext/thin_parser/thin.c

@@ -47,7 +47,7 @@ static VALUE global_path_info;
 #define DEF_MAX_LENGTH(N,length) const size_t MAX_##N##_LENGTH = length; const char *MAX_##N##_LENGTH_ERR = "HTTP element " # N  " is longer than the " # length " allowed length."
 
 /** Validates the max length of given input and throws an HttpParserError exception if over. */
-#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, MAX_##N##_LENGTH_ERR); }
+#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, "%s", MAX_##N##_LENGTH_ERR); }
 
 /** Defines global strings in the init method. */
 #define DEF_GLOBAL(N, val)   global_##N = rb_obj_freeze(rb_str_new2(val)); rb_global_variable(&global_##N)
@@ -329,7 +329,7 @@ VALUE Thin_HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE star
   dlen = RSTRING_LEN(data);
 
   if(from >= dlen) {
-    rb_raise(eHttpParserError, "Requested start is after data buffer end.");
+    rb_raise(eHttpParserError, "%s", "Requested start is after data buffer end.");
   } else {
     http->data = (void *)req_hash;
     thin_http_parser_execute(http, dptr, dlen, from);
@@ -337,7 +337,7 @@ VALUE Thin_HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE star
     VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
 
     if(thin_http_parser_has_error(http)) {
-      rb_raise(eHttpParserError, "Invalid HTTP format, parsing fails.");
+      rb_raise(eHttpParserError, "%s", "Invalid HTTP format, parsing fails.");
     } else {
       return INT2FIX(http_parser_nread(http));
     }

data/lib/thin/backends/base.rb

@@ -71,6 +71,8 @@ module Thin
         
         # Do not accept anymore connection
         disconnect
+        # Close idle persistent connections
+        @connections.each { |connection| connection.close_connection if connection.idle? }
         stop! if @connections.empty?
       end
       

data/lib/thin/connection.rb

@@ -34,12 +34,13 @@ module Thin
 
     # Called when data is received from the client.
     def receive_data(data)
+      @idle = false
       trace { data }
       process if @request.parse(data)
     rescue InvalidRequest => e
       log "!! Invalid request"
       log_error e
-      close_connection
+      post_process Response::BAD_REQUEST
     end
 
     # Called when all data was received and the request
@@ -82,8 +83,8 @@ module Thin
       response
     rescue Exception
       handle_error
-      terminate_request
-      nil # Signal to post_process that the request could not be processed
+      # Pass through error response
+      can_persist? && @request.persistent? ? Response::PERSISTENT_ERROR : Response::ERROR
     end
 
     def post_process(result)
@@ -108,6 +109,8 @@ module Thin
 
     rescue Exception
       handle_error
+      # Close connection since we can't handle response gracefully
+      close_connection
     ensure
       # If the body is being deferred, then terminate afterward.
       if @response.body.respond_to?(:callback) && @response.body.respond_to?(:errback)
@@ -123,7 +126,6 @@ module Thin
     def handle_error
       log "!! Unexpected error while processing request: #{$!.message}"
       log_error
-      close_connection rescue nil
     end
 
     def close_request_response
@@ -142,6 +144,8 @@ module Thin
         close_request_response
       else
         close_request_response
+        # Connection become idle but it's still open
+        @idle = true
         # Prepare the connection for another request if the client
         # supports HTTP pipelining (persistent connection).
         post_init
@@ -172,6 +176,12 @@ module Thin
       @can_persist && @response.persistent?
     end
 
+    # Return +true+ if the connection is open but is not
+    # processing any user requests
+    def idle?
+      @idle
+    end
+
     # +true+ if <tt>app.call</tt> will be called inside a thread.
     # You can set all requests as threaded setting <tt>Connection#threaded=true</tt>
     # or on a per-request case returning +true+ in <tt>app.deferred?</tt>.

data/lib/thin/daemonizing.rb

@@ -16,6 +16,7 @@ end
 module Thin
   # Raised when the pid file already exist starting as a daemon.
   class PidFileExist < RuntimeError; end
+  class PidFileNotFound < RuntimeError; end
   
   # Module included in classes that can be turned into a daemon.
   # Handle stuff like:
@@ -72,6 +73,9 @@ module Thin
       target_gid = Etc.getgrnam(group).gid
 
       if uid != target_uid || gid != target_gid
+        # Change PID file ownership
+        File.chown(target_uid, target_gid, @pid_file)
+
         # Change process ownership
         Process.initgroups(user, target_gid)
         Process::GID.change_privilege(target_gid)
@@ -124,7 +128,7 @@ module Thin
             sleep 0.1 while Process.running?(pid)
           end
         else
-          Logging.log "Can't stop process, no PID found in #{pid_file}"
+          raise PidFileNotFound, "Can't stop process, no PID found in #{pid_file}"
         end
       rescue Timeout::Error
         Logging.log "Timeout!"

data/lib/thin/headers.rb

@@ -3,7 +3,7 @@ module Thin
   # and allow duplicated entries on some names.
   class Headers
     HEADER_FORMAT      = "%s: %s\r\n".freeze
-    ALLOWED_DUPLICATES = %w(Set-Cookie Set-Cookie2 Warning WWW-Authenticate).freeze
+    ALLOWED_DUPLICATES = %w(set-cookie set-cookie2 warning www-authenticate).freeze
     
     def initialize
       @sent = {}
@@ -14,8 +14,9 @@ module Thin
     # Ignore if already sent and no duplicates are allowed
     # for this +key+.
     def []=(key, value)
-      if !@sent.has_key?(key) || ALLOWED_DUPLICATES.include?(key)
-        @sent[key] = true
+      downcase_key = key.downcase
+      if !@sent.has_key?(downcase_key) || ALLOWED_DUPLICATES.include?(downcase_key)
+        @sent[downcase_key] = true
         value = case value
                 when Time
                   value.httpdate
@@ -29,11 +30,11 @@ module Thin
     end
     
     def has_key?(key)
-      @sent[key]
+      @sent[key.downcase]
     end
     
     def to_s
       @out.join
     end
   end
-end
+end

data/lib/thin/request.rb

@@ -74,7 +74,7 @@ module Thin
     # Returns +true+ if the parsing is complete.
     def parse(data)
       if @parser.finished?  # Header finished, can only be some more body
-        body << data
+        @body << data
       else                  # Parse more header using the super parser
         @data << data
         raise InvalidRequest, 'Header longer than allowed' if @data.size > MAX_HEADER

data/lib/thin/response.rb

@@ -9,6 +9,11 @@ module Thin
 
     PERSISTENT_STATUSES  = [100, 101].freeze
 
+    #Error Responses
+    ERROR            = [500, {'Content-Type' => 'text/plain'}, ['Internal server error']].freeze
+    PERSISTENT_ERROR = [500, {'Content-Type' => 'text/plain', 'Connection' => 'keep-alive', 'Content-Length' => "21"}, ['Internal server error']].freeze
+    BAD_REQUEST      = [400, {'Content-Type' => 'text/plain'}, ['Bad Request']].freeze
+
     # Status code
     attr_accessor :status
 

data/lib/thin/runner.rb

@@ -130,6 +130,7 @@ module Thin
         opts.separator "Common options:"
 
         opts.on_tail("-r", "--require FILE", "require the library")                     { |file| @options[:require] << file }
+        opts.on_tail("-q", "--quiet", "Silence all logging")                            { @options[:quiet] = true }
         opts.on_tail("-D", "--debug", "Set debugging on")                               { @options[:debug] = true }
         opts.on_tail("-V", "--trace", "Set tracing on (log raw request/response)")      { @options[:trace] = true }
         opts.on_tail("-h", "--help", "Show this message")                               { puts opts; exit }
@@ -173,6 +174,7 @@ module Thin
       @options[:require].each { |r| ruby_require r }
       Logging.debug = @options[:debug]
       Logging.trace = @options[:trace]
+      Logging.silent = @options[:quiet]
 
       controller = case
       when cluster? then Controllers::Cluster.new(@options)

data/lib/thin/server.rb

@@ -55,7 +55,7 @@ module Thin
     DEFAULT_HOST                           = '0.0.0.0'
     DEFAULT_PORT                           = 3000
     DEFAULT_MAXIMUM_CONNECTIONS            = 1024
-    DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS = 512
+    DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS = 100
         
     # Application (Rack adapter) called with the request that produces the response.
     attr_accessor :app

data/lib/thin/version.rb

@@ -5,12 +5,12 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 4
-    TINY     = 1
+    MINOR    = 5
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Chromeo".freeze
+    CODENAME = "Knife".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -2,7 +2,7 @@
 name: thin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 -04:00
+date: 2012-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency