mongrel 1.0.1 → 1.0.2

data/examples/mime.yaml

@@ -0,0 +1,3 @@
+--- 
+.jpeg: image/jpeg
+.png: image/test

data/examples/mongrel.conf

@@ -0,0 +1,9 @@
+--- 
+:environment: production
+:daemon: "true"
+:host: 0.0.0.0
+:log_file: log/mongrel.log
+:docroot: public
+:debug: "false"
+:port: 3000
+:pid_file: log/mongrel.pid

data/examples/monitrc

@@ -0,0 +1,57 @@
+set daemon  60
+set logfile syslog facility log_daemon
+set mailserver localhost
+set mail-format { from: monit@localhost }
+set alert root@localhost
+
+check process sshd with pidfile /var/run/sshd.pid
+   start program  "/etc/init.d/ssh start"
+   stop program  "/etc/init.d/ssh stop"
+   if failed port 22 protocol ssh then restart
+   if 5 restarts within 5 cycles then timeout
+
+check process mysql with pidfile /var/run/mysqld/mysqld.pid
+   group database
+   start program = "/etc/init.d/mysql start"
+   stop program = "/etc/init.d/mysql stop"
+   if failed host 127.0.0.1 port 3306 then restart
+   if 5 restarts within 5 cycles then timeout
+
+check process httpd with pidfile /usr/local/apache2/logs/httpd.pid
+   group www-data
+   start program  "/usr/local/apache2/bin/apachectl start"
+   stop program  "/usr/local/apache2/bin/apachectl stop"
+   if failed host localhost port 80 protocol http
+      and request "/" then alert
+   if cpu is greater than 60% for 2 cycles then alert
+   if cpu > 80% for 5 cycles then restart
+   if children > 250 then restart
+   if loadavg(5min) greater than 10 for 8 cycles then alert
+   if 3 restarts within 5 cycles then timeout
+
+check process mongrel_8000 with pidfile /var/rails/MYAPP/log/mongrel.8000.pid
+   group root
+   if failed host 127.0.0.1 port 8000 protocol http
+      and request "/" then alert
+   if cpu is greater than 60% for 2 cycles then alert
+   if cpu > 80% for 5 cycles then restart
+   if loadavg(5min) greater than 10 for 8 cycles then restart
+   if 3 restarts within 5 cycles then timeout
+
+check process mongrel_8001 with pidfile /var/rails/MYAPP/log/mongrel.8001.pid
+   group root
+   if failed host 127.0.0.1 port 8001 protocol http
+      and request "/" then alert
+   if cpu is greater than 60% for 2 cycles then alert
+   if cpu > 80% for 5 cycles then alert
+   if loadavg(5min) greater than 10 for 8 cycles then alert
+   if 3 restarts within 5 cycles then timeout
+
+check process postfix with pidfile /var/spool/postfix/pid/master.pid
+   group mail
+   start program = "/etc/init.d/postfix start"
+   stop  program = "/etc/init.d/postfix stop"
+   if failed port 25 protocol smtp then restart
+   if 5 restarts within 5 cycles then timeout
+
+

data/ext/http11/http11.c

@@ -21,6 +21,7 @@ static VALUE eHttpParserError;
 static VALUE global_http_prefix;
 static VALUE global_request_method;
 static VALUE global_request_uri;
+static VALUE global_fragment;
 static VALUE global_query_string;
 static VALUE global_http_version;
 static VALUE global_content_length;
@@ -55,6 +56,7 @@ static VALUE global_port_80;
 DEF_MAX_LENGTH(FIELD_NAME, 256);
 DEF_MAX_LENGTH(FIELD_VALUE, 80 * 1024);
 DEF_MAX_LENGTH(REQUEST_URI, 1024 * 12);
+DEF_MAX_LENGTH(FRAGMENT, 1024); /* Don't know if this length is specified somewhere or not */
 DEF_MAX_LENGTH(REQUEST_PATH, 1024);
 DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10));
 DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32)));
@@ -105,6 +107,17 @@ void request_uri(void *data, const char *at, size_t length)
   rb_hash_aset(req, global_request_uri, val);
 }
 
+void fragment(void *data, const char *at, size_t length)
+{
+  VALUE req = (VALUE)data;
+  VALUE val = Qnil;
+
+  VALIDATE_MAX_LENGTH(length, FRAGMENT);
+
+  val = rb_str_new(at, length);
+  rb_hash_aset(req, global_fragment, val);
+}
+
 void request_path(void *data, const char *at, size_t length)
 {
   VALUE req = (VALUE)data;
@@ -157,7 +170,7 @@ void header_done(void *data, const char *at, size_t length)
 
   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
   if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
-    // ruby better close strings off with a '\0' dammit
+    /* ruby better close strings off with a '\0' dammit */
     colon = strchr(RSTRING(temp)->ptr, ':');
     if(colon != NULL) {
       rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
@@ -170,7 +183,7 @@ void header_done(void *data, const char *at, size_t length)
     }
   }
 
-  // grab the initial body and stuff it into an ivar
+  /* grab the initial body and stuff it into an ivar */
   rb_ivar_set(req, id_http_body, rb_str_new(at, length));
   rb_hash_aset(req, global_server_protocol, global_server_protocol_value);
   rb_hash_aset(req, global_server_software, global_mongrel_version);
@@ -194,6 +207,7 @@ VALUE HttpParser_alloc(VALUE klass)
   hp->http_field = http_field;
   hp->request_method = request_method;
   hp->request_uri = request_uri;
+  hp->fragment = fragment;
   hp->request_path = request_path;
   hp->query_string = query_string;
   hp->http_version = http_version;
@@ -392,7 +406,7 @@ VALUE URIClassifier_init(VALUE self)
 {
   VALUE hash;
 
-  // we create an internal hash to protect stuff from the GC
+  /* we create an internal hash to protect stuff from the GC */
   hash = rb_hash_new();
   rb_ivar_set(self, id_handler_map, hash);
 
@@ -506,25 +520,25 @@ VALUE URIClassifier_resolve(VALUE self, VALUE uri)
   DATA_GET(self, struct tst, tst);
   uri_str = (unsigned char *)StringValueCStr(uri);
 
-  handler = tst_search(uri_str, tst, &pref_len);
+  handler = tst_search(uri_str, tst, TST_LONGEST_MATCH, &pref_len);
 
-  // setup for multiple return values
+  /* setup for multiple return values */
   result = rb_ary_new();
 
   if(handler) {
     rb_ary_push(result, rb_str_substr (uri, 0, pref_len));
-    // compensate for a script_name="/" where we need to add the "/" to path_info to keep it consistent
+    /* compensate for a script_name="/" where we need to add the "/" to path_info to keep it consistent */
     if(pref_len == 1 && uri_str[0] == '/') {
-      // matches the root URI so we have to use the whole URI as the path_info
+      /* matches the root URI so we have to use the whole URI as the path_info */
       rb_ary_push(result, uri);
     } else {
-      // matches a script so process like normal
+      /* matches a script so process like normal */
       rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
     }
 
     rb_ary_push(result, (VALUE)handler);
   } else {
-    // not found so push back nothing
+    /* not found so push back nothing */
     rb_ary_push(result, Qnil);
     rb_ary_push(result, Qnil);
     rb_ary_push(result, Qnil);
@@ -542,6 +556,7 @@ void Init_http11()
   DEF_GLOBAL(http_prefix, "HTTP_");
   DEF_GLOBAL(request_method, "REQUEST_METHOD");
   DEF_GLOBAL(request_uri, "REQUEST_URI");
+  DEF_GLOBAL(fragment, "FRAGMENT");
   DEF_GLOBAL(query_string, "QUERY_STRING");
   DEF_GLOBAL(http_version, "HTTP_VERSION");
   DEF_GLOBAL(request_path, "REQUEST_PATH");
@@ -556,7 +571,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 1.0.1");
+  DEF_GLOBAL(mongrel_version, "Mongrel 1.0.2");
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 
@@ -579,5 +594,3 @@ void Init_http11()
   rb_define_method(cURIClassifier, "unregister", URIClassifier_unregister, 1);
   rb_define_method(cURIClassifier, "resolve", URIClassifier_resolve, 1);
 }
-
-

data/ext/http11/http11_parser.c

@@ -1,4 +1,4 @@
-#line 1 "ext/http11/http11_parser.rl"
+#line 1 "http11_parser.rl"
 /**
  * Copyright (c) 2005 Zed A. Shaw
  * You can redistribute it and/or modify it under the same terms as Ruby.
@@ -14,29 +14,30 @@
 #define MARK(M,FPC) (parser->M = (FPC) - buffer)
 #define PTR_TO(F) (buffer + parser->F)
 
-/** machine **/
-#line 114 "ext/http11/http11_parser.rl"
+/** Machine **/
 
+#line 74 "http11_parser.rl"
 
-/** Data **/
 
-#line 24 "ext/http11/http11_parser.c"
-static const int http_parser_start = 0;
+/** Data **/
 
-static const int http_parser_first_final = 53;
+#line 25 "http11_parser.c"
+static const int http_parser_start = 1;
+static const int http_parser_first_final = 57;
+static const int http_parser_error = 0;
 
-static const int http_parser_error = 1;
+static const int http_parser_en_main = 1;
 
-#line 118 "ext/http11/http11_parser.rl"
+#line 78 "http11_parser.rl"
 
 int http_parser_init(http_parser *parser)  {
   int cs = 0;
   
-#line 36 "ext/http11/http11_parser.c"
+#line 37 "http11_parser.c"
 	{
 	cs = http_parser_start;
 	}
-#line 122 "ext/http11/http11_parser.rl"
+#line 82 "http11_parser.rl"
   parser->cs = cs;
   parser->body_start = 0;
   parser->content_len = 0;
@@ -64,53 +65,53 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
 
 
   
-#line 68 "ext/http11/http11_parser.c"
+#line 69 "http11_parser.c"
 	{
 	if ( p == pe )
 		goto _out;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
-		case 36: goto tr14;
-		case 95: goto tr14;
+		case 36: goto tr0;
+		case 95: goto tr0;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto tr14;
+			goto tr0;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto tr14;
+			goto tr0;
 	} else
-		goto tr14;
-	goto st1;
-st1:
-	goto _out1;
-tr14:
-#line 20 "ext/http11/http11_parser.rl"
+		goto tr0;
+	goto st0;
+st0:
+	goto _out0;
+tr0:
+#line 22 "http11_parser.rl"
 	{MARK(mark, p); }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _out2;
 case 2:
-#line 98 "ext/http11/http11_parser.c"
+#line 99 "http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr17;
-		case 36: goto st34;
-		case 95: goto st34;
+		case 32: goto tr2;
+		case 36: goto st38;
+		case 95: goto st38;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st34;
+			goto st38;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st34;
+			goto st38;
 	} else
-		goto st34;
-	goto st1;
-tr17:
-#line 34 "ext/http11/http11_parser.rl"
+		goto st38;
+	goto st0;
+tr2:
+#line 36 "http11_parser.rl"
 	{ 
     if(parser->request_method != NULL) 
       parser->request_method(parser->data, PTR_TO(mark), LEN(mark, p));
@@ -120,74 +121,83 @@ st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-#line 124 "ext/http11/http11_parser.c"
+#line 125 "http11_parser.c"
 	switch( (*p) ) {
-		case 42: goto tr10;
-		case 43: goto tr11;
-		case 47: goto tr12;
-		case 58: goto tr13;
+		case 42: goto tr4;
+		case 43: goto tr5;
+		case 47: goto tr6;
+		case 58: goto tr7;
 	}
 	if ( (*p) < 65 ) {
 		if ( 45 <= (*p) && (*p) <= 57 )
-			goto tr11;
+			goto tr5;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr11;
+			goto tr5;
 	} else
-		goto tr11;
-	goto st1;
-tr10:
-#line 20 "ext/http11/http11_parser.rl"
+		goto tr5;
+	goto st0;
+tr4:
+#line 22 "http11_parser.rl"
 	{MARK(mark, p); }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _out4;
 case 4:
-#line 148 "ext/http11/http11_parser.c"
-	if ( (*p) == 32 )
-		goto tr19;
-	goto st1;
-tr19:
-#line 38 "ext/http11/http11_parser.rl"
+#line 149 "http11_parser.c"
+	switch( (*p) ) {
+		case 32: goto tr8;
+		case 35: goto tr9;
+	}
+	goto st0;
+tr8:
+#line 40 "http11_parser.rl"
 	{ 
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
-tr28:
-#line 44 "ext/http11/http11_parser.rl"
+tr30:
+#line 44 "http11_parser.rl"
 	{ 
-    if(parser->query_string != NULL)
-      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
-  }
-#line 38 "ext/http11/http11_parser.rl"
-	{ 
-    if(parser->request_uri != NULL)
-      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+    if(parser->fragment != NULL)
+      parser->fragment(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
-tr31:
-#line 54 "ext/http11/http11_parser.rl"
+tr40:
+#line 60 "http11_parser.rl"
 	{
     if(parser->request_path != NULL)
       parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
   }
-#line 38 "ext/http11/http11_parser.rl"
+#line 40 "http11_parser.rl"
 	{ 
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
-tr40:
-#line 43 "ext/http11/http11_parser.rl"
+tr51:
+#line 49 "http11_parser.rl"
 	{MARK(query_start, p); }
-#line 44 "ext/http11/http11_parser.rl"
+#line 50 "http11_parser.rl"
 	{ 
     if(parser->query_string != NULL)
       parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 38 "ext/http11/http11_parser.rl"
+#line 40 "http11_parser.rl"
+	{ 
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st5;
+tr55:
+#line 50 "http11_parser.rl"
+	{ 
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+  }
+#line 40 "http11_parser.rl"
 	{ 
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
@@ -197,50 +207,50 @@ st5:
 	if ( ++p == pe )
 		goto _out5;
 case 5:
-#line 201 "ext/http11/http11_parser.c"
+#line 211 "http11_parser.c"
 	if ( (*p) == 72 )
-		goto tr3;
-	goto st1;
-tr3:
-#line 20 "ext/http11/http11_parser.rl"
+		goto tr10;
+	goto st0;
+tr10:
+#line 22 "http11_parser.rl"
 	{MARK(mark, p); }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _out6;
 case 6:
-#line 213 "ext/http11/http11_parser.c"
+#line 223 "http11_parser.c"
 	if ( (*p) == 84 )
 		goto st7;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _out7;
 case 7:
 	if ( (*p) == 84 )
 		goto st8;
-	goto st1;
+	goto st0;
 st8:
 	if ( ++p == pe )
 		goto _out8;
 case 8:
 	if ( (*p) == 80 )
 		goto st9;
-	goto st1;
+	goto st0;
 st9:
 	if ( ++p == pe )
 		goto _out9;
 case 9:
 	if ( (*p) == 47 )
 		goto st10;
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
 		goto _out10;
 case 10:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st11;
-	goto st1;
+	goto st0;
 st11:
 	if ( ++p == pe )
 		goto _out11;
@@ -249,32 +259,32 @@ case 11:
 		goto st12;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st11;
-	goto st1;
+	goto st0;
 st12:
 	if ( ++p == pe )
 		goto _out12;
 case 12:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st13;
-	goto st1;
+	goto st0;
 st13:
 	if ( ++p == pe )
 		goto _out13;
 case 13:
 	if ( (*p) == 13 )
-		goto tr22;
+		goto tr18;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st13;
-	goto st1;
-tr22:
-#line 49 "ext/http11/http11_parser.rl"
+	goto st0;
+tr18:
+#line 55 "http11_parser.rl"
 	{	
     if(parser->http_version != NULL)
       parser->http_version(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st14;
-tr36:
-#line 29 "ext/http11/http11_parser.rl"
+tr26:
+#line 31 "http11_parser.rl"
 	{ 
     if(parser->http_field != NULL) {
       parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
@@ -285,10 +295,10 @@ st14:
 	if ( ++p == pe )
 		goto _out14;
 case 14:
-#line 289 "ext/http11/http11_parser.c"
+#line 299 "http11_parser.c"
 	if ( (*p) == 10 )
 		goto st15;
-	goto st1;
+	goto st0;
 st15:
 	if ( ++p == pe )
 		goto _out15;
@@ -316,41 +326,41 @@ case 15:
 			goto tr21;
 	} else
 		goto tr21;
-	goto st1;
+	goto st0;
 st16:
 	if ( ++p == pe )
 		goto _out16;
 case 16:
 	if ( (*p) == 10 )
-		goto tr25;
-	goto st1;
-tr25:
-#line 59 "ext/http11/http11_parser.rl"
+		goto tr22;
+	goto st0;
+tr22:
+#line 65 "http11_parser.rl"
 	{ 
     parser->body_start = p - buffer + 1; 
     if(parser->header_done != NULL)
       parser->header_done(parser->data, p + 1, pe - p - 1);
-    goto _out53;
+    goto _out57;
   }
-	goto st53;
-st53:
+	goto st57;
+st57:
 	if ( ++p == pe )
-		goto _out53;
-case 53:
-#line 341 "ext/http11/http11_parser.c"
-	goto st1;
+		goto _out57;
+case 57:
+#line 351 "http11_parser.c"
+	goto st0;
 tr21:
-#line 23 "ext/http11/http11_parser.rl"
+#line 25 "http11_parser.rl"
 	{ MARK(field_start, p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _out17;
 case 17:
-#line 351 "ext/http11/http11_parser.c"
+#line 361 "http11_parser.c"
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr16;
+		case 58: goto tr24;
 		case 124: goto st17;
 		case 126: goto st17;
 	}
@@ -371,90 +381,133 @@ case 17:
 			goto st17;
 	} else
 		goto st17;
-	goto st1;
-tr16:
-#line 24 "ext/http11/http11_parser.rl"
+	goto st0;
+tr24:
+#line 26 "http11_parser.rl"
 	{ 
     parser->field_len = LEN(field_start, p);
   }
 	goto st18;
-tr38:
-#line 28 "ext/http11/http11_parser.rl"
+tr27:
+#line 30 "http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st18;
 st18:
 	if ( ++p == pe )
 		goto _out18;
 case 18:
-#line 390 "ext/http11/http11_parser.c"
+#line 400 "http11_parser.c"
 	switch( (*p) ) {
-		case 13: goto tr36;
-		case 32: goto tr38;
+		case 13: goto tr26;
+		case 32: goto tr27;
 	}
-	goto tr37;
-tr37:
-#line 28 "ext/http11/http11_parser.rl"
+	goto tr25;
+tr25:
+#line 30 "http11_parser.rl"
 	{ MARK(mark, p); }
 	goto st19;
 st19:
 	if ( ++p == pe )
 		goto _out19;
 case 19:
-#line 404 "ext/http11/http11_parser.c"
+#line 414 "http11_parser.c"
 	if ( (*p) == 13 )
-		goto tr36;
+		goto tr26;
 	goto st19;
-tr11:
-#line 20 "ext/http11/http11_parser.rl"
-	{MARK(mark, p); }
+tr9:
+#line 40 "http11_parser.rl"
+	{ 
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st20;
+tr41:
+#line 60 "http11_parser.rl"
+	{
+    if(parser->request_path != NULL)
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+  }
+#line 40 "http11_parser.rl"
+	{ 
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st20;
+tr52:
+#line 49 "http11_parser.rl"
+	{MARK(query_start, p); }
+#line 50 "http11_parser.rl"
+	{ 
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+  }
+#line 40 "http11_parser.rl"
+	{ 
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st20;
+tr56:
+#line 50 "http11_parser.rl"
+	{ 
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+  }
+#line 40 "http11_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 416 "ext/http11/http11_parser.c"
+#line 467 "http11_parser.c"
 	switch( (*p) ) {
-		case 43: goto st20;
-		case 58: goto st21;
+		case 32: goto tr30;
+		case 37: goto tr31;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 127: goto st0;
 	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st20;
-	} else if ( (*p) > 57 ) {
-		if ( (*p) > 90 ) {
-			if ( 97 <= (*p) && (*p) <= 122 )
-				goto st20;
-		} else if ( (*p) >= 65 )
-			goto st20;
-	} else
-		goto st20;
-	goto st1;
-tr13:
-#line 20 "ext/http11/http11_parser.rl"
+	if ( (*p) > 31 ) {
+		if ( 34 <= (*p) && (*p) <= 35 )
+			goto st0;
+	} else if ( (*p) >= 0 )
+		goto st0;
+	goto tr29;
+tr29:
+#line 22 "http11_parser.rl"
 	{MARK(mark, p); }
 	goto st21;
 st21:
 	if ( ++p == pe )
 		goto _out21;
 case 21:
-#line 441 "ext/http11/http11_parser.c"
+#line 489 "http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr19;
+		case 32: goto tr30;
 		case 37: goto st22;
-		case 60: goto st1;
-		case 62: goto st1;
-		case 127: goto st1;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 127: goto st0;
 	}
 	if ( (*p) > 31 ) {
 		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st1;
+			goto st0;
 	} else if ( (*p) >= 0 )
-		goto st1;
+		goto st0;
 	goto st21;
+tr31:
+#line 22 "http11_parser.rl"
+	{MARK(mark, p); }
+	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _out22;
 case 22:
+#line 511 "http11_parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st23;
@@ -463,7 +516,7 @@ case 22:
 			goto st23;
 	} else
 		goto st23;
-	goto st1;
+	goto st0;
 st23:
 	if ( ++p == pe )
 		goto _out23;
@@ -476,165 +529,157 @@ case 23:
 			goto st21;
 	} else
 		goto st21;
-	goto st1;
-tr12:
-#line 20 "ext/http11/http11_parser.rl"
+	goto st0;
+tr5:
+#line 22 "http11_parser.rl"
 	{MARK(mark, p); }
 	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _out24;
 case 24:
-#line 489 "ext/http11/http11_parser.c"
+#line 542 "http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr31;
-		case 37: goto st25;
-		case 59: goto tr33;
-		case 60: goto st1;
-		case 62: goto st1;
-		case 63: goto tr34;
-		case 127: goto st1;
+		case 43: goto st24;
+		case 58: goto st25;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st1;
-	} else if ( (*p) >= 0 )
-		goto st1;
-	goto st24;
+	if ( (*p) < 48 ) {
+		if ( 45 <= (*p) && (*p) <= 46 )
+			goto st24;
+	} else if ( (*p) > 57 ) {
+		if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto st24;
+		} else if ( (*p) >= 65 )
+			goto st24;
+	} else
+		goto st24;
+	goto st0;
+tr7:
+#line 22 "http11_parser.rl"
+	{MARK(mark, p); }
+	goto st25;
 st25:
 	if ( ++p == pe )
 		goto _out25;
 case 25:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st26;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st26;
-	} else
-		goto st26;
-	goto st1;
+#line 567 "http11_parser.c"
+	switch( (*p) ) {
+		case 32: goto tr8;
+		case 34: goto st0;
+		case 35: goto tr9;
+		case 37: goto st26;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 127: goto st0;
+	}
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st25;
 st26:
 	if ( ++p == pe )
 		goto _out26;
 case 26:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st24;
+			goto st27;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st24;
+			goto st27;
 	} else
-		goto st24;
-	goto st1;
-tr33:
-#line 54 "ext/http11/http11_parser.rl"
-	{
-    if(parser->request_path != NULL)
-      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
-  }
-	goto st27;
+		goto st27;
+	goto st0;
 st27:
 	if ( ++p == pe )
 		goto _out27;
 case 27:
-#line 542 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 32: goto tr19;
-		case 37: goto st28;
-		case 60: goto st1;
-		case 62: goto st1;
-		case 63: goto st30;
-		case 127: goto st1;
-	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st1;
-	} else if ( (*p) >= 0 )
-		goto st1;
-	goto st27;
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st25;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st25;
+	} else
+		goto st25;
+	goto st0;
+tr6:
+#line 22 "http11_parser.rl"
+	{MARK(mark, p); }
+	goto st28;
 st28:
 	if ( ++p == pe )
 		goto _out28;
 case 28:
+#line 614 "http11_parser.c"
+	switch( (*p) ) {
+		case 32: goto tr40;
+		case 34: goto st0;
+		case 35: goto tr41;
+		case 37: goto st29;
+		case 59: goto tr43;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 63: goto tr44;
+		case 127: goto st0;
+	}
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st28;
+st29:
+	if ( ++p == pe )
+		goto _out29;
+case 29:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st29;
+			goto st30;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st29;
+			goto st30;
 	} else
-		goto st29;
-	goto st1;
-st29:
+		goto st30;
+	goto st0;
+st30:
 	if ( ++p == pe )
-		goto _out29;
-case 29:
+		goto _out30;
+case 30:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st27;
+			goto st28;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st27;
+			goto st28;
 	} else
-		goto st27;
-	goto st1;
-tr34:
-#line 54 "ext/http11/http11_parser.rl"
+		goto st28;
+	goto st0;
+tr43:
+#line 60 "http11_parser.rl"
 	{
     if(parser->request_path != NULL)
       parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
   }
-	goto st30;
-st30:
-	if ( ++p == pe )
-		goto _out30;
-case 30:
-#line 594 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 32: goto tr40;
-		case 37: goto tr41;
-		case 60: goto st1;
-		case 62: goto st1;
-		case 127: goto st1;
-	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st1;
-	} else if ( (*p) >= 0 )
-		goto st1;
-	goto tr39;
-tr39:
-#line 43 "ext/http11/http11_parser.rl"
-	{MARK(query_start, p); }
 	goto st31;
 st31:
 	if ( ++p == pe )
 		goto _out31;
 case 31:
-#line 616 "ext/http11/http11_parser.c"
+#line 666 "http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr28;
+		case 32: goto tr8;
+		case 34: goto st0;
+		case 35: goto tr9;
 		case 37: goto st32;
-		case 60: goto st1;
-		case 62: goto st1;
-		case 127: goto st1;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 63: goto st34;
+		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st1;
-	} else if ( (*p) >= 0 )
-		goto st1;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
 	goto st31;
-tr41:
-#line 43 "ext/http11/http11_parser.rl"
-	{MARK(query_start, p); }
-	goto st32;
 st32:
 	if ( ++p == pe )
 		goto _out32;
 case 32:
-#line 638 "ext/http11/http11_parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st33;
@@ -643,7 +688,7 @@ case 32:
 			goto st33;
 	} else
 		goto st33;
-	goto st1;
+	goto st0;
 st33:
 	if ( ++p == pe )
 		goto _out33;
@@ -656,85 +701,89 @@ case 33:
 			goto st31;
 	} else
 		goto st31;
