thin 1.2.11 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,19 @@
+== 1.3.0 Double Espresso
+ * BREAKING CHANGE: Thin no longer ships with fat Windows binaries.
+   From now on, to install on Windows, install https://github.com/oneclick/rubyinstaller/wiki/Development-Kit.
+ * BREAKING CHANGE: Remove automatic Content-Length setting.
+   It is now the responsibility of the app (or a middleware) to set the Content-Length.
+ * Log errors to STDERR [textgoeshere]
+ * Shut down gracefully when receiving SIGTERM [ddollar]
+     
+     Processes are allowed a chance to shut down gracefully when receiving
+     SIGTERM (http://en.wikipedia.org/wiki/SIGTERM).
+     
+     On Heroku, when shutting down a process, we send a SIGTERM followed 10
+     seconds later with a SIGKILL, similar to the behavior of the init daemon
+     on most Unix systems. This patch will allow Heroku apps to shut down
+     gracefully when they need to be terminated / moved.
+
 == 1.2.11 Bat-Shit Crazy
  * Fix pure Ruby gem to not include binary.
 

data/lib/thin.rb

@@ -38,14 +38,7 @@ end
 require "#{Thin::ROOT}/thin/version"
 require "#{Thin::ROOT}/thin/statuses"
 require "#{Thin::ROOT}/rack/adapter/loader"
-
-if Thin.win?
-  # Select proper binary under Windows
-  major_ruby_version = RUBY_VERSION[/^(\d+\.\d+)/]
-  require "#{Thin::ROOT}/#{major_ruby_version}/thin_parser"
-else
-  require "#{Thin::ROOT}/thin_parser"
-end
+require "#{Thin::ROOT}/thin_parser"
 
 module Rack
   module Adapter

data/lib/thin/connection.rb

@@ -5,10 +5,6 @@ module Thin
   # This class is instanciated by EventMachine on each new connection
   # that is opened.
   class Connection < EventMachine::Connection
-    CONTENT_LENGTH    = 'Content-Length'.freeze
-    TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
-    CHUNKED_REGEXP    = /\bchunked\b/i.freeze
-
     include Logging
     
     # This is a template async response. N.B. Can't use string for body on 1.9
@@ -97,9 +93,6 @@ module Thin
       # Status code -1 indicates that we're going to respond later (async).
       return if result.first == AsyncResponse.first
 
-      # Set the Content-Length header if possible
-      set_content_length(result) if need_content_length?(result)
-      
       @response.status, @response.headers, @response.body = *result
 
       log "!! Rack application returned nil body. Probably you wanted it to be an empty string?" if @response.body.nil?
@@ -195,36 +188,9 @@ module Thin
     end
 
     protected
-
       # Returns IP address of peer as a string.
       def socket_address
         Socket.unpack_sockaddr_in(get_peername)[1]
       end
-
-    private
-      def need_content_length?(result)
-        status, headers, body = result
-        return false if status == -1
-        return false if headers.has_key?(CONTENT_LENGTH)
-        return false if (100..199).include?(status) || status == 204 || status == 304
-        return false if headers.has_key?(TRANSFER_ENCODING) && headers[TRANSFER_ENCODING] =~ CHUNKED_REGEXP
-        return false unless body.kind_of?(String) || body.kind_of?(Array)
-        true
-      end
-
-      def set_content_length(result)
-        headers, body = result[1..2]
-        case body
-        when String
-          # See http://redmine.ruby-lang.org/issues/show/203
-          headers[CONTENT_LENGTH] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
-        when Array
-           bytes = 0
-           body.each do |p|
-             bytes += p.respond_to?(:bytesize) ? p.bytesize : p.size
-           end
-           headers[CONTENT_LENGTH] = bytes.to_s
-        end
-      end
   end
 end

data/lib/thin/controllers/service.rb

@@ -5,7 +5,7 @@ module Thin
     # System service controller to launch all servers which
     # config files are in a directory.
     class Service < Controller
-      INITD_PATH          = '/etc/init.d/thin'
+      INITD_PATH          = Dir.exist?('/etc/rc.d') ? '/etc/rc.d/thin' : '/etc/init.d/thin'
       DEFAULT_CONFIG_PATH = '/etc/thin'
       TEMPLATE            = File.dirname(__FILE__) + '/service.sh.erb'
     

data/lib/thin/logging.rb

@@ -46,9 +46,9 @@ module Thin
     
     # Log an error backtrace if debugging is activated
     def log_error(e=$!)
-      debug "#{e}\n\t" + e.backtrace.join("\n\t")
+      STDERR.print("#{e}\n\t" + e.backtrace.join("\n\t")) if Logging.debug?
     end
     module_function :log_error
     public :log_error
   end
-end
+end

data/lib/thin/runner.rb

@@ -118,7 +118,7 @@ module Thin
         opts.on("-f", "--force", "Force the execution of the command")                  { @options[:force] = true }
         opts.on(      "--max-conns NUM", "Maximum number of open file descriptors " +
                                          "(default: #{@options[:max_conns]})",
-                                         "Might require sudo to set higher then 1024")  { |num| @options[:max_conns] = num.to_i } unless Thin.win?
+                                         "Might require sudo to set higher than 1024")  { |num| @options[:max_conns] = num.to_i } unless Thin.win?
         opts.on(      "--max-persistent-conns NUM",
                                        "Maximum number of persistent connections",
                                        "(default: #{@options[:max_persistent_conns]})") { |num| @options[:max_persistent_conns] = num.to_i }

