thin 0.5.3-x86-mswin32-60 → 0.5.4-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.5.4 Flying Mustard release
+ * Don't read the full body, use direct streaming when sending response.
+   See: Response#each
+   As a result, the Content-Length can not be calculated any more.
+   You have to do set it in your adapter. All frameworks do it anyway.
+ * Add Server response header
+ * Fix --user and --group option not changing daemon process privileges
+ 
 == 0.5.3 Purple Yogurt release
  * win32 pre-compiled gem now available
  * change rake task configuration to allow win32 gem build

data/benchmark/previous.rb

@@ -0,0 +1,14 @@
+# Benchmark to compare Thin performance against
+# previous Thin version (the one installed as a gem).
+#
+# Run with:
+#
+#  ruby previous.rb [num of request]
+#
+require 'rubygems'
+require 'rack'
+require File.dirname(__FILE__) + '/utils'
+
+request = (ARGV[0] || 1000).to_i # Number of request to send (ab -n option)
+
+benchmark %w(current gem), request

data/benchmark/simple.rb

@@ -6,43 +6,8 @@
 #  ruby simple.rb [num of request]
 #
 require File.dirname(__FILE__) + '/../lib/thin'
-require 'rack/lobster'
+require File.dirname(__FILE__) + '/utils'
 
-REQUEST = (ARGV[0] || 1000).to_i # Number of request to send (ab -n option)
+request = (ARGV[0] || 1000).to_i # Number of request to send (ab -n option)
 
-def run(handler_name, c=1, n=REQUEST)
-  server = fork do
-    [STDOUT, STDERR].each { |o| o.reopen "/dev/null" }
-  
-    app = Rack::Lobster.new
-    
-    if handler_name == 'EMongrel'
-      require 'swiftcore/evented_mongrel'
-      handler_name = 'Mongrel'
-    end
-    handler = Rack::Handler.const_get(handler_name)
-    handler.run app, :Host => '0.0.0.0', :Port => 7000
-  end
-
-  sleep 2
-
-  out = `nice -n20 ab -c #{c} -n #{n} http://127.0.0.1:7000/ 2> /dev/null`
-
-  Process.kill('SIGKILL', server)
-  Process.wait
-  
-  if requests = out.match(/^Requests.+?(\d+\.\d+)/)
-    failed = out.match(/^Failed requests.+?(\d+)$/)[1]
-    "#{requests[1].to_s.ljust(9)} #{failed}"
-  else
-    'ERROR'
-  end
-end
-
-puts 'server     request   concurrency   req/s     failures'
-puts '=' * 53
-[1, 10, 100].each do |c|
-  %w(WEBrick Mongrel EMongrel Thin).each do |server|
-    puts "#{server.ljust(8)}   #{REQUEST}      #{c.to_s.ljust(4)}          #{run(server, c)}"
-  end
-end
+benchmark %w(WEBrick Mongrel EMongrel Thin), request

data/benchmark/utils.rb

@@ -0,0 +1,51 @@
+require 'rack/lobster'
+
+def run(handler_name, n=1000, c=1)
+  server = fork do
+    [STDOUT, STDERR].each { |o| o.reopen "/dev/null" }
+      
+    case handler_name
+    when 'EMongrel'
+      require 'swiftcore/evented_mongrel'
+      handler_name = 'Mongrel'
+    
+    when 'gem' # Load the current Thin gem
+      require 'thin'
+      handler_name = 'Thin'
+    
+    when 'current' # Load the current Thin version under /lib
+      require File.dirname(__FILE__) + '/../lib/thin'
+      handler_name = 'Thin'
+      
+    end
+    
+    app = Rack::Lobster.new
+    
+    handler = Rack::Handler.const_get(handler_name)
+    handler.run app, :Host => '0.0.0.0', :Port => 7000
+  end
+
+  sleep 2
+
+  out = `nice -n20 ab -c #{c} -n #{n} http://127.0.0.1:7000/ 2> /dev/null`
+
+  Process.kill('SIGKILL', server)
+  Process.wait
+  
+  if requests = out.match(/^Requests.+?(\d+\.\d+)/)
+    failed = out.match(/^Failed requests.+?(\d+)$/)[1]
+    "#{requests[1].to_s.ljust(9)} #{failed}"
+  else
+    'ERROR'
+  end
+end
+
+def benchmark(servers, request, concurrency_levels=[1, 10, 100])
+  puts 'server     request   concurrency   req/s     failures'
+  puts '=' * 53
+  concurrency_levels.each do |c|
+    servers.each do |server|
+      puts "#{server.ljust(8)}   #{request}      #{c.to_s.ljust(4)}          #{run(server, request, c)}"
+    end
+  end
+end

data/bin/thin

@@ -73,8 +73,8 @@ def start(options)
     server.timeout  = options[:timeout]
   
     if options[:daemonize]
-      server.change_privilege options[:user], options[:group] if options[:user] && options[:group]
       server.daemonize
+      server.change_privilege options[:user], options[:group] if options[:user] && options[:group]
     end
   
     server.app = Rack::Adapter::Rails.new(options.merge(:root => options[:chdir]))