-	goto st1;
+	goto st0;
+tr44:
+#line 60 "http11_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 _out34;
 case 34:
+#line 717 "http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr17;
-		case 36: goto st35;
-		case 95: goto st35;
+		case 32: goto tr51;
+		case 34: goto st0;
+		case 35: goto tr52;
+		case 37: goto tr53;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 127: goto st0;
 	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st35;
-	} else if ( (*p) > 57 ) {
-		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st35;
-	} else
-		goto st35;
-	goto st1;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto tr50;
+tr50:
+#line 49 "http11_parser.rl"
+	{MARK(query_start, p); }
+	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _out35;
 case 35:
+#line 738 "http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr17;
-		case 36: goto st36;
-		case 95: goto st36;
+		case 32: goto tr55;
+		case 34: goto st0;
+		case 35: goto tr56;
+		case 37: goto st36;
+		case 60: goto st0;
+		case 62: goto st0;
+		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 st1;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st35;
+tr53:
+#line 49 "http11_parser.rl"
+	{MARK(query_start, p); }
+	goto st36;
 st36:
 	if ( ++p == pe )
 		goto _out36;
 case 36:
-	switch( (*p) ) {
-		case 32: goto tr17;
-		case 36: goto st37;
-		case 95: goto st37;
-	}
-	if ( (*p) < 48 ) {
-		if ( 45 <= (*p) && (*p) <= 46 )
+#line 759 "http11_parser.c"
+	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;
-	goto st1;
+	goto st0;
 st37:
 	if ( ++p == pe )
 		goto _out37;
 case 37:
-	switch( (*p) ) {
-		case 32: goto tr17;
-		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 st1;
+		goto st35;
+	goto st0;
 st38:
 	if ( ++p == pe )
 		goto _out38;
 case 38:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st39;
 		case 95: goto st39;
 	}
@@ -746,13 +795,13 @@ case 38:
 			goto st39;
 	} else
 		goto st39;
-	goto st1;
+	goto st0;
 st39:
 	if ( ++p == pe )
 		goto _out39;
 case 39:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st40;
 		case 95: goto st40;
 	}
@@ -764,13 +813,13 @@ case 39:
 			goto st40;
 	} else
 		goto st40;
-	goto st1;
+	goto st0;
 st40:
 	if ( ++p == pe )
 		goto _out40;
 case 40:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st41;
 		case 95: goto st41;
 	}
@@ -782,13 +831,13 @@ case 40:
 			goto st41;
 	} else
 		goto st41;
-	goto st1;
+	goto st0;
 st41:
 	if ( ++p == pe )
 		goto _out41;
 case 41:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st42;
 		case 95: goto st42;
 	}
@@ -800,13 +849,13 @@ case 41:
 			goto st42;
 	} else
 		goto st42;
-	goto st1;
+	goto st0;
 st42:
 	if ( ++p == pe )
 		goto _out42;
 case 42:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st43;
 		case 95: goto st43;
 	}
@@ -818,13 +867,13 @@ case 42:
 			goto st43;
 	} else
 		goto st43;
-	goto st1;
+	goto st0;
 st43:
 	if ( ++p == pe )
 		goto _out43;
 case 43:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st44;
 		case 95: goto st44;
 	}
@@ -836,13 +885,13 @@ case 43:
 			goto st44;
 	} else
 		goto st44;
-	goto st1;
+	goto st0;
 st44:
 	if ( ++p == pe )
 		goto _out44;
 case 44:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st45;
 		case 95: goto st45;
 	}
@@ -854,13 +903,13 @@ case 44:
 			goto st45;
 	} else
 		goto st45;
-	goto st1;
+	goto st0;
 st45:
 	if ( ++p == pe )
 		goto _out45;
 case 45:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st46;
 		case 95: goto st46;
 	}
@@ -872,13 +921,13 @@ case 45:
 			goto st46;
 	} else
 		goto st46;
-	goto st1;
+	goto st0;
 st46:
 	if ( ++p == pe )
 		goto _out46;
 case 46:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st47;
 		case 95: goto st47;
 	}
@@ -890,13 +939,13 @@ case 46:
 			goto st47;
 	} else
 		goto st47;
-	goto st1;
+	goto st0;
 st47:
 	if ( ++p == pe )
 		goto _out47;
 case 47:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st48;
 		case 95: goto st48;
 	}
@@ -908,13 +957,13 @@ case 47:
 			goto st48;
 	} else
 		goto st48;
-	goto st1;
+	goto st0;
 st48:
 	if ( ++p == pe )
 		goto _out48;
 case 48:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st49;
 		case 95: goto st49;
 	}
@@ -926,13 +975,13 @@ case 48:
 			goto st49;
 	} else
 		goto st49;
-	goto st1;
+	goto st0;
 st49:
 	if ( ++p == pe )
 		goto _out49;
 case 49:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st50;
 		case 95: goto st50;
 	}
@@ -944,13 +993,13 @@ case 49:
 			goto st50;
 	} else
 		goto st50;
-	goto st1;
+	goto st0;
 st50:
 	if ( ++p == pe )
 		goto _out50;
 case 50:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st51;
 		case 95: goto st51;
 	}
@@ -962,13 +1011,13 @@ case 50:
 			goto st51;
 	} else
 		goto st51;
-	goto st1;
+	goto st0;
 st51:
 	if ( ++p == pe )
 		goto _out51;
 case 51:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr2;
 		case 36: goto st52;
 		case 95: goto st52;
 	}
@@ -980,16 +1029,88 @@ case 51:
 			goto st52;
 	} else
 		goto st52;
-	goto st1;
+	goto st0;
 st52:
 	if ( ++p == pe )
 		goto _out52;
 case 52:
+	switch( (*p) ) {
+		case 32: goto tr2;
+		case 36: goto st53;
+		case 95: goto st53;
+	}
+	if ( (*p) < 48 ) {
+		if ( 45 <= (*p) && (*p) <= 46 )
+			goto st53;
+	} else if ( (*p) > 57 ) {
+		if ( 65 <= (*p) && (*p) <= 90 )
+			goto st53;
+	} else
+		goto st53;
+	goto st0;
+st53:
+	if ( ++p == pe )
+		goto _out53;
+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 _out54;
+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 _out55;
+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 _out56;
+case 56:
 	if ( (*p) == 32 )
-		goto tr17;
-	goto st1;
+		goto tr2;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
+	_out0: cs = 0; goto _out; 
 	_out2: cs = 2; goto _out; 
 	_out3: cs = 3; goto _out; 
 	_out4: cs = 4; goto _out; 
@@ -1005,7 +1126,7 @@ case 52:
 	_out14: cs = 14; goto _out; 
 	_out15: cs = 15; goto _out; 
 	_out16: cs = 16; goto _out; 
-	_out53: cs = 53; goto _out; 
+	_out57: cs = 57; goto _out; 
 	_out17: cs = 17; goto _out; 
 	_out18: cs = 18; goto _out; 
 	_out19: cs = 19; goto _out; 
@@ -1042,10 +1163,14 @@ case 52:
 	_out50: cs = 50; goto _out; 
 	_out51: cs = 51; goto _out; 
 	_out52: cs = 52; goto _out; 
+	_out53: cs = 53; goto _out; 
+	_out54: cs = 54; goto _out; 
+	_out55: cs = 55; goto _out; 
+	_out56: cs = 56; goto _out; 
 
 	_out: {}
 	}
-#line 149 "ext/http11/http11_parser.rl"
+#line 109 "http11_parser.rl"
 
   parser->cs = cs;
   parser->nread += p - (buffer + off);
@@ -1060,8 +1185,8 @@ case 52:
   if(parser->body_start) {
     /* final \r\n combo encountered so stop right here */
     
-#line 1064 "ext/http11/http11_parser.c"
-#line 163 "ext/http11/http11_parser.rl"
+#line 1189 "http11_parser.c"
+#line 123 "http11_parser.rl"
     parser->nread++;
   }
 
@@ -1073,8 +1198,8 @@ int http_parser_finish(http_parser *parser)
   int cs = parser->cs;
 
   
-#line 1077 "ext/http11/http11_parser.c"
-#line 174 "ext/http11/http11_parser.rl"
+#line 1202 "http11_parser.c"
+#line 134 "http11_parser.rl"
 
   parser->cs = cs;