thin 0.8.2 → 1.0.0

data/lib/thin/request.rb

@@ -5,7 +5,7 @@ module Thin
   # Raised when an incoming request is not valid
   # and the server can not process it.
   class InvalidRequest < IOError; end
-  
+
   # A request sent by the client to the server.
   class Request
     # Maximum request body size before it is moved out of memory
@@ -13,7 +13,7 @@ module Thin
     MAX_BODY          = 1024 * (80 + 32)
     BODY_TMPFILE      = 'thin-body'.freeze
     MAX_HEADER        = 1024 * (80 + 32)
-    
+
     # Freeze some HTTP header names & values
     SERVER_SOFTWARE   = 'SERVER_SOFTWARE'.freeze
     HTTP_VERSION      = 'HTTP_VERSION'.freeze
@@ -22,9 +22,9 @@ module Thin
     FORWARDED_FOR     = 'HTTP_X_FORWARDED_FOR'.freeze
     CONTENT_LENGTH    = 'CONTENT_LENGTH'.freeze
     CONNECTION        = 'HTTP_CONNECTION'.freeze
-    KEEP_ALIVE_REGEXP = /keep-alive/i
-    NOT_CLOSE_REGEXP  = /[^(close)]/i
-    
+    KEEP_ALIVE_REGEXP = /\bkeep-alive\b/i.freeze
+    CLOSE_REGEXP      = /\bclose\b/i.freeze
+
     # Freeze some Rack header names
     RACK_INPUT        = 'rack.input'.freeze
     RACK_VERSION      = 'rack.version'.freeze
@@ -32,16 +32,16 @@ module Thin
     RACK_MULTITHREAD  = 'rack.multithread'.freeze
     RACK_MULTIPROCESS = 'rack.multiprocess'.freeze
     RACK_RUN_ONCE     = 'rack.run_once'.freeze
-    
+
     # CGI-like request environment variables
     attr_reader :env
-    
+
     # Unparsed data of the request
     attr_reader :data
-    
+
     # Request body
     attr_reader :body
-    
+
     def initialize
       @parser   = HttpParser.new
       @data     = ''
@@ -49,36 +49,36 @@ module Thin
       @body     = StringIO.new
       @env      = {
         SERVER_SOFTWARE   => SERVER,
-        
+
         # Rack stuff
         RACK_INPUT        => @body,
-        
+
         RACK_VERSION      => VERSION::RACK,
         RACK_ERRORS       => STDERR,
-        
+
         RACK_MULTITHREAD  => false,
         RACK_MULTIPROCESS => false,
         RACK_RUN_ONCE     => false
       }
     end
-        
+
     # Parse a chunk of data into the request environment
     # Raises a +InvalidRequest+ if invalid.
     # 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 
-        
+        raise InvalidRequest, 'Header longer than allowed' if @data.size > MAX_HEADER
+
         @nparsed = @parser.execute(@env, @data, @nparsed)
 
         # Transfert to a tempfile if body is very big
         move_body_to_tempfile if @parser.finished? && content_length > MAX_BODY
       end
-      
-      
+
+
       if finished?   # Check if header and body are complete
         @data = nil
         @body.rewind
@@ -87,17 +87,17 @@ module Thin
         false        # Not finished, need more data
       end
     end
-    
+
     # +true+ if headers and body are finished parsing
     def finished?
       @parser.finished? && @body.size >= content_length
     end
-    
+
     # Expected size of the body
     def content_length
       @env[CONTENT_LENGTH].to_i
     end
-    
+
     # Returns +true+ if the client expect the connection to be persistent.
     def persistent?
       # Clients and servers SHOULD NOT assume that a persistent connection
@@ -105,32 +105,32 @@ module Thin
       # signaled. (http://www.w3.org/Protocols/rfc2616/rfc2616-sec8.html)
       if @env[HTTP_VERSION] == HTTP_1_0
         @env[CONNECTION] =~ KEEP_ALIVE_REGEXP
-      
+
       # HTTP/1.1 client intends to maintain a persistent connection unless
       # a Connection header including the connection-token "close" was sent
       # in the request
       else
-        @env[CONNECTION].nil? || @env[CONNECTION] =~ NOT_CLOSE_REGEXP
+        @env[CONNECTION].nil? || @env[CONNECTION] !~ CLOSE_REGEXP
       end
     end
-    
+
     def remote_address=(address)
       @env[REMOTE_ADDR] = address
     end
-    
+
     def forwarded_for
       @env[FORWARDED_FOR]
     end
-    
+
     def threaded=(value)
       @env[RACK_MULTITHREAD] = value
     end
-    
+
     # Close any resource used by the request
     def close
       @body.delete if @body.class == Tempfile
-    end    
-    
+    end
+
     private
       def move_body_to_tempfile
         current_body = @body
@@ -138,7 +138,7 @@ module Thin
         @body = Tempfile.new(BODY_TMPFILE)
         @body.binmode
         @body << current_body.read
-        @env[RACK_INPUT] = @body        
+        @env[RACK_INPUT] = @body
       end
-  end  
-end
+  end
+end

data/lib/thin/response.rb

@@ -6,46 +6,48 @@ module Thin
     KEEP_ALIVE     = 'keep-alive'.freeze
     SERVER         = 'Server'.freeze
     CONTENT_LENGTH = 'Content-Length'.freeze
-    
+
     # Status code
     attr_accessor :status
-    
+
     # Response body, must respond to +each+.
     attr_accessor :body
-    
+
     # Headers key-value hash
     attr_reader   :headers
-    
+
     def initialize
       @headers    = Headers.new
       @status     = 200
       @persistent = false
     end
-    
+
     # String representation of the headers
     # to be sent in the response.
     def headers_output
       # Set default headers
       @headers[CONNECTION] = persistent? ? KEEP_ALIVE : CLOSE
       @headers[SERVER]     = Thin::SERVER
-      
+
       @headers.to_s
     end
-        
+
     # Top header of the response,
     # containing the status code and response headers.
     def head
       "HTTP/1.1 #{@status} #{HTTP_STATUS_CODES[@status.to_i]}\r\n#{headers_output}\r\n"
     end
-    
+
     if Thin.ruby_18?
-      
+
       # Ruby 1.8 implementation.
       # Respects Rack specs.
+      #
+      # See http://rack.rubyforge.org/doc/files/SPEC.html
       def headers=(key_value_pairs)
         key_value_pairs.each do |k, vs|
-          vs.each { |v| @headers[k] = v.chomp }
-        end
+          vs.each { |v| @headers[k] = v.chomp } if vs
+        end if key_value_pairs
       end
 
     else
@@ -57,21 +59,22 @@ module Thin
       # To be reviewed when a new Rack spec comes out.
       def headers=(key_value_pairs)
         key_value_pairs.each do |k, vs|
+          next unless vs
           if vs.is_a?(String)
             vs.each_line { |v| @headers[k] = v.chomp }
           else
             vs.each { |v| @headers[k] = v.chomp }
           end
-        end
-      end      
+        end if key_value_pairs
+      end
 
     end
-    
+
     # Close any resource used by the response
     def close
       @body.close if @body.respond_to?(:close)
     end
-    
+
     # Yields each chunk of the response.
     # To control the size of each chunk
     # define your own +each+ method on +body+.
@@ -81,16 +84,16 @@ module Thin
         yield chunk
       end
     end
-    
+
     # Tell the client the connection should stay open
     def persistent!
       @persistent = true
     end
-    
+
     # Persistent connection must be requested as keep-alive
     # from the server and have a Content-Length.
     def persistent?
       @persistent && @headers.has_key?(CONTENT_LENGTH)
-    end    
+    end
   end
-end
+end

data/lib/thin/runner.rb

@@ -40,7 +40,8 @@ module Thin
         :log                  => 'log/thin.log',
         :pid                  => 'tmp/pids/thin.pid',
         :max_conns            => Server::DEFAULT_MAXIMUM_CONNECTIONS,
-        :max_persistent_conns => Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
+        :max_persistent_conns => Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS,
+        :require              => []
       }
       
       parse!
@@ -63,7 +64,7 @@ module Thin
         opts.on("-S", "--socket FILE", "bind to unix domain socket")                    { |file| @options[:socket] = file }
         opts.on("-y", "--swiftiply [KEY]", "Run using swiftiply")                       { |key| @options[:swiftiply] = key }
         opts.on("-A", "--adapter NAME", "Rack adapter to use (default: autodetect)",
-                                        "(#{Rack::ADAPTERS.keys.join(', ')})")          { |name| @options[:adapter] = name }
+                                        "(#{Rack::ADAPTERS.map{|(a,b)|a}.join(', ')})") { |name| @options[:adapter] = name }
         opts.on("-R", "--rackup FILE", "Load a Rack config file instead of " +
                                        "Rack adapter")                                  { |file| @options[:rackup] = file }
         opts.on("-c", "--chdir DIR", "Change to dir before starting")                   { |dir| @options[:chdir] = File.expand_path(dir) }