data/example/config.ru

@@ -4,6 +4,13 @@
 #  http://rack.rubyforge.org/doc/classes/Rack/Builder.html
 
 require File.dirname(__FILE__) + '/../lib/thin'
-require 'rack/lobster'
 
-run Rack::Lobster.new
+app = proc do |env|
+  [
+    200,
+    {'Content-Type' => 'text/html'},
+    ['hi!']
+  ]
+end
+
+run app

data/lib/thin.rb

@@ -1,4 +1,4 @@
-$: << File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path(File.dirname(__FILE__))
 
 require 'fileutils'
 require 'timeout'

data/lib/thin/connection.rb

@@ -30,8 +30,10 @@ module Thin
       @response.status, @response.headers, @response.body = @app.call(env)
       
       # Send the response
-      trace { @response.to_s }
-      send_data @response.to_s
+      @response.each do |chunk|
+        trace { chunk }
+        send_data chunk
+      end
       
       close_connection_after_writing
       

data/lib/thin/response.rb

@@ -1,25 +1,35 @@
 module Thin
   # A response sent to the client.
   class Response
-    CONTENT_LENGTH = 'Content-Length'.freeze
     CONNECTION     = 'Connection'.freeze
+    SERVER         = 'Server'.freeze
     CLOSE          = 'close'.freeze
     
+    # Status code
     attr_accessor :status
-    attr_reader   :headers, :body
+    
+    # Response body, must respond to +each+.
+    attr_accessor :body
+    
+    # Headers key-value hash
+    attr_reader   :headers
     
     def initialize
       @headers = Headers.new
-      @body    = StringIO.new
       @status  = 200
     end
     
+    # String representation of the headers
+    # to be sent in the response.
     def headers_output
-      @headers[CONTENT_LENGTH] = @body.size
       @headers[CONNECTION] = 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
@@ -30,19 +40,17 @@ module Thin
       end
     end
     
-    def body=(stream)
-      stream.each do |part|
-        @body << part
-      end
-    end
-    
+    # Close any resource used by the response
     def close
-      @body.close
+      @body.close if @body.respond_to?(:close)
     end
     
-    def to_s
-      @body.rewind
-      head + @body.read
+    # Yields each chunk of the response
+    def each
+      yield head
+      @body.each do |chunk|
+        yield chunk
+      end
     end
   end
 end

data/lib/thin/version.rb

@@ -2,10 +2,10 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 5
-    TINY     = 3
+    TINY     = 4
 
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Purple Yogurt'
+    CODENAME = 'Flying Mustard'
   end
 end

data/spec/response_spec.rb

@@ -4,21 +4,28 @@ describe Response do
   before do
     @response = Response.new
     @response.headers['Content-Type'] = 'text/html'
+    @response.headers['Content-Length'] = '0'
+    @response.body = ''
   end
   
   it 'should output headers' do
-    @response.headers_output.should == "Content-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n"
+    @response.headers_output.should include("Content-Type: text/html", "Content-Length: 0", "Connection: close")
+  end
+  
+  it 'should include server name header' do
+    @response.headers_output.should include("Server: thin")
   end
   
   it 'should output head' do
-    @response.head.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    @response.head.should include("HTTP/1.1 200 OK", "Content-Type: text/html", "Content-Length: 0",
+                                  "Connection: close", "\r\n\r\n")
   end
   
   it 'should allow duplicates in headers' do
     @response.headers['Set-Cookie'] = 'mium=7'
     @response.headers['Set-Cookie'] = 'hi=there'
     
-    @response.head.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nSet-Cookie: mium=7\r\nSet-Cookie: hi=there\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    @response.head.should include("Set-Cookie: mium=7", "Set-Cookie: hi=there")
   end
   
   it 'should parse simple header values' do
@@ -26,7 +33,7 @@ describe Response do
       'Host' => 'localhost'
     }
     
-    @response.head.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nHost: localhost\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    @response.head.should include("Host: localhost")
   end
   
   it 'should parse multiline header values in several headers' do
@@ -34,16 +41,18 @@ describe Response do
       'Set-Cookie' => "mium=7\nhi=there"
     }
     
-    @response.head.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nSet-Cookie: mium=7\r\nSet-Cookie: hi=there\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    @response.head.should include("Set-Cookie: mium=7", "Set-Cookie: hi=there")
   end
   
   it 'should output body' do
-    @response.body << '<html></html>'
+    @response.body = '<html></html>'
     
-    @response.to_s.should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 13\r\nConnection: close\r\n\r\n<html></html>"
+    out = ''
+    @response.each { |l| out << l }
+    out.should include("\r\n\r\n<html></html>")
   end
   
-  it "should be faster then #{max_parsing_time = 0.06} ms" do
+  it "should be faster then #{max_parsing_time = 0.07} ms" do
     @response.body << <<-EOS
 <html><head><title>Dir listing</title></head>
 <body><h1>Listing stuff</h1><ul>
@@ -51,6 +60,10 @@ describe Response do
 </ul></body></html>
 EOS
     
