thin 0.7.1 → 0.8.0

data/spec/server/robustness_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, 'robustness' do
+  before do
+    start_server do |env|
+      body = 'hello!'
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
+    end
+  end
+  
+  it "should not crash when header too large" do
+    100.times do
+      begin
+        socket = TCPSocket.new(DEFAULT_TEST_ADDRESS, DEFAULT_TEST_PORT)
+        socket.write("GET / HTTP/1.1\r\n")
+        socket.write("Host: localhost\r\n")
+        socket.write("Connection: close\r\n")
+        10000.times do
+        	socket.write("X-Foo: #{'x' * 100}\r\n")
+        	socket.flush
+        end
+        socket.write("\r\n")
+        socket.read
+        socket.close
+      rescue Errno::EPIPE, Errno::ECONNRESET
+				# Ignore.
+			end
+    end
+  end
+  
+  after do
+    stop_server
+  end
+end

data/spec/server/swiftiply_spec.rb

@@ -10,7 +10,7 @@ else
       end
       wait_for_socket('0.0.0.0', 3333)
       sleep 2 # HACK ooh boy, I wish I knew how to make those specs more stable...
-      start_server(Backends::SwiftiplyClient.new('0.0.0.0', 5555, nil), nil, false) do |env|
+      start_server('0.0.0.0', 5555, :backend => Backends::SwiftiplyClient, :wait_for_socket => false) do |env|
         body = env.inspect + env['rack.input'].read
         [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
       end

data/spec/server/threaded_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Server, 'with threads' do
+  before do
+    @requests = 0
+    start_server DEFAULT_TEST_ADDRESS, DEFAULT_TEST_PORT, :threaded => true do |env|
+      sleep env['PATH_INFO'].delete('/').to_i
+      @requests += 1
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => '2' }, 'hi']
+    end
+  end
+  
+  it "should process request" do
+    get('/').should_not be_empty
+  end
+  
+  it "should process requests when blocked" do
+    slow_request = Thread.new { get('/3') }
+    get('/').should_not be_empty
+    @requests.should == 1
+    slow_request.kill
+  end
+  
+  after do
+    stop_server
+  end
+end

data/spec/server_spec.rb

@@ -16,4 +16,73 @@ describe Server do
     @server.config
     @server.maximum_connections.should < 100_000
   end
+  
+  it "should default to non-threaded" do
+    @server.should_not be_threaded
+  end
+  
+  it "should set backend to threaded" do
+    @server.threaded = true
+    @server.backend.should be_threaded
+  end
+end
+
+describe Server, "initialization" do
+  it "should set host and port" do
+    server = Server.new('192.168.1.1', 8080)
+
+    server.host.should == '192.168.1.1'
+    server.port.should == 8080
+  end
+
+  it "should set socket" do
+    server = Server.new('/tmp/thin.sock')
+
+    server.socket.should == '/tmp/thin.sock'
+  end
+  
+  it "should set host, port and app" do
+    app = proc {}
+    server = Server.new('192.168.1.1', 8080, app)
+    
+    server.host.should_not be_nil
+    server.app.should == app
+  end
+
+  it "should set socket and app" do
+    app = proc {}
+    server = Server.new('/tmp/thin.sock', app)
+    
+    server.socket.should_not be_nil
+    server.app.should == app
+  end
+
+  it "should set socket, nil and app" do
+    app = proc {}
+    server = Server.new('/tmp/thin.sock', nil, app)
+    
+    server.socket.should_not be_nil
+    server.app.should == app
+  end
+  
+  it "should set host, port and backend" do
+    server = Server.new('192.168.1.1', 8080, :backend => Thin::Backends::SwiftiplyClient)
+    
+    server.host.should_not be_nil
+    server.backend.should be_kind_of(Thin::Backends::SwiftiplyClient)
+  end  
+
+  it "should set host, port, app and backend" do
+    app = proc {}
+    server = Server.new('192.168.1.1', 8080, app, :backend => Thin::Backends::SwiftiplyClient)
+    
+    server.host.should_not be_nil
+    server.app.should == app
+    server.backend.should be_kind_of(Thin::Backends::SwiftiplyClient)
+  end
+  
+  it "should not register signals w/ :signals => false" do
+    Server.should_not_receive(:setup_signals)
+    Server.new(:signals => false)
+  end
 end

data/spec/spec_helper.rb

@@ -14,7 +14,11 @@ FileUtils.mkdir_p File.dirname(__FILE__) + '/../log'
 Command.script = File.dirname(__FILE__) + '/../bin/thin'
 Logging.silent = true
 
-SWIFTIPLY_PATH = `which swiftiply`.chomp unless Object.const_defined?(:SWIFTIPLY_PATH)
+unless Object.const_defined?(:SWIFTIPLY_PATH)
+  SWIFTIPLY_PATH       = `which swiftiply`.chomp
+  DEFAULT_TEST_ADDRESS = '0.0.0.0'
+  DEFAULT_TEST_PORT    = 3333
+end
 
 module Matchers
   class BeFasterThen
