thin 0.5.4 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,38 @@
+== 0.6.0 Big Pony release
+ * Add support for connection through UNIX domain socket.
+   Use the --socket (-S) option w/ the thin script to configure the socket filename.
+   Nginx support binding to a UNIX socket like this:
+   
+     upstream  backend {
+       server   unix:/tmp/thin.0.sock;
+       server   unix:/tmp/thin.1.sock;
+       server   unix:/tmp/thin.2.sock;
+     }
+  
+   Start your servers like this:
+   
+     thin start -s3 -S/tmp/thin.sock
+   
+ * Remove Server#listen! method. Use Server#start instead.
+ * Server can now yield a Rack::Builder to allow building an app in one call:
+ 
+     Server.start '0.0.0.0', 3000 do
+       use Rack::CommonLogger
+       use Rack::ShowExceptions
+       map "/lobster" do
+         use Rack::Lint
+         run Rack::Lobster.new
+       end
+     end
+     
+ * Add a very basic stats page through Stats adapter, load w/ --stats and browse to /stats.
+ * Add --trace (-V) option to trace request/response and get backtrace w/out all Ruby debug stuff.
+ * Add --config (-C) option to load options from a config file in thin script [Matt Todd].
+ * Alter response headers to output directly to a string.
+ * Improve specs stability.
+ * Move request body to a Tempfile if too big (> 112 MB)
+ * Remove useless check for max header size in Request (already done in the parser)
+
 == 0.5.4 Flying Mustard release
  * Don't read the full body, use direct streaming when sending response.
    See: Response#each

data/README

@@ -13,13 +13,13 @@ For the latest stable version:
 
  sudo gem install thin
 
-or using my mirror (might be more recent):
+or using my mirror (might be more recent and unstable):
 
  sudo gem install thin --source http://code.macournoyer.com
 
 Or from source:
 
- git clone git://repo.or.cz/thin.git
+ git clone git://github.com/macournoyer/thin.git
  cd thin
  rake install
 
@@ -36,7 +36,14 @@ You need to setup a config.ru file and require thin in it:
  require 'thin'
  
  app = proc do |env|
-  [200, {'Content-Type'=>'text/html'}, ['hi']]
+  [
+    200,
+    {
+      'Content-Type' => 'text/html',
+      'Content-Length' => '2'
+    },
+    ['hi']
+  ]
  end
  
  run app
@@ -56,5 +63,6 @@ either the terms of the GPL.
 
 Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com>
 
-Please report any bug at http://groups.google.com/group/thin-ruby/
-and major security issues directly to me at macournoyer@gmail.com.
+Get help at http://groups.google.com/group/thin-ruby/
+Report bugs at http://thin.lighthouseapp.com/projects/7212-thin
+and major security issues directly to a team member (see COMMITTERS)

data/Rakefile

@@ -1,5 +1,5 @@
 RUBY_1_9 = RUBY_VERSION =~ /^1\.9/
-WIN      = (PLATFORM =~ /mswin|cygwin/)
+WIN      = (RUBY_PLATFORM =~ /mswin|cygwin/)
 SUDO     = (WIN ? "" : "sudo")
 
 require 'rake'
@@ -8,4 +8,4 @@ require 'lib/thin'
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
-task :default => [:compile, :spec]
+task :default => :spec

data/bin/thin

@@ -3,8 +3,9 @@
 # Run <tt>thin -h</tt> to get more usage.
 require File.dirname(__FILE__) + '/../lib/thin'
 require 'optparse'
+require 'yaml'
 