-    proc { @response.to_s }.should be_faster_then(max_parsing_time)
+    proc { @response.each { |l| l } }.should be_faster_then(max_parsing_time)
+  end
+  
+  it "should be closeable" do
+    @response.close
   end
 end

data/spec/server_spec.rb

@@ -5,8 +5,10 @@ require 'socket'
 describe Server do
   before do
     app = proc do |env|
-      body = [env['QUERY_STRING'], env['rack.input'].read].compact
-      [200, { 'Content-Type' => 'text/html' }, body]
+      body = ''
+      body << env['QUERY_STRING'].to_s
+      body << env['rack.input'].read.to_s
+      [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body]
     end
     server = Thin::Server.new('0.0.0.0', 3333, app)
     server.timeout = 3
@@ -24,7 +26,10 @@ describe Server do
   end
   
   it 'should GET from TCPSocket' do
-    raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\n\r\n").should == "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 4\r\nConnection: close\r\n\r\nthis"
+    raw('0.0.0.0', 3333, "GET /?this HTTP/1.1\r\n\r\n").
+      should include("HTTP/1.1 200 OK",
+                     "Content-Type: text/html", "Content-Length: 4",
+                     "Connection: close", "\r\n\r\nthis")
   end
   
   it 'should return empty string on incomplete headers' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: x86-mswin32-60
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-18 00:00:00 -07:00
+date: 2008-01-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,62 +43,11 @@ files:
 - CHANGELOG
 - README
 - Rakefile
+- benchmark/previous.rb
 - benchmark/simple.rb
+- benchmark/utils.rb
 - bin/thin
 - doc/benchmarks.txt
-- doc/rdoc
-- doc/rdoc/classes
-- doc/rdoc/classes/Process.html
-- doc/rdoc/classes/Rack
-- doc/rdoc/classes/Rack/Adapter
-- doc/rdoc/classes/Rack/Adapter/Rails
-- doc/rdoc/classes/Rack/Adapter/Rails/CGIWrapper.html
-- doc/rdoc/classes/Rack/Adapter/Rails.html
-- doc/rdoc/classes/Rack/Adapter.html
-- doc/rdoc/classes/Rack/Handler
-- doc/rdoc/classes/Rack/Handler/Thin.html
-- doc/rdoc/classes/Rack/Handler.html
-- doc/rdoc/classes/Rack.html
-- doc/rdoc/classes/Thin
-- doc/rdoc/classes/Thin/Cluster.html
-- doc/rdoc/classes/Thin/Connection.html
-- doc/rdoc/classes/Thin/Daemonizable
-- doc/rdoc/classes/Thin/Daemonizable/ClassMethods.html
-- doc/rdoc/classes/Thin/Daemonizable.html
-- doc/rdoc/classes/Thin/Headers.html
-- doc/rdoc/classes/Thin/InvalidRequest.html
-- doc/rdoc/classes/Thin/Logging.html
-- doc/rdoc/classes/Thin/Request.html
-- doc/rdoc/classes/Thin/Response.html
-- doc/rdoc/classes/Thin/Server.html
-- doc/rdoc/classes/Thin/StopServer.html
-- doc/rdoc/classes/Thin.html
-- doc/rdoc/created.rid
-- doc/rdoc/files
-- doc/rdoc/files/bin
-- doc/rdoc/files/bin/thin.html
-- doc/rdoc/files/lib
-- doc/rdoc/files/lib/rack
-- doc/rdoc/files/lib/rack/adapter
-- doc/rdoc/files/lib/rack/adapter/rails_rb.html
-- doc/rdoc/files/lib/rack/handler
-- doc/rdoc/files/lib/rack/handler/thin_rb.html
-- doc/rdoc/files/lib/thin
-- doc/rdoc/files/lib/thin/cluster_rb.html
-- doc/rdoc/files/lib/thin/connection_rb.html
-- doc/rdoc/files/lib/thin/daemonizing_rb.html
-- doc/rdoc/files/lib/thin/headers_rb.html
-- doc/rdoc/files/lib/thin/logging_rb.html
-- doc/rdoc/files/lib/thin/request_rb.html
-- doc/rdoc/files/lib/thin/response_rb.html
-- doc/rdoc/files/lib/thin/server_rb.html
-- doc/rdoc/files/lib/thin/statuses_rb.html
-- doc/rdoc/files/lib/thin/version_rb.html
-- doc/rdoc/files/lib/thin_rb.html
-- doc/rdoc/files/README.html
-- doc/rdoc/index.html
-- doc/rdoc/logo.gif
-- doc/rdoc/rdoc-style.css
 - example/config.ru
 - example/thin.god
 - lib/rack
@@ -118,6 +67,7 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- lib/thin_parser.so
 - spec/cluster_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
@@ -188,7 +138,6 @@ files:
 - ext/thin_parser/extconf.rb
 - ext/thin_parser/common.rl
 - ext/thin_parser/parser.rl
-- lib/thin_parser.so
 has_rdoc: false
 homepage: http://code.macournoyer.com/thin/
 post_install_message: