thin 1.2.7-x86-mswin32 → 1.2.8-x86-mswin32

data/CHANGELOG

@@ -1,3 +1,32 @@
+== 1.2.8 Black Keys
+ * Allow the connection to remain open for 1xx statuses [timshadel]
+
+     Both the 100 and 101 status codes require that the connection to the
+     server remain open. The 100 status code is used to tell the client that
+     the server is still receiving its request, and will continue to read
+     request input on the connection. The 101 status code is used to upgrade
+     the existing connection to another protocol, and specifically is NOT
+     used to upgrade a separate connection. Therefore, the connection must
+     remain open after this response in order to facilitate that.
+   
+ * Accept IE7 badly encoded URL (eg.: %uEEEE)
+ * Fix gemspec to work w/ Bundler [smparkes]
+ * Add SSL support [tmm1]
+ * Catch Errno::EPERM in Process.running? [Tony Kemp]
+   On some systems (e.g. OpenBSD) you receive an EPERM exception if
+   you try to Process.getpgid on a process you do not own (even if you
+   are root). But it does mean that the process exists, so return true.
+ * Fix Rails version check that select which Rack adapter to use. Was using CGI adapter in Rails 3.
+ * Ignore SIGHUP when no restart block is given
+ * Add SSL options to thin command line tool [goldmann]
+
+      --ssl                    Enables SSL
+      --ssl-key-file PATH      Path to private key
+      --ssl-cert-file PATH     Path to certificate
+      --ssl-verify             Enables SSL certificate verification
+  * Expose peer SSL certificate in env (rack.peer_cert) [fd]
+  * Adjusting unix socket permissions to be more open [mbj]
+  
 == 1.2.7 No Hup
  * Support multiple Ruby version (fat binaries under windows)
  * Do not trap unsupported HUP signal on Windows

data/Rakefile

@@ -37,7 +37,7 @@ end
 
 desc "Build gem packages"
 task :gems do
-  sh "rvm use 1.8.6; rake clean gem && rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1"
+  sh "rake clean gem && rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1"
 end
 
 desc "Release version #{Thin::VERSION::STRING} gems to rubyforge"

data/example/monit_sockets

@@ -1,7 +1,7 @@
 check process blog1
     with pidfile /u/apps/blog/shared/pids/thin.14000.pid
-    start program = "/usr/local/bin/ruby /usr/local/bin/thin start -d -e production -u nobody -g nobody -p 14000 -a 127.0.0.1 -P tmp/pids/thin.14000.pid -c /u/apps/blog/current"
-    stop program  = "/usr/local/bin/ruby /usr/local/bin/thin stop -P /u/apps/blog/shared/pids/thin.14000.pid"
+    start program = "ruby thin start -d -e production -u nobody -g nobody -p 14000 -a 127.0.0.1 -P tmp/pids/thin.14000.pid -c /u/apps/blog/current"
+    stop program  = "ruby thin stop -P /u/apps/blog/shared/pids/thin.14000.pid"
     if totalmem > 90.0 MB for 5 cycles then restart
     if failed port 14000 then restart
     if cpu usage > 95% for 3 cycles then restart
@@ -10,8 +10,8 @@ check process blog1
 
 check process blog2
     with pidfile /u/apps/blog/shared/pids/thin.14001.pid
-    start program = "/usr/local/bin/ruby /usr/local/bin/thin start -d -e production -u nobody -g nobody -p 14001 -a 127.0.0.1 -P tmp/pids/thin.14001.pid -c /u/apps/blog/current"
-    stop program  = "/usr/local/bin/ruby /usr/local/bin/thin stop -P /u/apps/blog/shared/pids/thin.14001.pid"
+    start program = "ruby thin start -d -e production -u nobody -g nobody -p 14001 -a 127.0.0.1 -P tmp/pids/thin.14001.pid -c /u/apps/blog/current"
+    stop program  = "ruby thin stop -P /u/apps/blog/shared/pids/thin.14001.pid"
     if totalmem > 90.0 MB for 5 cycles then restart
     if failed port 14001 then restart
     if cpu usage > 95% for 3 cycles then restart

data/example/monit_unixsock