-COMMANDS = %w(start stop restart)
+COMMANDS = %w(start stop restart config)
 
 # Default options values
 options = {
@@ -30,6 +31,7 @@ opts = OptionParser.new do |opts|
 
   opts.on("-a", "--address HOST", "bind to HOST address (default: 0.0.0.0)")      { |host| options[:address] = host }
   opts.on("-p", "--port PORT", "use PORT (default: 3000)")                        { |port| options[:port] = port.to_i }
+  opts.on("-S", "--socket PATH", "bind to unix domain socket")                    { |file| options[:socket] = file }
   opts.on("-e", "--environment ENV", "Rails environment (default: development)")  { |env| options[:environment] = env }
   opts.on("-c", "--chdir PATH", "Change to dir before starting")                  { |dir| options[:chdir] = File.expand_path(dir) }
   opts.on("-s", "--servers NUM", "Number of servers to start",
@@ -44,29 +46,45 @@ opts = OptionParser.new do |opts|
   opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")             { |user| options[:user] = user }
   opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)")           { |group| options[:group] = group }
   opts.on(      "--prefix PATH", "Mount the app under PATH (start with /)")       { |path| options[:prefix] = path }
+  opts.on("-C", "--config PATH", "Load option from a config file")                { |file| options[:config] = file }
+  opts.on(      "--stats", "Install the Stats adapter at /stats")                 { options[:stats] = true }
   
   opts.separator ""
   opts.separator "Common options:"
 
-  opts.on_tail("-D", "--debug", "Set debbuging on") { $DEBUG = true }
-  opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
-  opts.on_tail('-v', '--version', "Show version")   { puts Thin::SERVER; exit }
-
-  opts.parse! ARGV
+  opts.on_tail("-D", "--debug", "Set debbuging on")       { $DEBUG = true }
+  opts.on_tail("-V", "--trace", "Set tracing on")         { $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
 
 
-# == Commands definitions
+# == Utilities
 
 def cluster?(options)
   options[:servers] && options[:servers] > 1
 end
 
+def load_options_from_config_file!(options)
+  if file = options.delete(:config)
+    YAML.load_file(file).each { |key, value| options[key.to_sym] = value }
+  end
+end
+
+
+# == Commands definitions
+
 def start(options)
+  load_options_from_config_file! options
+  
   if cluster?(options)
     Thin::Cluster.new(options).start
   else
-    server = Thin::Server.new(options[:address], options[:port])
+    if options[:socket]
+      server = Thin::Server.new(options[:socket])
+    else
+      server = Thin::Server.new(options[:address], options[:port])
+    end
   
     server.pid_file = options[:pid]
     server.log_file = options[:log]
@@ -82,11 +100,16 @@ def start(options)
     # If a prefix is required, wrap in Rack URL mapper
     server.app = Rack::URLMap.new(options[:prefix] => server.app) if options[:prefix]
     
+    # If a stats are required, wrap in Stats adapter
+    server.app = Thin::Stats::Adapter.new(server.app) if options[:stats]
+    
     server.start!
   end  
 end
 
 def stop(options)
+  load_options_from_config_file! options
+  
   if cluster?(options)
     Thin::Cluster.new(options).stop
   else
@@ -95,6 +118,8 @@ def stop(options)
 end
 
 def restart(options)
+  load_options_from_config_file! options
+  
   if cluster?(options)
     Thin::Cluster.new(options).restart
   else
@@ -106,12 +131,24 @@ def restart(options)
   end
 end
 
+def config(options)
+  config_file = options.delete(:config) || abort('config option required')
+
+  # Stringify keys
+  options.keys.each { |o| options[o.to_s] = options.delete(o) }
+
+  File.open(config_file, 'w') { |f| f << options.to_yaml }
+  puts "Wrote configuration to #{config_file}"
+end
+
 
 # == Runs the command
 
-Dir.chdir(options[:chdir])
+opts.parse! ARGV
 command = ARGV[0]
 
+Dir.chdir(options[:chdir])
+
 if COMMANDS.include?(command)
   send(command, options)
 elsif command.nil?

data/example/adapter.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'thin'
+
+class SimpleAdapter
+  def call(env)
+    [
+      200,
+      { 'Content-Type' => 'text/plain' },
+      ["hello!\n"]
+    ]
+  end
+end
+
+app = Rack::URLMap.new('/test'  => SimpleAdapter.new,
+                       '/files' => Rack::File.new('.'))
+
+Thin::Server.new('0.0.0.0', 3000, app).start!

data/ext/thin_parser/parser.c

@@ -16,7 +16,7 @@
 
 /** Machine **/
 
-#line 65 "parser.rl"
+#line 81 "parser.rl"
 
 
 /** Data **/
@@ -28,7 +28,7 @@ static const int http_parser_error = 0;
 
 static const int http_parser_en_main = 1;
 
-#line 69 "parser.rl"
+#line 85 "parser.rl"
 
 int http_parser_init(http_parser *parser)  {
   int cs = 0;
@@ -37,7 +37,7 @@ int http_parser_init(http_parser *parser)  {
 	{
 	cs = http_parser_start;
 	}
-#line 73 "parser.rl"
+#line 89 "parser.rl"
   parser->cs = cs;
   parser->body_start = 0;
   parser->content_len = 0;
@@ -111,16 +111,18 @@ case 2:
 		goto st38;
 	goto st0;
 tr2:
-#line 34 "parser.rl"
+#line 36 "parser.rl"
 	{ 
-    parser->request_method(parser->data, PTR_TO(mark), LEN(mark, p));
+    if (parser->request_method != NULL) {
+      parser->request_method(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-#line 124 "parser.c"
+#line 126 "parser.c"
 	switch( (*p) ) {
 		case 42: goto tr4;
 		case 43: goto tr5;
@@ -144,61 +146,77 @@ st4:
 	if ( ++p == pe )
 		goto _out4;
 case 4:
-#line 148 "parser.c"
+#line 150 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 35: goto tr9;
 	}
 	goto st0;
 tr8:
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st5;
 tr30:
-#line 40 "parser.rl"
+#line 46 "parser.rl"
 	{ 
-    parser->fragment(parser->data, PTR_TO(mark), LEN(mark, p));
+    if (parser->fragment != NULL) {
+      parser->fragment(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st5;
 tr40:
-#line 53 "parser.rl"
+#line 65 "parser.rl"
 	{
-    parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    if (parser->request_path != NULL) {
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    }
   }
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st5;
 tr51:
-#line 44 "parser.rl"
+#line 52 "parser.rl"
 	{MARK(query_start, p); }
-#line 45 "parser.rl"
+#line 53 "parser.rl"
 	{ 
-    parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    if (parser->query_string != NULL) {
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    }
   }
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st5;
 tr55:
-#line 45 "parser.rl"
+#line 53 "parser.rl"
 	{ 
-    parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    if (parser->query_string != NULL) {
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    }
   }
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _out5;
 case 5:
-#line 202 "parser.c"
+#line 220 "parser.c"
 	if ( (*p) == 72 )
 		goto tr10;
 	goto st0;
@@ -210,7 +228,7 @@ st6:
 	if ( ++p == pe )
 		goto _out6;
 case 6:
-#line 214 "parser.c"
+#line 232 "parser.c"
 	if ( (*p) == 84 )
 		goto st7;
 	goto st0;
@@ -268,22 +286,26 @@ case 13:
 		goto st13;
 	goto st0;
 tr18:
-#line 49 "parser.rl"
+#line 59 "parser.rl"
 	{	
-    parser->http_version(parser->data, PTR_TO(mark), LEN(mark, p));
+    if (parser->http_version != NULL) {
+      parser->http_version(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st14;
 tr26:
 #line 31 "parser.rl"
 	{ 
-    parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
+    if (parser->http_field != NULL) {
+      parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st14;
 st14:
 	if ( ++p == pe )
 		goto _out14;
 case 14:
-#line 287 "parser.c"
+#line 309 "parser.c"
 	if ( (*p) == 10 )
 		goto st15;
 	goto st0;
@@ -323,10 +345,12 @@ case 16:
 		goto tr22;
 	goto st0;
 tr22:
-#line 57 "parser.rl"
+#line 71 "parser.rl"
 	{ 
     parser->body_start = p - buffer + 1; 
-    parser->header_done(parser->data, p + 1, pe - p - 1);
+    if (parser->header_done != NULL) {
+      parser->header_done(parser->data, p + 1, pe - p - 1);
+    }
     goto _out57;
   }
 	goto st57;
@@ -334,7 +358,7 @@ st57:
 	if ( ++p == pe )
 		goto _out57;
 case 57:
-#line 338 "parser.c"
+#line 362 "parser.c"
 	goto st0;
 tr21:
 #line 25 "parser.rl"
@@ -344,7 +368,7 @@ st17:
 	if ( ++p == pe )
 		goto _out17;
 case 17:
-#line 348 "parser.c"
+#line 372 "parser.c"
 	switch( (*p) ) {
 		case 33: goto st17;
 		case 58: goto tr24;
@@ -383,7 +407,7 @@ st18:
 	if ( ++p == pe )
 		goto _out18;
 case 18:
-#line 387 "parser.c"
+#line 411 "parser.c"
 	switch( (*p) ) {
 		case 13: goto tr26;
 		case 32: goto tr27;
@@ -397,53 +421,67 @@ st19:
 	if ( ++p == pe )
 		goto _out19;
 case 19:
-#line 401 "parser.c"
+#line 425 "parser.c"
 	if ( (*p) == 13 )
 		goto tr26;
 	goto st19;
 tr9:
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st20;
 tr41:
-#line 53 "parser.rl"
+#line 65 "parser.rl"
 	{
-    parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    if (parser->request_path != NULL) {
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    }
   }
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st20;
 tr52:
-#line 44 "parser.rl"
+#line 52 "parser.rl"
 	{MARK(query_start, p); }
-#line 45 "parser.rl"
+#line 53 "parser.rl"
 	{ 
-    parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    if (parser->query_string != NULL) {
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    }
   }
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st20;
 tr56:
-#line 45 "parser.rl"
+#line 53 "parser.rl"
 	{ 
-    parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    if (parser->query_string != NULL) {
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+    }
   }
-#line 37 "parser.rl"
-	{ 
-    parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+#line 41 "parser.rl"
+	{
+    if (parser->request_uri != NULL) {
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st20;
 st20:
 	if ( ++p == pe )
 		goto _out20;
 case 20:
-#line 447 "parser.c"
+#line 485 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr30;
 		case 37: goto tr31;
@@ -465,7 +503,7 @@ st21:
 	if ( ++p == pe )
 		goto _out21;
 case 21:
-#line 469 "parser.c"
+#line 507 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr30;
 		case 37: goto st22;
@@ -487,7 +525,7 @@ st22:
 	if ( ++p == pe )
 		goto _out22;
 case 22:
-#line 491 "parser.c"
+#line 529 "parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st23;
@@ -518,7 +556,7 @@ st24:
 	if ( ++p == pe )
 		goto _out24;
 case 24:
-#line 522 "parser.c"
+#line 560 "parser.c"
 	switch( (*p) ) {
 		case 43: goto st24;
 		case 58: goto st25;
@@ -543,7 +581,7 @@ st25:
 	if ( ++p == pe )
 		goto _out25;
 case 25:
-#line 547 "parser.c"
+#line 585 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 34: goto st0;
@@ -590,7 +628,7 @@ st28:
 	if ( ++p == pe )
 		goto _out28;
 case 28:
-#line 594 "parser.c"
+#line 632 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr40;
 		case 34: goto st0;
@@ -632,16 +670,18 @@ case 30:
 		goto st28;
 	goto st0;
 tr43:
-#line 53 "parser.rl"
+#line 65 "parser.rl"
 	{
-    parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    if (parser->request_path != NULL) {
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    }
   }
 	goto st31;
 st31:
 	if ( ++p == pe )
 		goto _out31;
 case 31:
-#line 645 "parser.c"
+#line 685 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 34: goto st0;
@@ -682,16 +722,18 @@ case 33:
 		goto st31;
 	goto st0;
 tr44:
-#line 53 "parser.rl"
+#line 65 "parser.rl"
 	{
-    parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    if (parser->request_path != NULL) {
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    }
   }
 	goto st34;
 st34:
 	if ( ++p == pe )
 		goto _out34;
 case 34:
-#line 695 "parser.c"
+#line 737 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr51;
 		case 34: goto st0;
@@ -705,14 +747,14 @@ case 34:
 		goto st0;
 	goto tr50;
 tr50:
-#line 44 "parser.rl"
+#line 52 "parser.rl"
 	{MARK(query_start, p); }
 	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _out35;
 case 35:
-#line 716 "parser.c"
+#line 758 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr55;
 		case 34: goto st0;
@@ -726,14 +768,14 @@ case 35:
 		goto st0;
 	goto st35;
 tr53:
-#line 44 "parser.rl"
+#line 52 "parser.rl"
 	{MARK(query_start, p); }
 	goto st36;
 st36:
 	if ( ++p == pe )
 		goto _out36;
 case 36:
-#line 737 "parser.c"
+#line 779 "parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st37;
@@ -1148,7 +1190,7 @@ case 56:
 
 	_out: {}
 	}
-#line 100 "parser.rl"
+#line 116 "parser.rl"
 
   parser->cs = cs;
   parser->nread += p - (buffer + off);
@@ -1163,8 +1205,8 @@ case 56:
   if(parser->body_start) {
     /* final \r\n combo encountered so stop right here */
     
-#line 1167 "parser.c"
-#line 114 "parser.rl"
+#line 1209 "parser.c"
+#line 130 "parser.rl"
     parser->nread++;
   }
 
@@ -1176,8 +1218,8 @@ int http_parser_finish(http_parser *parser)
   int cs = parser->cs;
 
   
-#line 1180 "parser.c"
-#line 125 "parser.rl"
+#line 1222 "parser.c"
+#line 141 "parser.rl"
 
   parser->cs = cs;