@@ -102,6 +103,7 @@ module Thin
         opts.on("-b", "--backend CLASS", "Backend to use, full classname")              { |name| @options[:backend] = name }
         opts.on("-t", "--timeout SEC", "Request or command timeout in sec " +            
                                        "(default: #{@options[:timeout]})")              { |sec| @options[:timeout] = sec.to_i }
+        opts.on("-f", "--force", "Force the execution of the command")                  { @options[:force] = true }
         opts.on(      "--max-conns NUM", "Maximum number of connections " +
                                          "(default: #{@options[:max_conns]})",
                                          "Might require sudo to set higher then 1024")  { |num| @options[:max_conns] = num.to_i } unless Thin.win?
@@ -110,13 +112,14 @@ module Thin
                                        "(default: #{@options[:max_persistent_conns]})") { |num| @options[:max_persistent_conns] = num.to_i }
         opts.on(      "--threaded", "Call the Rack application in threads " +
                                     "[experimental]")                                   { @options[:threaded] = true }
+        opts.on(      "--no-epoll", "Disable the use of epoll")                         { @options[:no_epoll] = true } if Thin.linux?
         
         opts.separator ""
         opts.separator "Common options:"
 
-        opts.on_tail("-r", "--require FILE", "require the library")                     { |file| ruby_require file }
-        opts.on_tail("-D", "--debug", "Set debbuging on")                               { Logging.debug = true }
-        opts.on_tail("-V", "--trace", "Set tracing on (log raw request/response)")      { Logging.trace = true }
+        opts.on_tail("-r", "--require FILE", "require the library")                     { |file| @options[:require] << file }
+        opts.on_tail("-D", "--debug", "Set debbuging 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 }
         opts.on_tail('-v', '--version', "Show version")                                 { puts Thin::SERVER; exit }
       end
@@ -139,7 +142,7 @@ module Thin
         puts @parser
         exit 1  
       else
-        abort "Invalid command: #{@command}"
+        abort "Unknown command: #{@command}. Use one of #{self.class.commands.join(', ')}"
       end
     end
     
@@ -155,6 +158,10 @@ module Thin
       # relative to this one.
       Dir.chdir(@options[:chdir]) unless CONFIGLESS_COMMANDS.include?(@command)
       
+      @options[:require].each { |r| ruby_require r }
+      Logging.debug = @options[:debug]
+      Logging.trace = @options[:trace]
+      
       controller = case
       when cluster? then Controllers::Cluster.new(@options)
       when service? then Controllers::Service.new(@options)
@@ -198,4 +205,4 @@ module Thin
         end
       end
   end
-end
+end

data/lib/thin/server.rb

@@ -85,9 +85,14 @@ module Thin
     # UNIX domain socket on which the server is listening for connections.
     def_delegator :backend, :socket
     
+    # Disable the use of epoll under Linux
+    def_delegators :backend, :no_epoll, :no_epoll=
+    
     def initialize(*args, &block)
       host, port, options = DEFAULT_HOST, DEFAULT_PORT, {}
       
+      # Guess each parameter by its type so they can be
+      # received in any order.
       args.each do |arg|
         case arg
         when Fixnum, /^\d+$/ then port    = arg.to_i
@@ -102,7 +107,7 @@ module Thin
       @backend = select_backend(host, port, options)
       
       load_cgi_multipart_eof_fix
-
+      
       @backend.server = self
       
       # Set defaults
@@ -139,7 +144,6 @@ module Thin
       debug ">> Debugging ON"
       trace ">> Tracing ON"
       
-      log ">> Threaded mode #{@backend.threaded? ? 'ON' : 'OFF'}"
       log ">> Maximum connections set to #{@backend.maximum_connections}"
       log ">> Listening on #{@backend}, CTRL+C to stop"
       

data/lib/thin/stats.rb

@@ -43,10 +43,7 @@ module Thin
         
         [
           200,
-          {
-            'Content-Type' => 'text/html',
-            'Content-Length' => body.size.to_s
-          },
+          { 'Content-Type' => 'text/html' },
           [body]
         ]
       end

data/lib/thin/version.rb

@@ -4,13 +4,13 @@ module Thin
   class PlatformNotSupported < RuntimeError; end
   
   module VERSION #:nodoc:
-    MAJOR    = 0
-    MINOR    = 8
-    TINY     = 2
+    MAJOR    = 1
+    MINOR    = 0
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Double Margarita'
+    CODENAME = "That's What She Said".freeze
     
     RACK     = [0, 3].freeze # Latest Rack version that was tested
   end

data/lib/thin.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'fileutils'
 require 'timeout'
 require 'stringio'
+require 'time'
 
 require 'rubygems'
 require 'eventmachine'

data/spec/backends/tcp_server_spec.rb

@@ -5,6 +5,17 @@ describe Backends::TcpServer do
     @backend = Backends::TcpServer.new('0.0.0.0', 3333)
   end
   
+  it "should not use epoll" do
+    @backend.no_epoll = true
+    EventMachine.should_not_receive(:epoll)
+    @backend.config
+  end
+  
+  it "should use epoll" do
+    EventMachine.should_receive(:epoll)
+    @backend.config
+  end
+  
   it "should connect" do
     EventMachine.run do
       @backend.connect

data/spec/command_spec.rb

@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Command do
   before do
     Command.script = 'thin'
-    @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log')
+    @command = Command.new(:start, :port => 3000, :daemonize => true, :log => 'hi.log',
+                           :require => %w(rubygems thin))
   end
   
   it 'should shellify command' do
@@ -11,4 +12,9 @@ describe Command do
     out.should include('--port=3000', '--daemonize', '--log="hi.log"', 'thin start --')
     out.should_not include('--pid')
   end
+  
+  it 'should shellify Array argument to multiple parameters' do
+    out = @command.shellify
+    out.should include('--require="rubygems"', '--require="thin"')
+  end
 end

data/spec/daemonizing_spec.rb

@@ -94,6 +94,23 @@ describe 'Daemonizing' do
     File.exist?(@server.pid_file).should be_false
   end
   
+  it 'should force kill process in pid file' do
+    @pid = fork do
+      @server.daemonize
+      loop { sleep 3 }
+    end
+  
+    server_should_start_in_less_then 3
+    
+    @pid = @server.pid
+  
+    silence_stream STDOUT do
+      TestServer.kill(@server.pid_file, 0)
+    end
+  
+    File.exist?(@server.pid_file).should be_false
+  end
+  
   it 'should send kill signal if timeout' do
     @pid = fork do
       @server.should_receive(:stop) # pretend we cannot handle the INT signal

data/spec/headers_spec.rb

@@ -26,4 +26,15 @@ describe Headers do
     
     @headers.to_s.should == "Host: localhost:3000\r\nSet-Cookie: twice\r\nSet-Cookie: is cooler the once\r\n"
   end
+
+  it 'should ignore nil values' do
+    @headers['Something'] = nil
+    @headers.to_s.should_not include('Something: ')
+  end
+
+  it 'should format Time values correctly' do
+    time = Time.now
+    @headers['Modified-At'] = time
+    @headers.to_s.should include("Modified-At: #{time.httpdate}")
+  end
 end

data/spec/logging_spec.rb

@@ -28,14 +28,18 @@ describe Logging do
     @object.log 'hi'
   end
   
-  it "should not output when silenced [deprecated]" do
-    @object.should_receive(:warn)
+  it "should not output when silenced as instance method" do
     @object.silent = true
     
     @object.should_not_receive(:puts)
     @object.log 'hi'
   end
   
+  it "should be usable as module functions" do
+    Logging.silent = true
+    Logging.log "hi"
+  end
+  
   after do
     Logging.silent = true
   end

data/spec/rack/rails_adapter_spec.rb

@@ -21,7 +21,7 @@ begin
 
     it "should handle POST parameters" do
       data = "foo=bar"
-      res = @request.post("/simple/post_form", :input => data, 'CONTENT_LENGTH' => data.size)
+      res = @request.post("/simple/post_form", :input => data, 'CONTENT_LENGTH' => data.size.to_s, :lint => true)
 
       res.should be_ok
       res["Content-Type"].should include("text/html")
@@ -31,21 +31,21 @@ begin
     end
   
     it "should serve static files" do
-      res = @request.get("/index.html")
+      res = @request.get("/index.html", :lint => true)
 
       res.should be_ok
       res["Content-Type"].should include("text/html")
     end
     
     it "should serve root with index.html if present" do
-      res = @request.get("/")
+      res = @request.get("/", :lint => true)
 
       res.should be_ok
       res["Content-Length"].to_i.should == File.size(@rails_app_path + '/public/index.html')
     end
     
     it "should serve page cache if present" do
-      res = @request.get("/simple/cached?value=cached")
+      res = @request.get("/simple/cached?value=cached", :lint => true)
 
       res.should be_ok
       res.body.should == 'cached'
@@ -57,7 +57,7 @@ begin
     end
     
     it "should not serve page cache on POST request" do
-      res = @request.get("/simple/cached?value=cached")
+      res = @request.get("/simple/cached?value=cached", :lint => true)
 
       res.should be_ok
       res.body.should == 'cached'
@@ -69,10 +69,12 @@ begin
     end
     
     it "handles multiple cookies" do
-      res = @request.get('/simple/set_cookie?name=a&value=1')
+      res = @request.get('/simple/set_cookie?name=a&value=1', :lint => true)
     
-      res.should be_ok    
-      res.original_headers['Set-Cookie'].should include('a=1; path=/', '_rails_app_session')
+      res.should be_ok
+      res.original_headers['Set-Cookie'].size.should == 2
+      res.original_headers['Set-Cookie'].first.should include('a=1; path=/')
+      res.original_headers['Set-Cookie'].last.should include('_rails_app_session')
     end
     
     after do

data/spec/request/parser_spec.rb

@@ -169,7 +169,7 @@ EOS
 
       sorta_safe.size.should == nread
       parser.should be_finished
-      parser.should_not have_error
+      parser.should_not be_error
     end
   end
   

data/spec/response_spec.rb

@@ -43,6 +43,13 @@ describe Response do
     
     @response.head.should include("Set-Cookie: mium=7", "Set-Cookie: hi=there")
   end
+
+  it 'should ignore nil headers' do
+    @response.headers = nil
+    @response.headers = { 'Host' => 'localhost' }
+    @response.headers = { 'Set-Cookie' => nil }
+    @response.head.should include('Host: localhost')
+  end
   
   it 'should output body' do
     @response.body = '<html></html>'

data/spec/runner_spec.rb

@@ -13,7 +13,7 @@ describe Runner do
     Runner.new(%w(stop)).command.should == 'stop'
     Runner.new(%w(restart)).command.should == 'restart'
   end
-
+  
   it "should abort on unknow command" do
     runner = Runner.new(%w(poop))
     
@@ -66,14 +66,33 @@ describe Runner do
   it "should warn when require a rack config file" do
     STDERR.stub!(:write)
     STDERR.should_receive(:write).with(/WARNING:/)
-
+    
     runner = Runner.new(%w(start -r config.ru))
+    runner.run! rescue nil
     
     runner.options[:rackup].should == 'config.ru'
   end
   
   it "should require file" do
-    proc { Runner.new(%w(start -r unexisting)) }.should raise_error(LoadError)
+    runner = Runner.new(%w(start -r unexisting))
+    proc { runner.run! }.should raise_error(LoadError)
+  end
+  
+  it "should remember requires" do
+    runner = Runner.new(%w(start -r rubygems -r thin))
+    runner.options[:require].should == %w(rubygems thin)
+  end
+
+  it "should remember debug options" do
+    runner = Runner.new(%w(start -D -V))
+    runner.options[:debug].should be_true
+    runner.options[:trace].should be_true
+  end
+
+  it "should default debug and trace to false" do
+    runner = Runner.new(%w(start))
+    runner.options[:debug].should_not be_true
+    runner.options[:trace].should_not be_true
   end
 end
 

data/spec/server/pipelining_spec.rb

@@ -6,7 +6,7 @@ describe Server, "HTTP pipelining" do
     start_server do |env|
       calls += 1
       body = env['PATH_INFO'] + '-' + calls.to_s
-      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+      [200, { 'Content-Type' => 'text/html' }, body]
     end
     @server.maximum_persistent_connections = 1024
   end

data/spec/server/robustness_spec.rb

@@ -4,7 +4,7 @@ describe Server, 'robustness' do
   before do
     start_server do |env|
       body = 'hello!'
-      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+      [200, { 'Content-Type' => 'text/html' }, body]
     end
   end