@@ -1,7 +1,7 @@
 check process blog1
     with pidfile /u/apps/blog/shared/pids/thin.1.pid
-    start program = "/usr/local/bin/ruby /usr/local/bin/thin start -d -e production -S /u/apps/blog/shared/pids/thin.1.sock -P tmp/pids/thin.1.pid -c /u/apps/blog/current"
-    stop program  = "/usr/local/bin/ruby /usr/local/bin/thin stop -P /u/apps/blog/shared/pids/thin.1.pid"
+    start program = "ruby thin start -d -e production -S /u/apps/blog/shared/pids/thin.1.sock -P tmp/pids/thin.1.pid -c /u/apps/blog/current"
+    stop program  = "ruby thin stop -P /u/apps/blog/shared/pids/thin.1.pid"
     if totalmem > 90.0 MB for 5 cycles then restart
 		if failed unixsocket /u/apps/blog/shared/pids/thin.1.sock then restart
     if cpu usage > 95% for 3 cycles then restart
@@ -10,8 +10,8 @@ check process blog1
 
 check process blog2
     with pidfile /u/apps/blog/shared/pids/thin.2.pid
-    start program = "/usr/local/bin/ruby /usr/local/bin/thin start -d -e production -S /u/apps/blog/shared/pids/thin.2.sock -P tmp/pids/thin.2.pid -c /u/apps/blog/current"
-    stop program  = "/usr/local/bin/ruby /usr/local/bin/thin stop -P /u/apps/blog/shared/pids/thin.2.pid"
+    start program = "ruby thin start -d -e production -S /u/apps/blog/shared/pids/thin.2.sock -P tmp/pids/thin.2.pid -c /u/apps/blog/current"
+    stop program  = "ruby thin stop -P /u/apps/blog/shared/pids/thin.2.pid"
     if totalmem > 90.0 MB for 5 cycles then restart
 		if failed unixsocket /u/apps/blog/shared/pids/thin.2.sock then restart
     if cpu usage > 95% for 3 cycles then restart

data/ext/thin_parser/common.rl

@@ -15,7 +15,7 @@
   unsafe = (CTL | " " | "#" | "%" | sorta_safe);
   national = any -- (alpha | digit | reserved | extra | safe | unsafe);
   unreserved = (alpha | digit | safe | extra | national);
-  escape = ("%" xdigit xdigit);
+  escape = ("%" "u"? xdigit xdigit);
   uchar = (unreserved | escape | sorta_safe);
   pchar = (uchar | ":" | "@" | "&" | "=" | "+");
   tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");

data/ext/thin_parser/parser.c

@@ -25,7 +25,7 @@
 
 #line 27 "parser.c"
 static const int http_parser_start = 1;
-static const int http_parser_first_final = 54;
+static const int http_parser_first_final = 58;
 static const int http_parser_error = 0;
 
 static const int http_parser_en_main = 1;
@@ -103,17 +103,17 @@ case 2:
 #line 104 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st35;
-		case 95: goto st35;
+		case 36: goto st39;
+		case 95: goto st39;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st35;
+			goto st39;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st35;
+			goto st39;
 	} else
-		goto st35;
+		goto st39;
 	goto st0;
 tr2:
 #line 36 "parser.rl"
@@ -183,7 +183,7 @@ tr34:
     }
   }
 	goto st5;
-tr42:
+tr44:
 #line 65 "parser.rl"
 	{
     if (parser->request_path != NULL) {
@@ -197,7 +197,7 @@ tr42:
     }
   }
 	goto st5;
-tr48:
+tr51:
 #line 52 "parser.rl"
 	{MARK(query_start, p); }
 #line 53 "parser.rl"
@@ -213,7 +213,7 @@ tr48:
     }
   }
 	goto st5;
-tr52:
+tr55:
 #line 53 "parser.rl"
 	{ 
     if (parser->query_string != NULL) {
@@ -376,13 +376,13 @@ tr22:
     if (parser->header_done != NULL) {
       parser->header_done(parser->data, p + 1, pe - p - 1);
     }
-    {p++; cs = 54; goto _out;}
+    {p++; cs = 58; goto _out;}
   }
-	goto st54;
-st54:
+	goto st58;
+st58:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
+		goto _test_eof58;
+case 58:
 #line 387 "parser.c"
 	goto st0;
 tr21:
@@ -458,7 +458,7 @@ tr9:
     }
   }
 	goto st20;