@@ -138,12 +142,13 @@ module Helpers
     request
   end
   
-  def start_server(address='0.0.0.0', port=3333, wait_for_socket=true, &app)
-    @server = Thin::Server.new(address, port, app)
+  def start_server(address=DEFAULT_TEST_ADDRESS, port=DEFAULT_TEST_PORT, options={}, &app)
+    @server = Thin::Server.new(address, port, options, app)
+    @server.threaded = options[:threaded]
     @server.timeout = 3
     
     @thread = Thread.new { @server.start }
-    if wait_for_socket
+    if options[:wait_for_socket]
       wait_for_socket(address, port)
     else
       # If we can't ping the address fallback to just wait for the server to run
@@ -157,7 +162,7 @@ module Helpers
     raise "Reactor still running, wtf?" if EventMachine.reactor_running?
   end
   
-  def wait_for_socket(address='0.0.0.0', port=3333, timeout=5)
+  def wait_for_socket(address=DEFAULT_TEST_ADDRESS, port=DEFAULT_TEST_PORT, timeout=5)
     Timeout.timeout(timeout) do
       loop do
         begin

data/tasks/gem.rake

@@ -1,6 +1,6 @@
 require 'rake/gempackagetask'
 
-WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'x86-mswin32-60'
+WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
 
 task :clean => :clobber_package
 
@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   
   s.add_dependency        'rack',         '>= 0.2.0'
   if WIN
-    s.add_dependency      'eventmachine', '>= 0.8.1'
+    s.add_dependency      'eventmachine', '= 0.8.1' # TODO replace w/ latest precompiled
   else
     s.add_dependency      'daemons',      '>= 1.0.9'
     s.add_dependency      'eventmachine', '>= 0.10.0' # TODO '>= 0.11.0' when it's released

data/tasks/spec.rake

@@ -7,26 +7,34 @@ if RUBY_1_9 # RSpec not yet working w/ Ruby 1.9
 else
   require 'spec/rake/spectask'
   
-  desc "Run all examples"
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_opts = %w(-fs -c)
-    t.spec_files = FileList['spec/**/*_spec.rb'] - FileList['spec/perf/*_spec.rb']
-    if WIN
-      t.spec_files -= [
-          'spec/backends/unix_server_spec.rb',
-          'spec/controllers/service_spec.rb',
-          'spec/daemonizing_spec.rb',
-          'spec/server/unix_socket_spec.rb',
-          'spec/server/swiftiply_spec.rb'
-          ]
+  PERF_SPECS = FileList['spec/perf/*_spec.rb']
+  WIN_SPECS  = %w(
+    spec/backends/unix_server_spec.rb
+    spec/controllers/service_spec.rb
+    spec/daemonizing_spec.rb
+    spec/server/unix_socket_spec.rb
+    spec/server/swiftiply_spec.rb
+  )
+  # HACK Event machine causes some problems when running multiple
+  # tests in the same VM so we split the specs in 2 before I find
+  # a better solution...
+  SPECS2     = %w(spec/server/threaded_spec.rb spec/server/tcp_spec.rb)  
+  SPECS      = FileList['spec/**/*_spec.rb'] - PERF_SPECS - SPECS2
+  
+  def spec_task(name, specs)
+    Spec::Rake::SpecTask.new(name) do |t|
+      t.spec_opts = %w(-fs -c)
+      t.spec_files = specs
     end
   end
-  task :spec => :compile
+  
+  desc "Run all examples"
+  spec_task :spec, SPECS
+  spec_task :spec2, SPECS2
+  task :spec => [:compile, :spec2]
   
   desc "Run all performance examples"
-  Spec::Rake::SpecTask.new('spec:perf') do |t|
-    t.spec_files = FileList['spec/perf/*_spec.rb']
-  end
+  spec_task 'spec:perf', PERF_SPECS
   
   task :check_benchmark_unit_gem do
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-06 00:00:00 -05:00
+date: 2008-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,16 +57,18 @@ files:
 - benchmark/benchmarker.rb
 - benchmark/runner
 - bin/thin
-- doc/benchmarks.txt
 - example/adapter.rb
 - example/config.ru
 - example/monit_sockets
 - example/monit_unixsock
 - example/ramaze.ru
 - example/thin.god
+- example/thin_solaris_smf.erb
+- example/thin_solaris_smf.readme.txt
 - example/vlad.rake
 - lib/rack
 - lib/rack/adapter
+- lib/rack/adapter/loader.rb
 - lib/rack/adapter/rails.rb
 - lib/rack/handler
 - lib/rack/handler/thin.rb
@@ -95,6 +97,8 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- lib/thin_backend.bundle
+- lib/thin_parser.bundle
 - spec/backends
 - spec/backends/swiftiply_client_spec.rb
 - spec/backends/tcp_server_spec.rb
@@ -115,7 +119,9 @@ files:
 - spec/perf/request_perf_spec.rb
 - spec/perf/response_perf_spec.rb
 - spec/perf/server_perf_spec.rb
-- spec/rack_rails_spec.rb
+- spec/rack
+- spec/rack/loader_spec.rb
+- spec/rack/rails_adapter_spec.rb
 - spec/rails_app
 - spec/rails_app/app
 - spec/rails_app/app/controllers
@@ -185,10 +191,12 @@ files:
 - spec/server
 - spec/server/builder_spec.rb
 - spec/server/pipelining_spec.rb
+- spec/server/robustness_spec.rb
 - spec/server/stopping_spec.rb
 - spec/server/swiftiply.yml
 - spec/server/swiftiply_spec.rb
 - spec/server/tcp_spec.rb
+- spec/server/threaded_spec.rb
 - spec/server/unix_socket_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
@@ -230,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thin
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: A thin and fast web server

data/doc/benchmarks.txt

@@ -1,86 +0,0 @@
-== Process
-* rackup ...
-* nice -n20 httperf --port 9292 --num-conns 9000
-* nice -n20 ab -n5000 localhost:9292/
-* nice -n20 ab -n5000 -c10 localhost:9292/
-* nice -n20 ab -n5000 -c100 localhost:9292/
-
-== More Benchmarks
-http://www.webficient.com/2007/08/testing-various-configurations-of-rails.html
-
-=== WEBrick
-rackup -s webrick
-
-==== httperf
-Reply rate [replies/s]: min 303.8 avg 306.8 max 310.4 stddev 2.8 (5 samples)
-Reply rate [replies/s]: min 235.8 avg 292.2 max 306.4 stddev 27.7 (6 samples)
-Reply rate [replies/s]: min 304.8 avg 306.9 max 308.8 stddev 1.5 (5 samples)
-  avg:                                302.0                  10.7
-
-==== Concurrency Level 1
-297.37 [#/sec] (mean)
-
-==== Concurrency Level 10
-296.65 [#/sec] (mean) Failed requests: 4 (Connect: 2, Length: 2, Exceptions: 0)
-298.22 [#/sec] (mean) Failed requests: 4 (Connect: 2, Length: 2, Exceptions: 0)
-
-==== Concurrency Level 100
-297.16 [#/sec] (mean) Failed requests: 489 (Connect: 245, Length: 244, Exceptions: 0)
-
-
-=== Mongrel
-rackup -s mongrel
-
-==== httperf
-Reply rate [replies/s]: min 556.4 avg 580.1 max 613.6 stddev 29.9 (3 samples)
-Reply rate [replies/s]: min 299.0 avg 502.6 max 613.4 stddev 176.5 (3 samples)
-Reply rate [replies/s]: min 601.0 avg 608.5 max 616.0 stddev 10.7 (2 samples)
-Reply rate [replies/s]: min 605.2 avg 608.4 max 611.6 stddev 4.5 (2 samples)
-  avg:                                574.9                  55.4
-
-==== Concurrency Level 1
-556.67 [#/sec] (mean)
-
-==== Concurrency Level 10
-622.90 [#/sec] (mean)
-
-==== Concurrency Level 100
-428.23 [#/sec] (mean)
-
-=== Evented Mongrel
-rackup -r "swiftcore/evented_mongrel" -s mongrel
-
-==== httperf
-Reply rate [replies/s]: min 452.4 avg 541.0 max 590.0 stddev 76.9 (3 samples)
-Reply rate [replies/s]: min 573.2 avg 586.0 max 593.0 stddev 11.1 (3 samples)
-Reply rate [replies/s]: min 546.6 avg 574.8 max 594.6 stddev 25.0 (3 samples)
-Reply rate [replies/s]: min 593.6 avg 595.2 max 596.4 stddev 1.5 (3 samples)
-  avg:                                574.25                 28.625
-
-==== Concurrency Level 1
-517.97 [#/sec] (mean)
-
-==== Concurrency Level 10
-657.89 [#/sec] (mean)
-
-==== Concurrency Level 100
-656.17 [#/sec] (mean)
-
-=== Thin
-rackup -s thin
-
-==== httperf
-Reply rate [replies/s]: min 671.4 avg 681.0 max 690.7 stddev 13.6 (2 samples)
-Reply rate [replies/s]: min 690.0 avg 695.8 max 701.7 stddev 8.3 (2 samples)
-Reply rate [replies/s]: min 643.4 avg 669.4 max 695.4 stddev 36.7 (2 samples)
-Reply rate [replies/s]: min 694.1 avg 695.8 max 697.6 stddev 2.5 (2 samples)
-  avg:                                685.5                  15.275
-
-==== Concurrency Level 1
-719.53 [#/sec] (mean)
-
-==== Concurrency Level 10
-782.11 [#/sec] (mean)
-
-==== Concurrency Level 100
-776.40 [#/sec] (mean)