data/lib/thin/server.rb

@@ -210,11 +210,12 @@ module Thin
     
     protected
       # Register signals:
-      # * INT calls +stop+ to shutdown gracefully.
-      # * TERM calls <tt>stop!</tt> to force shutdown.
+      # * TERM & QUIT calls +stop+ to shutdown gracefully.
+      # * INT calls <tt>stop!</tt> to force shutdown.
+      # * HUP calls <tt>restart</tt> to ... surprise, restart!
       def setup_signals
         trap('INT')  { stop! }
-        trap('TERM') { stop! }
+        trap('TERM') { stop }
         unless Thin.win?
           trap('QUIT') { stop }
           trap('HUP')  { restart }

data/lib/thin/version.rb

@@ -5,12 +5,12 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 2
-    TINY     = 11
+    MINOR    = 3
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Bat-Shit Crazy".freeze
+    CODENAME = "Double Espresso".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/spec/backends/swiftiply_client_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Backends::SwiftiplyClient do
   before do

data/spec/backends/tcp_server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Backends::TcpServer do
   before do

data/spec/backends/unix_server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Backends::UnixServer do
   before do

data/spec/command_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Command do
   before do

data/spec/connection_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Connection do
   before do

data/spec/controllers/cluster_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include Controllers
 
 describe Cluster, "with host and port" do

data/spec/controllers/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'ostruct'
 include Controllers
 

data/spec/controllers/service_spec.rb

@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include Controllers
 
 describe Service do
   before(:all) do
-    silence_stream(STDERR) do
+    silence_warnings do
       Service::INITD_PATH          = 'tmp/sandbox' + Service::INITD_PATH
       Service::DEFAULT_CONFIG_PATH = 'tmp/sandbox' + Service::DEFAULT_CONFIG_PATH
     end

data/spec/daemonizing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class TestServer
   include Logging # Daemonizable should include this?
@@ -87,8 +87,10 @@ describe 'Daemonizing' do
     
     @pid = @server.pid
   
-    silence_stream STDOUT do
-      TestServer.kill(@server.pid_file, 1)
+    timeout(10) do
+      silence_stream STDOUT do
+        TestServer.kill(@server.pid_file, 1)
+      end
     end
   
     File.exist?(@server.pid_file).should be_false
@@ -104,8 +106,10 @@ describe 'Daemonizing' do
     
     @pid = @server.pid
   
-    silence_stream STDOUT do
-      TestServer.kill(@server.pid_file, 0)
+    timeout(10) do
+      silence_stream STDOUT do
+        TestServer.kill(@server.pid_file, 0)
+      end
     end
   
     File.exist?(@server.pid_file).should be_false
@@ -193,4 +197,4 @@ describe 'Daemonizing' do
     def server_should_start_in_less_then(sec=10)
       proc { sleep 0.1 until File.exist?(@server.pid_file) }.should take_less_then(10)
     end
-end
+end

data/spec/headers_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Headers do
   before do

data/spec/logging_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class TestLogging
   include Logging
@@ -39,8 +39,14 @@ describe Logging do
     Logging.silent = true
     Logging.log "hi"
   end
+
+  it "should print errors to STDERR" do
+    error = mock(:error, :backtrace => Array("PC LOAD LETTER"))
+    STDERR.should_receive(:print).with(/PC LOAD LETTER/)
+    @object.log_error(error)
+  end
   
   after do
     Logging.silent = true
   end
-end
+end

data/spec/perf/request_perf_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request, 'performance' do
   it "should be faster then #{max_parsing_time = 0.0002} RubySeconds" do

data/spec/perf/response_perf_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Response, 'performance' do
   before do

data/spec/perf/server_perf_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'performance' do
   before do

data/spec/rack/loader_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Rack::Adapter do
   before do

data/spec/rack/rails_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'rack/mock'
 
 begin

data/spec/request/mongrel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'digest/sha1'
 
 describe Request, 'legacy Mongrel tests' do

data/spec/request/parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Require mongrel so we can test that Thin parser don't clash w/ Mongrel parser.
 begin

data/spec/request/persistent_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request, 'persistent' do
   before do

data/spec/request/processing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request, 'processing' do
   it 'should parse in chunks' do

data/spec/response_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Response do
   before do

data/spec/runner_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Runner do
   it "should parse options" do

data/spec/server/builder_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'app builder' do
   it "should build app from constructor" do

data/spec/server/pipelining_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, "HTTP pipelining" do
   before do
@@ -35,7 +35,7 @@ describe Server, "HTTP pipelining" do
     socket.close
     
     wait_for_requests_to_complete!
-    
+
     response.should include('/first-1', '/second-2')
   end
   
@@ -107,4 +107,4 @@ describe Server, "HTTP pipelining" do
     def wait_for_requests_to_complete!
       sleep 0.1 until @server.backend.size == 0
     end
-end
+end

data/spec/server/robustness_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'robustness' do
   before do

data/spec/server/stopping_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, "stopping" do
   before do

data/spec/server/swiftiply_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 if SWIFTIPLY_PATH.empty?
   warn "Ignoring Server on Swiftiply specs, gem install swiftiply to run"

data/spec/server/tcp_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'on TCP socket' do
   before do
@@ -20,16 +20,6 @@ describe Server, 'on TCP socket' do
     body.should include('this')
   end
   
-  it "should add the Content-Length to the response when not present" do
-    status, headers, body = parse_response(send_data("GET / HTTP/1.0\r\nConnection: close\r\n\r\n"))
-    headers.should have_key('Content-Length')
-  end
-  
-  it 'should set the Content-Length to equal the body size in bytes' do
-    status, headers, body = parse_response(send_data("GET / HTTP/1.0\r\nConnection: close\r\n\r\n"))
-    headers['Content-Length'].should == (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
-  end
-  
   it 'should return empty string on incomplete headers' do
     send_data("GET /?this HTTP/1.1\r\nHost:").should be_empty
   end

data/spec/server/threaded_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'with threads' do
   before do
@@ -24,4 +24,4 @@ describe Server, 'with threads' do
   after do
     stop_server
   end
-end
+end

data/spec/server/unix_socket_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, "on UNIX domain socket" do
   before do

data/spec/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Server do
   before do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'thin'
+gem "rspec", "~> 1.2.9"
 require 'spec'
 require 'benchmark'
 require 'timeout'
@@ -134,6 +135,13 @@ module Helpers
     stream.reopen(old_stream)
   end
   
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+  
   # Create and parse a request
   def R(raw, convert_line_feed=false)
     raw.gsub!("\n", "\r\n") if convert_line_feed
@@ -153,13 +161,19 @@ module Helpers
       wait_for_socket(address, port)
     else
       # If we can't ping the address fallback to just wait for the server to run
-      sleep 1 until @server.running?
+      sleep 0.01 until @server.running?
     end
   end
   
   def stop_server
     @server.stop!
     @thread.kill
+    
+    100.times do
+      break unless EM.reactor_running?
+      sleep 0.01
+    end
+
     raise "Reactor still running, wtf?" if EventMachine.reactor_running?
   end
   
@@ -217,4 +231,4 @@ end
 Spec::Runner.configure do |config|
   config.include Matchers
   config.include Helpers
-end
+end

data/tasks/gem.rake

@@ -13,7 +13,6 @@ Thin::GemSpec = Gem::Specification.new do |s|
   s.email                 = 'macournoyer@gmail.com'
   s.homepage              = 'http://code.macournoyer.com/thin/'
   s.rubyforge_project     = 'thin'
-  s.has_rdoc              = true
   s.executables           = %w(thin)
 
   s.required_ruby_version = '>= 1.8.5'
@@ -24,7 +23,7 @@ Thin::GemSpec = Gem::Specification.new do |s|
     s.add_dependency      'daemons',      '>= 1.0.9'
   end
 
-  s.files                 = %w(COPYING CHANGELOG README Rakefile) +
+  s.files                 = %w(CHANGELOG README Rakefile) +
                             Dir.glob("{benchmark,bin,doc,example,lib,spec,tasks}/**/*") - Dir.glob("lib/thin_parser.*") + 
                             Dir.glob("ext/**/*.{h,c,rb,rl}")
   

data/tasks/spec.rake

@@ -19,7 +19,6 @@ SPECS      = FileList['spec/**/*_spec.rb'] - PERF_SPECS - SPECS2
 
 def spec_task(name, specs)
   Spec::Rake::SpecTask.new(name) do |t|
-    t.libs << 'lib'
     t.spec_opts = %w(-fs -c)
     t.spec_files = specs
   end
@@ -41,4 +40,4 @@ task :check_benchmark_unit_gem do
   end
 end
 
-task 'spec:perf' => :check_benchmark_unit_gem
+task 'spec:perf' => :check_benchmark_unit_gem

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 11
-  version: 1.2.11
+  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 12
-        - 6
         version: 0.12.6
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 0
-        - 9
         version: 1.0.9
   type: :runtime
   version_requirements: *id003
@@ -75,7 +55,6 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- COPYING
 - CHANGELOG
 - README
 - Rakefile
@@ -224,25 +203,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 61
-      segments: 
-      - 1
-      - 8
-      - 5
       version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: thin
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A thin and fast web server

data/COPYING

@@ -1,18 +0,0 @@
-Copyright (c) 2008 Marc-Andre Cournoyer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-  
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-   
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.