-tr43:
+tr45:
 #line 65 "parser.rl"
 	{
     if (parser->request_path != NULL) {
@@ -472,7 +472,7 @@ tr43:
     }
   }
 	goto st20;
-tr49:
+tr52:
 #line 52 "parser.rl"
 	{MARK(query_start, p); }
 #line 53 "parser.rl"
@@ -488,7 +488,7 @@ tr49:
     }
   }
 	goto st20;
-tr53:
+tr56:
 #line 53 "parser.rl"
 	{ 
     if (parser->query_string != NULL) {
@@ -543,6 +543,8 @@ st22:
 		goto _test_eof22;
 case 22:
 #line 546 "parser.c"
+	if ( (*p) == 117 )
+		goto st24;
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st23;
@@ -565,111 +567,94 @@ case 23:
 	} else
 		goto st21;
 	goto st0;
-tr5:
-#line 22 "parser.rl"
-	{MARK(mark, p); }
-	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 577 "parser.c"
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st23;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st23;
+	} else
+		goto st23;
+	goto st0;
+tr5:
+#line 22 "parser.rl"
+	{MARK(mark, p); }
+	goto st25;
+st25:
+	if ( ++p == pe )
+		goto _test_eof25;
+case 25:
+#line 592 "parser.c"
 	switch( (*p) ) {
-		case 43: goto st24;
-		case 58: goto st25;
+		case 43: goto st25;
+		case 58: goto st26;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st24;
+			goto st25;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) > 90 ) {
 			if ( 97 <= (*p) && (*p) <= 122 )
-				goto st24;
+				goto st25;
 		} else if ( (*p) >= 65 )
-			goto st24;
+			goto st25;
 	} else
-		goto st24;
+		goto st25;
 	goto st0;
 tr7:
 #line 22 "parser.rl"
 	{MARK(mark, p); }
-	goto st25;
-st25:
+	goto st26;
+st26:
 	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
-#line 602 "parser.c"
+		goto _test_eof26;
+case 26:
+#line 617 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 35: goto tr9;
-		case 37: goto st26;
+		case 37: goto st27;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto st25;
-st26:
-	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st27;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st27;
-	} else
-		goto st27;
-	goto st0;
+	goto st26;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
+	if ( (*p) == 117 )
+		goto st29;
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st25;
+			goto st28;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st25;
+			goto st28;
 	} else
-		goto st25;
+		goto st28;
 	goto st0;
-tr6:
-#line 22 "parser.rl"
-	{MARK(mark, p); }
-	goto st28;
 st28:
 	if ( ++p == pe )
 		goto _test_eof28;
 case 28:
-#line 646 "parser.c"
-	switch( (*p) ) {
-		case 32: goto tr42;
-		case 35: goto tr43;
-		case 37: goto st29;
-		case 63: goto tr45;
-		case 127: goto st0;
-	}
-	if ( 0 <= (*p) && (*p) <= 31 )
-		goto st0;
-	goto st28;
-st29:
-	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st30;
+			goto st26;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st30;
+			goto st26;
 	} else
-		goto st30;
+		goto st26;
 	goto st0;
-st30:
+st29:
 	if ( ++p == pe )
-		goto _test_eof30;
-case 30:
+		goto _test_eof29;
+case 29:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st28;
@@ -679,68 +664,57 @@ case 30:
 	} else
 		goto st28;
 	goto st0;
-tr45:
-#line 65 "parser.rl"
-	{
-    if (parser->request_path != NULL) {
-      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
-    }
-  }
-	goto st31;
-st31:
+tr6:
+#line 22 "parser.rl"
+	{MARK(mark, p); }
+	goto st30;
+st30:
 	if ( ++p == pe )
-		goto _test_eof31;
-case 31:
-#line 695 "parser.c"
+		goto _test_eof30;
+case 30:
+#line 676 "parser.c"
 	switch( (*p) ) {
-		case 32: goto tr48;
-		case 35: goto tr49;
-		case 37: goto tr50;
+		case 32: goto tr44;
+		case 35: goto tr45;
+		case 37: goto st31;
+		case 63: goto tr47;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr47;
-tr47:
-#line 52 "parser.rl"
-	{MARK(query_start, p); }
-	goto st32;
+	goto st30;
+st31:
+	if ( ++p == pe )
+		goto _test_eof31;
+case 31:
+	if ( (*p) == 117 )
+		goto st33;
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st32;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st32;
+	} else
+		goto st32;
+	goto st0;
 st32:
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
-#line 713 "parser.c"
-	switch( (*p) ) {
-		case 32: goto tr52;
-		case 35: goto tr53;
-		case 37: goto st33;
-		case 127: goto st0;
-	}
-	if ( 0 <= (*p) && (*p) <= 31 )
-		goto st0;
-	goto st32;
-tr50:
-#line 52 "parser.rl"
-	{MARK(query_start, p); }
-	goto st33;
-st33:
-	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
-#line 731 "parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st34;
+			goto st30;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st34;
+			goto st30;
 	} else
-		goto st34;
+		goto st30;
 	goto st0;
-st34:
+st33:
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
+		goto _test_eof33;
+case 33:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st32;
@@ -750,38 +724,62 @@ case 34:
 	} else
 		goto st32;
 	goto st0;
+tr47:
+#line 65 "parser.rl"
+	{
+    if (parser->request_path != NULL) {
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+    }
+  }
+	goto st34;
+st34:
+	if ( ++p == pe )
+		goto _test_eof34;
+case 34:
+#line 740 "parser.c"
+	switch( (*p) ) {
+		case 32: goto tr51;
+		case 35: goto tr52;
+		case 37: goto tr53;
+		case 127: goto st0;
+	}
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto tr50;
+tr50:
+#line 52 "parser.rl"
+	{MARK(query_start, p); }
+	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
+#line 758 "parser.c"
 	switch( (*p) ) {
-		case 32: goto tr2;
-		case 36: goto st36;
-		case 95: goto st36;
+		case 32: goto tr55;
+		case 35: goto tr56;
+		case 37: goto st36;
+		case 127: goto st0;
 	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st36;
-	} else if ( (*p) > 57 ) {
-		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st36;
-	} else
-		goto st36;
-	goto st0;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st35;
+tr53:
+#line 52 "parser.rl"
+	{MARK(query_start, p); }
+	goto st36;
 st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-	switch( (*p) ) {
-		case 32: goto tr2;
-		case 36: goto st37;
-		case 95: goto st37;
-	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
+#line 776 "parser.c"
+	if ( (*p) == 117 )
+		goto st38;
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st37;
-	} else if ( (*p) > 57 ) {
-		if ( 65 <= (*p) && (*p) <= 90 )
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
 			goto st37;
 	} else
 		goto st37;
@@ -790,37 +788,27 @@ st37:
 	if ( ++p == pe )
 		goto _test_eof37;
 case 37:
-	switch( (*p) ) {
-		case 32: goto tr2;
-		case 36: goto st38;
-		case 95: goto st38;
-	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st38;
-	} else if ( (*p) > 57 ) {
-		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st38;
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st35;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st35;
 	} else
-		goto st38;
+		goto st35;
 	goto st0;
 st38:
 	if ( ++p == pe )
 		goto _test_eof38;
 case 38:
-	switch( (*p) ) {
-		case 32: goto tr2;
-		case 36: goto st39;
-		case 95: goto st39;
-	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st39;
-	} else if ( (*p) > 57 ) {
-		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st39;
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st37;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st37;
 	} else
-		goto st39;
+		goto st37;
 	goto st0;
 st39:
 	if ( ++p == pe )
@@ -1078,6 +1066,78 @@ st53:
 	if ( ++p == pe )
 		goto _test_eof53;
 case 53:
+	switch( (*p) ) {
+		case 32: goto tr2;
+		case 36: goto st54;
+		case 95: goto st54;
+	}
+	if ( (*p) < 48 ) {
+		if ( 45 <= (*p) && (*p) <= 46 )
+			goto st54;
+	} else if ( (*p) > 57 ) {
+		if ( 65 <= (*p) && (*p) <= 90 )
+			goto st54;
+	} else
+		goto st54;
+	goto st0;
+st54:
+	if ( ++p == pe )
+		goto _test_eof54;
+case 54:
+	switch( (*p) ) {
+		case 32: goto tr2;
+		case 36: goto st55;
+		case 95: goto st55;
+	}
+	if ( (*p) < 48 ) {
+		if ( 45 <= (*p) && (*p) <= 46 )
+			goto st55;
+	} else if ( (*p) > 57 ) {
+		if ( 65 <= (*p) && (*p) <= 90 )
+			goto st55;
+	} else
+		goto st55;
+	goto st0;
+st55:
+	if ( ++p == pe )
+		goto _test_eof55;
+case 55:
+	switch( (*p) ) {
+		case 32: goto tr2;
+		case 36: goto st56;
+		case 95: goto st56;
+	}
+	if ( (*p) < 48 ) {
+		if ( 45 <= (*p) && (*p) <= 46 )
+			goto st56;
+	} else if ( (*p) > 57 ) {
+		if ( 65 <= (*p) && (*p) <= 90 )
+			goto st56;
+	} else
+		goto st56;
+	goto st0;
+st56:
+	if ( ++p == pe )
+		goto _test_eof56;
+case 56:
+	switch( (*p) ) {
+		case 32: goto tr2;
+		case 36: goto st57;
+		case 95: goto st57;
+	}
+	if ( (*p) < 48 ) {
+		if ( 45 <= (*p) && (*p) <= 46 )
+			goto st57;
+	} else if ( (*p) > 57 ) {
+		if ( 65 <= (*p) && (*p) <= 90 )
+			goto st57;
+	} else
+		goto st57;
+	goto st0;
+st57:
+	if ( ++p == pe )
+		goto _test_eof57;
+case 57:
 	if ( (*p) == 32 )
 		goto tr2;
 	goto st0;
@@ -1097,7 +1157,7 @@ case 53:
 	_test_eof14: cs = 14; goto _test_eof; 
 	_test_eof15: cs = 15; goto _test_eof; 
 	_test_eof16: cs = 16; goto _test_eof; 
-	_test_eof54: cs = 54; goto _test_eof; 
+	_test_eof58: cs = 58; goto _test_eof; 
 	_test_eof17: cs = 17; goto _test_eof; 
 	_test_eof18: cs = 18; goto _test_eof; 
 	_test_eof19: cs = 19; goto _test_eof; 
@@ -1135,6 +1195,10 @@ case 53:
 	_test_eof51: cs = 51; goto _test_eof; 
 	_test_eof52: cs = 52; goto _test_eof; 
 	_test_eof53: cs = 53; goto _test_eof; 
+	_test_eof54: cs = 54; goto _test_eof; 
+	_test_eof55: cs = 55; goto _test_eof; 
+	_test_eof56: cs = 56; goto _test_eof; 
+	_test_eof57: cs = 57; goto _test_eof; 
 
 	_test_eof: {}
 	_out: {}

data/lib/rack/adapter/rails.rb

@@ -22,7 +22,7 @@ module Rack
         
         load_application
         
-        @rails_app = if rack_based?
+        @rails_app = if self.class.rack_based?
           ActionController::Dispatcher.new
         else
           CgiApp.new
@@ -31,11 +31,6 @@ module Rack
         @file_app = Rack::File.new(::File.join(RAILS_ROOT, "public"))
       end
       
-      def rack_based?
-        rails_version = ::Rails::VERSION
-        rails_version::MAJOR >= 2 && rails_version::MINOR >= 2 && rails_version::TINY >= 3
-      end
-      
       def load_application
         ENV['RAILS_ENV'] = @env
 
@@ -73,6 +68,14 @@ module Rack
         # No static file, let Rails handle it
         @rails_app.call(env)
       end
+      
+      def self.rack_based?
+        rails_version = ::Rails::VERSION
+        return false if rails_version::MAJOR < 2
+        return false if rails_version::MAJOR == 2 && rails_version::MINOR < 2
+        return false if rails_version::MAJOR == 2 && rails_version::MINOR == 2 && rails_version::TINY < 3
+        true # >= 2.2.3
+      end
     
       protected
         # For Rails pre Rack (2.3)

data/lib/thin/backends/base.rb

@@ -27,6 +27,10 @@ module Thin
       attr_writer :threaded
       def threaded?; @threaded end
       
+      # Allow using SSL in the backend.
+      attr_writer :ssl, :ssl_options
+      def ssl?; @ssl end
+      
       # Number of persistent connections currently opened
       attr_accessor :persistent_connection_count
       
@@ -125,6 +129,10 @@ module Thin
           connection.app                     = @server.app
           connection.comm_inactivity_timeout = @timeout
           connection.threaded                = @threaded
+          
+          if @ssl
+            connection.start_tls(@ssl_options)
+          end
 
           # We control the number of persistent connections by keeping
           # a count of the total one allowed yet.

data/lib/thin/backends/unix_server.rb

@@ -14,10 +14,15 @@ module Thin
       # Connect the server
       def connect
         at_exit { remove_socket_file } # In case it crashes
-        EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
-        # HACK EventMachine.start_unix_domain_server doesn't return the connection signature
-        #      so we have to go in the internal stuff to find it.
+        old_umask = File.umask(0)
+        begin
+          EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
+          # HACK EventMachine.start_unix_domain_server doesn't return the connection signature
+          #      so we have to go in the internal stuff to find it.
         @signature = EventMachine.instance_eval{@acceptors.keys.first}
+        ensure
+          File.umask(old_umask)
+        end
       end
       
       # Stops the server
@@ -48,4 +53,4 @@ module Thin
         '127.0.0.1' # Unix domain sockets can only be local
       end
   end
-end
+end

data/lib/thin/connection.rb

@@ -29,7 +29,7 @@ module Thin
     # Calling the application in a threaded allowing
     # concurrent processing of requests.
     attr_writer :threaded
-
+    
     # Get the connection ready to process a request.
     def post_init
       @request  = Request.new
@@ -67,6 +67,14 @@ module Thin
       # callback is no longer referenced, so be tidy!
       @request.async_callback = method(:post_process)
       
+      if @backend.ssl?
+        @request.env["rack.url_scheme"] = "https"
+        
+        if cert = get_peer_cert
+          @request.env['rack.peer_cert'] = cert
+        end
+      end
+
       # When we're under a non-async framework like rails, we can still spawn
       # off async responses using the callback info, so there's little point
       # in removing this.

data/lib/thin/controllers/controller.rb

@@ -51,6 +51,12 @@ module Thin
         server.threaded                       = @options[:threaded]
         server.no_epoll                       = @options[:no_epoll] if server.backend.respond_to?(:no_epoll=)
 
+        # ssl support
+        if @options[:ssl]
+          server.ssl = true
+          server.ssl_options = { :private_key_file => @options[:ssl_key_file], :cert_chain_file => @options[:ssl_cert_file], :verify_peer => @options[:ssl_verify] }
+        end
+
         # Detach the process, after this line the current process returns
         server.daemonize if @options[:daemonize]
 

data/lib/thin/daemonizing.rb

@@ -5,6 +5,8 @@ module Process
   # Returns +true+ the process identied by +pid+ is running.
   def running?(pid)
     Process.getpgid(pid) != -1
+  rescue Errno::EPERM
+    true
   rescue Errno::ESRCH
     false
   end
@@ -44,6 +46,7 @@ module Thin
       # HACK we need to create the directory before daemonization to prevent a bug under 1.9
       #      ignoring all signals when the directory is created after daemonization.
       FileUtils.mkdir_p File.dirname(@pid_file)
+      FileUtils.mkdir_p File.dirname(@log_file)
       
       Daemonize.daemonize(File.expand_path(@log_file), name)
       
@@ -83,12 +86,13 @@ module Thin
     
     # Restart the server.
     def restart
-      raise ArgumentError, "Can't restart, no 'on_restart' proc specified" unless @on_restart
-      log '>> Restarting ...'
-      stop
-      remove_pid_file
-      @on_restart.call
-      exit!
+      if @on_restart
+        log '>> Restarting ...'
+        stop
+        remove_pid_file
+        @on_restart.call
+        exit!
+      end
     end
     
     module ClassMethods

data/lib/thin/response.rb

@@ -7,6 +7,8 @@ module Thin
     SERVER         = 'Server'.freeze
     CONTENT_LENGTH = 'Content-Length'.freeze
 
+    PERSISTENT_STATUSES  = [100, 101].freeze
+
     # Status code
     attr_accessor :status
 
@@ -93,9 +95,10 @@ module Thin
     end
 
     # Persistent connection must be requested as keep-alive
-    # from the server and have a Content-Length.
+    # from the server and have a Content-Length, or the response
+    # status must require that the connection remain open.
     def persistent?
-      @persistent && @headers.has_key?(CONTENT_LENGTH)
+      (@persistent && @headers.has_key?(CONTENT_LENGTH)) || PERSISTENT_STATUSES.include?(@status)
     end
   end
 end

data/lib/thin/runner.rb

@@ -70,7 +70,15 @@ module Thin
                                        "Rack adapter")                                  { |file| @options[:rackup] = file }
         opts.on("-c", "--chdir DIR", "Change to dir before starting")                   { |dir| @options[:chdir] = File.expand_path(dir) }
         opts.on(      "--stats PATH", "Mount the Stats adapter under PATH")             { |path| @options[:stats] = path }
-        
+
+        opts.separator ""
+        opts.separator "SSL options:"
+
+        opts.on(      "--ssl", "Enables SSL")                                           { @options[:ssl] = true }
+        opts.on(      "--ssl-key-file PATH", "Path to private key")                     { |path| @options[:ssl_key_file] = path }
+        opts.on(      "--ssl-cert-file PATH", "Path to certificate")                    { |path| @options[:ssl_cert_file] = path }
+        opts.on(      "--ssl-verify", "Enables SSL certificate verification")           { @options[:ssl_verify] = true }
+
         opts.separator ""
         opts.separator "Adapter options:"
         opts.on("-e", "--environment ENV", "Framework environment " +                       
@@ -122,7 +130,7 @@ module Thin
         opts.separator "Common options:"
 
         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("-D", "--debug", "Set debugging 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 }

data/lib/thin/server.rb

@@ -82,6 +82,9 @@ module Thin
     # Allow using threads in the backend.
     def_delegators :backend, :threaded?, :threaded=
     
+    # Allow using SSL in the backend.
+    def_delegators :backend, :ssl?, :ssl=, :ssl_options=
+    
     # Address and port on which the server is listening for connections.
     def_delegators :backend, :host, :port
     

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 7
+    TINY     = 8
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "No Hup".freeze
+    CODENAME = "Black Keys".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/spec/connection_spec.rb

@@ -4,6 +4,7 @@ describe Connection do
   before do
     @connection = Connection.new(mock('EM', :null_object => true))
     @connection.post_init
+    @connection.backend = mock("backend", :ssl? => false)
     @connection.app = proc do |env|
       [200, {}, ['']]
     end

data/spec/daemonizing_spec.rb

@@ -150,6 +150,10 @@ describe 'Daemonizing' do
     proc { sleep 0.1 while File.exist?(@server.pid_file) }.should take_less_then(10)
   end
   
+  it "should ignore if no restart block specified" do
+    TestServer.restart(@server.pid_file)
+  end
+  
   it "should not restart when not running" do
     silence_stream STDOUT do
       TestServer.restart(@server.pid_file)

data/spec/rack/rails_adapter_spec.rb

@@ -9,7 +9,7 @@ begin
       @rails_app_path = File.dirname(__FILE__) + '/../rails_app'
       @request = Rack::MockRequest.new(Rack::Adapter::Rails.new(:root => @rails_app_path))
     end
-  
+    
     it "should handle simple GET request" do
       res = @request.get("/simple", :lint => true)
 
@@ -104,3 +104,70 @@ begin
 rescue Gem::LoadError
   warn 'Rails 2.0.2 is required to run the Rails adapter specs'
 end
+
+module RailsMock
+  module VERSION
+    MAJOR = 0
+    MINOR = 0
+    TINY = 0
+  end
+end
+
+describe Rack::Adapter::Rails, "Adapter version" do
+  before do
+    unless defined?(::Rails)
+      ::Rails = RailsMock
+    end
+  end
+  
+  it "should use Rack based adapter when Rails = 2.2.3" do
+    with_rails_version(2, 2, 3) do
+      Rack::Adapter::Rails.should be_rack_based
+    end
+  end
+
+  it "should not use Rack based adapter when Rails < 2.2.3" do
+    with_rails_version(2, 2, 2) do
+      Rack::Adapter::Rails.should_not be_rack_based
+    end
+  end
+
+  it "should not use Rack based adapter when Rails = 1.2.3" do
+    with_rails_version(1, 2, 2) do
+      Rack::Adapter::Rails.should_not be_rack_based
+    end
+  end
+  
+  it "should use Rack based adapter when Rails = 3.0.0" do
+    with_rails_version(3, 0, 0) do
+      Rack::Adapter::Rails.should be_rack_based
+    end
+  end
+  
+  def with_rails_version(major, minor, tiny)
+    old_major = ::Rails::VERSION::MAJOR
+    old_minor = ::Rails::VERSION::MINOR
+    old_tiny = ::Rails::VERSION::TINY
+    
+    silence_warnings do
+      ::Rails::VERSION.const_set :MAJOR, major
+      ::Rails::VERSION.const_set :MINOR, minor
+      ::Rails::VERSION.const_set :TINY, tiny
+    end
+    
+    yield
+    
+    silence_warnings do
+      ::Rails::VERSION.const_set :MAJOR, old_major
+      ::Rails::VERSION.const_set :MINOR, old_minor
+      ::Rails::VERSION.const_set :TINY, old_tiny
+    end
+  end
+  
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end unless method_defined?(:silence_warnings)
+end

data/spec/rails_app/public/dispatch.cgi

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
@@ -7,4 +7,4 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
 require "dispatcher"
 
 ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
-Dispatcher.dispatch
+Dispatcher.dispatch

data/spec/rails_app/public/dispatch.fcgi

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 #
 # You may specify the path to the FastCGI crash log (a log of unhandled
 # exceptions which forced the FastCGI instance to exit, great for debugging)

data/spec/rails_app/public/dispatch.rb

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
@@ -7,4 +7,4 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
 require "dispatcher"
 
 ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
-Dispatcher.dispatch
+Dispatcher.dispatch

data/spec/request/parser_spec.rb

@@ -240,4 +240,15 @@ EOS
       env[pi].should == uri.path
     end
   end
+  
+  it "should parse IE7 badly encoded URL" do
+    body = <<-EOS.chomp
+GET /H%uFFFDhnchenbrustfilet HTTP/1.1
+Host: localhost:3000
+
+EOS
+    request = R(body, true)
+
+    request.env['REQUEST_URI'].should == "/H%uFFFDhnchenbrustfilet"
+  end
 end

data/spec/response_spec.rb

@@ -80,6 +80,17 @@ describe Response do
     @response.should_not be_persistent
   end
   
+  it "should be persistent when the status code implies it should stay open" do
+    @response = Response.new
+    @response.status = 100
+    # "There are no required headers for this class of status code" -- HTTP spec 10.1
+    @response.body = ''
+
+    # Specifying it as persistent in the code is NOT required
+    # @response.persistent!
+    @response.should be_persistent
+  end
+  
   it "should be persistent when specified" do
     @response.persistent!
     @response.should be_persistent

data/spec/spec_helper.rb

@@ -144,6 +144,7 @@ module Helpers
   
   def start_server(address=DEFAULT_TEST_ADDRESS, port=DEFAULT_TEST_PORT, options={}, &app)
     @server = Thin::Server.new(address, port, options, app)
+    @server.ssl = options[:ssl]
     @server.threaded = options[:threaded]
     @server.timeout = 3
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: x86-mswin32
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- lib/thin_parser.so
 - spec/backends/swiftiply_client_spec.rb
 - spec/backends/tcp_server_spec.rb
 - spec/backends/unix_server_spec.rb
@@ -186,8 +187,6 @@ files:
 - ext/thin_parser/extconf.rb
 - ext/thin_parser/common.rl
 - ext/thin_parser/parser.rl
-- lib/1.8/thin_parser.so
-- lib/1.9/thin_parser.so
 has_rdoc: true
 homepage: http://code.macournoyer.com/thin/
 licenses: []