unicorn 4.9.0 → 5.0.1

data/ext/unicorn_http/unicorn_http.c

@@ -27,86 +27,32 @@ void init_unicorn_httpdate(void);
 #define UH_FL_KAVERSION 0x80
 #define UH_FL_HASHEADER 0x100
 #define UH_FL_TO_CLEAR 0x200
+#define UH_FL_RESSTART 0x400 /* for check_client_connection */
 
 /* all of these flags need to be set for keepalive to be supported */
 #define UH_FL_KEEPALIVE (UH_FL_KAVERSION | UH_FL_REQEOF | UH_FL_HASHEADER)
 
-/*
- * whether or not to trust X-Forwarded-Proto and X-Forwarded-SSL when
- * setting rack.url_scheme
- */
-static VALUE trust_x_forward = Qtrue;
-
-static unsigned long keepalive_requests = 100; /* same as nginx */
-
-/*
- * Returns the maximum number of keepalive requests a client may make
- * before the parser refuses to continue.
- */
-static VALUE ka_req(VALUE self)
-{
-  return ULONG2NUM(keepalive_requests);
-}
-
-/*
- * Sets the maximum number of keepalive requests a client may make.
- * A special value of +nil+ causes this to be the maximum value
- * possible (this is architecture-dependent).
- */
-static VALUE set_ka_req(VALUE self, VALUE val)
-{
-  keepalive_requests = NIL_P(val) ? ULONG_MAX : NUM2ULONG(val);
-
-  return ka_req(self);
-}
-
-/*
- * Sets whether or not the parser will trust X-Forwarded-Proto and
- * X-Forwarded-SSL headers and set "rack.url_scheme" to "https" accordingly.
- * Rainbows!/Zbatery installations facing untrusted clients directly
- * should set this to +false+
- */
-static VALUE set_xftrust(VALUE self, VALUE val)
-{
-  if (Qtrue == val || Qfalse == val)
-    trust_x_forward = val;
-  else
-    rb_raise(rb_eTypeError, "must be true or false");
-
-  return val;
-}
-
-/*
- * returns whether or not the parser will trust X-Forwarded-Proto and
- * X-Forwarded-SSL headers and set "rack.url_scheme" to "https" accordingly
- */
-static VALUE xftrust(VALUE self)
-{
-  return trust_x_forward;
-}
-
-static size_t MAX_HEADER_LEN = 1024 * (80 + 32); /* same as Mongrel */
+static unsigned int MAX_HEADER_LEN = 1024 * (80 + 32); /* same as Mongrel */
 
 /* this is only intended for use with Rainbows! */
 static VALUE set_maxhdrlen(VALUE self, VALUE len)
 {
-  return SIZET2NUM(MAX_HEADER_LEN = NUM2SIZET(len));
+  return UINT2NUM(MAX_HEADER_LEN = NUM2UINT(len));
 }
 
-/* keep this small for Rainbows! since every client has one */
+/* keep this small for other servers (e.g. yahns) since every client has one */
 struct http_parser {
   int cs; /* Ragel internal state */
   unsigned int flags;
-  unsigned long nr_requests;
-  size_t mark;
-  size_t offset;
+  unsigned int mark;
+  unsigned int offset;
   union { /* these 2 fields don't nest */
-    size_t field;
-    size_t query;
+    unsigned int field;
+    unsigned int query;
   } start;
   union {
-    size_t field_len; /* only used during header processing */
-    size_t dest_offset; /* only used during body processing */
+    unsigned int field_len; /* only used during header processing */
+    unsigned int dest_offset; /* only used during body processing */
   } s;
   VALUE buf;
   VALUE env;
@@ -117,7 +63,19 @@ struct http_parser {
   } len;
 };
 
-static ID id_clear, id_set_backtrace, id_response_start_sent;
+static ID id_set_backtrace;
+
+#ifdef HAVE_RB_HASH_CLEAR /* Ruby >= 2.0 */
+#  define my_hash_clear(h) (void)rb_hash_clear(h)
+#else /* !HAVE_RB_HASH_CLEAR - Ruby <= 1.9.3 */
+
+static ID id_clear;
+
+static void my_hash_clear(VALUE h)
+{
+  rb_funcall(h, id_clear, 0);
+}
+#endif /* HAVE_RB_HASH_CLEAR */
 
 static void finalize_header(struct http_parser *hp);
 
@@ -126,13 +84,25 @@ static void parser_raise(VALUE klass, const char *msg)
   VALUE exc = rb_exc_new2(klass, msg);
   VALUE bt = rb_ary_new();
 
-	rb_funcall(exc, id_set_backtrace, 1, bt);
-	rb_exc_raise(exc);
+  rb_funcall(exc, id_set_backtrace, 1, bt);
+  rb_exc_raise(exc);
+}
+
+static inline unsigned int ulong2uint(unsigned long n)
+{
+  unsigned int i = (unsigned int)n;
+
+  if (sizeof(unsigned int) != sizeof(unsigned long)) {
+    if ((unsigned long)i != n) {
+      rb_raise(rb_eRangeError, "too large to be 32-bit uint: %lu", n);
+    }
+  }
+  return i;
 }
 
 #define REMAINING (unsigned long)(pe - p)
-#define LEN(AT, FPC) (FPC - buffer - hp->AT)
-#define MARK(M,FPC) (hp->M = (FPC) - buffer)
+#define LEN(AT, FPC) (ulong2uint(FPC - buffer) - hp->AT)
+#define MARK(M,FPC) (hp->M = ulong2uint((FPC) - buffer))
 #define PTR_TO(F) (buffer + hp->F)
 #define STR_NEW(M,FPC) rb_str_new(PTR_TO(M), LEN(M, FPC))
 #define STRIPPED_STR_NEW(M,FPC) stripped_str_new(PTR_TO(M), LEN(M, FPC))
@@ -316,12 +286,12 @@ static void write_value(struct http_parser *hp,
 /** Machine **/
 
 
-#line 423 "unicorn_http.rl"
+#line 393 "unicorn_http.rl"
 
 
 /** Data **/
 
-#line 325 "unicorn_http.c"
+#line 295 "unicorn_http.c"
 static const int http_parser_start = 1;
 static const int http_parser_first_final = 122;
 static const int http_parser_error = 0;
@@ -332,7 +302,7 @@ static const int http_parser_en_Trailers = 114;
 static const int http_parser_en_main = 1;
 
 
-#line 427 "unicorn_http.rl"
+#line 397 "unicorn_http.rl"
 
 static void http_parser_init(struct http_parser *hp)
 {
@@ -345,12 +315,12 @@ static void http_parser_init(struct http_parser *hp)
   hp->len.content = 0;
   hp->cont = Qfalse; /* zero on MRI, should be optimized away by above */
   
-#line 349 "unicorn_http.c"
+#line 319 "unicorn_http.c"
 	{
 	cs = http_parser_start;
 	}
 
-#line 439 "unicorn_http.rl"
+#line 409 "unicorn_http.rl"
   hp->cs = cs;
 }
 
@@ -378,7 +348,7 @@ http_parser_execute(struct http_parser *hp, char *buffer, size_t len)
     goto skip_chunk_data_hack;
   }
   
-#line 382 "unicorn_http.c"
+#line 352 "unicorn_http.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -413,14 +383,14 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 424 "unicorn_http.c"
+#line 394 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr3;
 		case 33: goto st49;
@@ -446,14 +416,14 @@ case 2:
 		goto st49;
 	goto st0;
 tr3:
-#line 328 "unicorn_http.rl"
+#line 298 "unicorn_http.rl"
 	{ request_method(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 457 "unicorn_http.c"
+#line 427 "unicorn_http.c"
 	switch( (*p) ) {
 		case 42: goto tr5;
 		case 47: goto tr6;
@@ -462,21 +432,21 @@ case 3:
 	}
 	goto st0;
 tr5:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 473 "unicorn_http.c"
+#line 443 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 35: goto tr9;
 	}
 	goto st0;
 tr8:
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -494,23 +464,23 @@ tr8:
   }
 	goto st5;
 tr37:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
-#line 348 "unicorn_http.rl"
+#line 318 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st5;
 tr40:
-#line 348 "unicorn_http.rl"
+#line 318 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st5;
 tr44:
-#line 358 "unicorn_http.rl"
+#line 328 "unicorn_http.rl"
 	{
     VALUE val;
 
@@ -521,7 +491,7 @@ tr44:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -539,14 +509,14 @@ tr44:
   }
 	goto st5;
 tr50:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -564,12 +534,12 @@ tr50:
   }
 	goto st5;
 tr54:
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -590,19 +560,19 @@ st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 594 "unicorn_http.c"
+#line 564 "unicorn_http.c"
 	if ( (*p) == 72 )
 		goto tr10;
 	goto st0;
 tr10:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 606 "unicorn_http.c"
+#line 576 "unicorn_http.c"
 	if ( (*p) == 84 )
 		goto st7;
 	goto st0;
@@ -660,34 +630,34 @@ case 13:
 		goto st13;
 	goto st0;
 tr18:
-#line 357 "unicorn_http.rl"
+#line 327 "unicorn_http.rl"
 	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st14;
 tr25:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
-#line 327 "unicorn_http.rl"
+#line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
 tr27:
-#line 327 "unicorn_http.rl"
+#line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
 tr33:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
-#line 326 "unicorn_http.rl"
+#line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st14;
 tr35:
-#line 326 "unicorn_http.rl"
+#line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st14;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-#line 691 "unicorn_http.c"
+#line 661 "unicorn_http.c"
 	if ( (*p) == 10 )
 		goto st15;
 	goto st0;
@@ -722,14 +692,14 @@ case 15:
 		goto tr22;
 	goto st0;
 tr24:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st16;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-#line 733 "unicorn_http.c"
+#line 703 "unicorn_http.c"
 	switch( (*p) ) {
 		case 9: goto tr24;
 		case 13: goto tr25;
@@ -740,14 +710,14 @@ case 16:
 		goto st0;
 	goto tr23;
 tr23:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 751 "unicorn_http.c"
+#line 721 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr27;
 		case 127: goto st0;
@@ -759,7 +729,7 @@ case 17:
 		goto st0;
 	goto st17;
 tr99:
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -777,23 +747,23 @@ tr99:
   }
 	goto st18;
 tr102:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
-#line 348 "unicorn_http.rl"
+#line 318 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st18;
 tr105:
-#line 348 "unicorn_http.rl"
+#line 318 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st18;
 tr109:
-#line 358 "unicorn_http.rl"
+#line 328 "unicorn_http.rl"
 	{
     VALUE val;
 
@@ -804,7 +774,7 @@ tr109:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -822,14 +792,14 @@ tr109:
   }
 	goto st18;
 tr115:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -847,12 +817,12 @@ tr115:
   }
 	goto st18;
 tr119:
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -873,12 +843,12 @@ st18:
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-#line 877 "unicorn_http.c"
+#line 847 "unicorn_http.c"
 	if ( (*p) == 10 )
 		goto tr28;
 	goto st0;
 tr28:
-#line 373 "unicorn_http.rl"
+#line 343 "unicorn_http.rl"
 	{
     finalize_header(hp);
 
@@ -902,23 +872,23 @@ st122:
 	if ( ++p == pe )
 		goto _test_eof122;
 case 122:
-#line 906 "unicorn_http.c"
+#line 876 "unicorn_http.c"
 	goto st0;
 tr22:
-#line 321 "unicorn_http.rl"
+#line 291 "unicorn_http.rl"
 	{ MARK(start.field, p); }
-#line 322 "unicorn_http.rl"
+#line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st19;
 tr29:
-#line 322 "unicorn_http.rl"
+#line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st19;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-#line 922 "unicorn_http.c"
+#line 892 "unicorn_http.c"
 	switch( (*p) ) {
 		case 33: goto tr29;
 		case 58: goto tr30;
@@ -944,18 +914,18 @@ case 19:
 		goto tr29;
 	goto st0;
 tr32:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st20;
 tr30:
-#line 324 "unicorn_http.rl"
+#line 294 "unicorn_http.rl"
 	{ hp->s.field_len = LEN(start.field, p); }
 	goto st20;
 st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-#line 959 "unicorn_http.c"
+#line 929 "unicorn_http.c"
 	switch( (*p) ) {
 		case 9: goto tr32;
 		case 13: goto tr33;
@@ -966,14 +936,14 @@ case 20:
 		goto st0;
 	goto tr31;
 tr31:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st21;
 st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 977 "unicorn_http.c"
+#line 947 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr35;
 		case 127: goto st0;
@@ -985,7 +955,7 @@ case 21:
 		goto st0;
 	goto st21;
 tr9:
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -1003,7 +973,7 @@ tr9:
   }
 	goto st22;
 tr45:
-#line 358 "unicorn_http.rl"
+#line 328 "unicorn_http.rl"
 	{
     VALUE val;
 
@@ -1014,7 +984,7 @@ tr45:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -1032,14 +1002,14 @@ tr45:
   }
 	goto st22;
 tr51:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -1057,12 +1027,12 @@ tr51:
   }
 	goto st22;
 tr55:
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -1083,7 +1053,7 @@ st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 1087 "unicorn_http.c"
+#line 1057 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr37;
 		case 35: goto st0;
@@ -1094,14 +1064,14 @@ case 22:
 		goto st0;
 	goto tr36;
 tr36:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st23;
 st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-#line 1105 "unicorn_http.c"
+#line 1075 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr40;
 		case 35: goto st0;
@@ -1112,14 +1082,14 @@ case 23:
 		goto st0;
 	goto st23;
 tr38:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 1123 "unicorn_http.c"
+#line 1093 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st25;
@@ -1143,20 +1113,20 @@ case 25:
 		goto st23;
 	goto st0;
 tr6:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st26;
 tr71:
-#line 332 "unicorn_http.rl"
+#line 302 "unicorn_http.rl"
 	{ rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, p)); }
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st26;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 1160 "unicorn_http.c"
+#line 1130 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr44;
 		case 35: goto tr45;
@@ -1194,7 +1164,7 @@ case 28:
 		goto st26;
 	goto st0;
 tr47:
-#line 358 "unicorn_http.rl"
+#line 328 "unicorn_http.rl"
 	{
     VALUE val;
 
@@ -1210,7 +1180,7 @@ st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 1214 "unicorn_http.c"
+#line 1184 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr50;
 		case 35: goto tr51;
@@ -1221,14 +1191,14 @@ case 29:
 		goto st0;
 	goto tr49;
 tr49:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st30;
 st30:
 	if ( ++p == pe )
 		goto _test_eof30;
 case 30:
-#line 1232 "unicorn_http.c"
+#line 1202 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr54;
 		case 35: goto tr55;
@@ -1239,14 +1209,14 @@ case 30:
 		goto st0;
 	goto st30;
 tr52:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st31;
 st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-#line 1250 "unicorn_http.c"
+#line 1220 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st32;
@@ -1270,58 +1240,58 @@ case 32:
 		goto st30;
 	goto st0;
 tr7:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st33;
 st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 1283 "unicorn_http.c"
+#line 1253 "unicorn_http.c"
 	switch( (*p) ) {
 		case 84: goto tr58;
 		case 116: goto tr58;
 	}
 	goto st0;
 tr58:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st34;
 st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 1297 "unicorn_http.c"
+#line 1267 "unicorn_http.c"
 	switch( (*p) ) {
 		case 84: goto tr59;
 		case 116: goto tr59;
 	}
 	goto st0;
 tr59:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 1311 "unicorn_http.c"
+#line 1281 "unicorn_http.c"
 	switch( (*p) ) {
 		case 80: goto tr60;
 		case 112: goto tr60;
 	}
 	goto st0;
 tr60:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st36;
 st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-#line 1325 "unicorn_http.c"
+#line 1295 "unicorn_http.c"
 	switch( (*p) ) {
 		case 58: goto tr61;
 		case 83: goto tr62;
@@ -1329,7 +1299,7 @@ case 36:
 	}
 	goto st0;
 tr61:
-#line 329 "unicorn_http.rl"
+#line 299 "unicorn_http.rl"
 	{
     rb_hash_aset(hp->env, g_rack_url_scheme, STR_NEW(mark, p));
   }
@@ -1338,7 +1308,7 @@ st37:
 	if ( ++p == pe )
 		goto _test_eof37;
 case 37:
-#line 1342 "unicorn_http.c"
+#line 1312 "unicorn_http.c"
 	if ( (*p) == 47 )
 		goto st38;
 	goto st0;
@@ -1426,14 +1396,14 @@ case 42:
 		goto st40;
 	goto st0;
 tr67:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st43;
 st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 1437 "unicorn_http.c"
+#line 1407 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st41;
 		case 47: goto tr71;
@@ -1485,14 +1455,14 @@ case 44:
 		goto st0;
 	goto st40;
 tr68:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st45;
 st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 1496 "unicorn_http.c"
+#line 1466 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st41;
 		case 47: goto st0;
@@ -1570,14 +1540,14 @@ case 47:
 		goto st0;
 	goto st40;
 tr62:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st48;
 st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
-#line 1581 "unicorn_http.c"
+#line 1551 "unicorn_http.c"
 	if ( (*p) == 58 )
 		goto tr61;
 	goto st0;
@@ -2093,14 +2063,14 @@ case 67:
 		goto tr3;
 	goto st0;
 tr2:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st68;
 st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 2104 "unicorn_http.c"
+#line 2074 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr3;
 		case 33: goto st49;
@@ -2184,14 +2154,14 @@ case 70:
 		goto st51;
 	goto st0;
 tr95:
-#line 328 "unicorn_http.rl"
+#line 298 "unicorn_http.rl"
 	{ request_method(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st71;
 st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 2195 "unicorn_http.c"
+#line 2165 "unicorn_http.c"
 	switch( (*p) ) {
 		case 42: goto tr96;
 		case 47: goto tr97;
@@ -2200,14 +2170,14 @@ case 71:
 	}
 	goto st0;
 tr96:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st72;
 st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 2211 "unicorn_http.c"
+#line 2181 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr99;
 		case 32: goto tr8;
@@ -2215,7 +2185,7 @@ case 72:
 	}
 	goto st0;
 tr100:
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -2233,7 +2203,7 @@ tr100:
   }
 	goto st73;
 tr110:
-#line 358 "unicorn_http.rl"
+#line 328 "unicorn_http.rl"
 	{
     VALUE val;
 
@@ -2244,7 +2214,7 @@ tr110:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -2262,14 +2232,14 @@ tr110:
   }
 	goto st73;
 tr116:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -2287,12 +2257,12 @@ tr116:
   }
 	goto st73;
 tr120:
-#line 353 "unicorn_http.rl"
+#line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
     rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
   }
-#line 333 "unicorn_http.rl"
+#line 303 "unicorn_http.rl"
 	{
     VALUE str;
 
@@ -2313,7 +2283,7 @@ st73:
 	if ( ++p == pe )
 		goto _test_eof73;
 case 73:
-#line 2317 "unicorn_http.c"
+#line 2287 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr102;
 		case 32: goto tr37;
@@ -2325,14 +2295,14 @@ case 73:
 		goto st0;
 	goto tr101;
 tr101:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st74;
 st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 2336 "unicorn_http.c"
+#line 2306 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr105;
 		case 32: goto tr40;
@@ -2344,14 +2314,14 @@ case 74:
 		goto st0;
 	goto st74;
 tr103:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st75;
 st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 2355 "unicorn_http.c"
+#line 2325 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st76;
@@ -2375,20 +2345,20 @@ case 76:
 		goto st74;
 	goto st0;
 tr97:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st77;
 tr136:
-#line 332 "unicorn_http.rl"
+#line 302 "unicorn_http.rl"
 	{ rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, p)); }
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st77;
 st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
-#line 2392 "unicorn_http.c"
+#line 2362 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr109;
 		case 32: goto tr44;
@@ -2427,7 +2397,7 @@ case 79:
 		goto st77;
 	goto st0;
 tr112:
-#line 358 "unicorn_http.rl"
+#line 328 "unicorn_http.rl"
 	{
     VALUE val;
 
@@ -2443,7 +2413,7 @@ st80:
 	if ( ++p == pe )
 		goto _test_eof80;
 case 80:
-#line 2447 "unicorn_http.c"
+#line 2417 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr115;
 		case 32: goto tr50;
@@ -2455,14 +2425,14 @@ case 80:
 		goto st0;
 	goto tr114;
 tr114:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st81;
 st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 2466 "unicorn_http.c"
+#line 2436 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr119;
 		case 32: goto tr54;
@@ -2474,14 +2444,14 @@ case 81:
 		goto st0;
 	goto st81;
 tr117:
-#line 352 "unicorn_http.rl"
+#line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st82;
 st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 2485 "unicorn_http.c"
+#line 2455 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st83;
@@ -2505,58 +2475,58 @@ case 83:
 		goto st81;
 	goto st0;
 tr98:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st84;
 st84:
 	if ( ++p == pe )
 		goto _test_eof84;
 case 84:
-#line 2518 "unicorn_http.c"
+#line 2488 "unicorn_http.c"
 	switch( (*p) ) {
 		case 84: goto tr123;
 		case 116: goto tr123;
 	}
 	goto st0;
 tr123:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st85;
 st85:
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 2532 "unicorn_http.c"
+#line 2502 "unicorn_http.c"
 	switch( (*p) ) {
 		case 84: goto tr124;
 		case 116: goto tr124;
 	}
 	goto st0;
 tr124:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st86;
 st86:
 	if ( ++p == pe )
 		goto _test_eof86;
 case 86:
-#line 2546 "unicorn_http.c"
+#line 2516 "unicorn_http.c"
 	switch( (*p) ) {
 		case 80: goto tr125;
 		case 112: goto tr125;
 	}
 	goto st0;
 tr125:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st87;
 st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2560 "unicorn_http.c"
+#line 2530 "unicorn_http.c"
 	switch( (*p) ) {
 		case 58: goto tr126;
 		case 83: goto tr127;
@@ -2564,7 +2534,7 @@ case 87:
 	}
 	goto st0;
 tr126:
-#line 329 "unicorn_http.rl"
+#line 299 "unicorn_http.rl"
 	{
     rb_hash_aset(hp->env, g_rack_url_scheme, STR_NEW(mark, p));
   }
@@ -2573,7 +2543,7 @@ st88:
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 2577 "unicorn_http.c"
+#line 2547 "unicorn_http.c"
 	if ( (*p) == 47 )
 		goto st89;
 	goto st0;
@@ -2661,14 +2631,14 @@ case 93:
 		goto st91;
 	goto st0;
 tr132:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st94;
 st94:
 	if ( ++p == pe )
 		goto _test_eof94;
 case 94:
-#line 2672 "unicorn_http.c"
+#line 2642 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st92;
 		case 47: goto tr136;
@@ -2720,14 +2690,14 @@ case 95:
 		goto st0;
 	goto st91;
 tr133:
-#line 319 "unicorn_http.rl"
+#line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st96;
 st96:
 	if ( ++p == pe )
 		goto _test_eof96;
 case 96:
-#line 2731 "unicorn_http.c"
+#line 2701 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st92;
 		case 47: goto st0;
@@ -2805,14 +2775,14 @@ case 98:
 		goto st0;
 	goto st91;
 tr127:
-#line 323 "unicorn_http.rl"
+#line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st99;
 st99:
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 2816 "unicorn_http.c"
+#line 2786 "unicorn_http.c"
 	if ( (*p) == 58 )
 		goto tr126;
 	goto st0;
@@ -2832,7 +2802,7 @@ case 100:
 		goto tr141;
 	goto st0;
 tr140:
-#line 368 "unicorn_http.rl"
+#line 338 "unicorn_http.rl"
 	{
     hp->len.chunk = step_incr(hp->len.chunk, (*p), 16);
     if (hp->len.chunk < 0)
@@ -2843,7 +2813,7 @@ st101:
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 2847 "unicorn_http.c"
+#line 2817 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto st102;
 		case 48: goto tr140;
@@ -2866,7 +2836,7 @@ case 102:
 		goto tr144;
 	goto st0;
 tr144:
-#line 397 "unicorn_http.rl"
+#line 367 "unicorn_http.rl"
 	{
     HP_FL_SET(hp, INTRAILER);
     cs = http_parser_en_Trailers;
@@ -2879,10 +2849,10 @@ st123:
 	if ( ++p == pe )
 		goto _test_eof123;
 case 123:
-#line 2883 "unicorn_http.c"
+#line 2853 "unicorn_http.c"
 	goto st0;
 tr141:
-#line 368 "unicorn_http.rl"
+#line 338 "unicorn_http.rl"
 	{
     hp->len.chunk = step_incr(hp->len.chunk, (*p), 16);
     if (hp->len.chunk < 0)
@@ -2893,7 +2863,7 @@ st103:
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 2897 "unicorn_http.c"
+#line 2867 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto st104;
 		case 59: goto st108;
@@ -2920,7 +2890,7 @@ st105:
 case 105:
 	goto tr148;
 tr148:
-#line 405 "unicorn_http.rl"
+#line 375 "unicorn_http.rl"
 	{
   skip_chunk_data_hack: {
     size_t nr = MIN((size_t)hp->len.chunk, REMAINING);
@@ -2942,7 +2912,7 @@ st106:
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 2946 "unicorn_http.c"
+#line 2916 "unicorn_http.c"
 	if ( (*p) == 13 )
 		goto st107;
 	goto st0;
@@ -3164,14 +3134,14 @@ case 114:
 		goto tr157;
 	goto st0;
 tr159:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st115;
 st115:
 	if ( ++p == pe )
 		goto _test_eof115;
 case 115:
-#line 3175 "unicorn_http.c"
+#line 3145 "unicorn_http.c"
 	switch( (*p) ) {
 		case 9: goto tr159;
 		case 13: goto tr160;
@@ -3182,14 +3152,14 @@ case 115:
 		goto st0;
 	goto tr158;
 tr158:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st116;
 st116:
 	if ( ++p == pe )
 		goto _test_eof116;
 case 116:
-#line 3193 "unicorn_http.c"
+#line 3163 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr162;
 		case 127: goto st0;
@@ -3201,30 +3171,30 @@ case 116:
 		goto st0;
 	goto st116;
 tr160:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
-#line 327 "unicorn_http.rl"
+#line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st117;
 tr162:
-#line 327 "unicorn_http.rl"
+#line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st117;
 tr169:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
-#line 326 "unicorn_http.rl"
+#line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st117;
 tr171:
-#line 326 "unicorn_http.rl"
+#line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st117;
 st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 3228 "unicorn_http.c"
+#line 3198 "unicorn_http.c"
 	if ( (*p) == 10 )
 		goto st114;
 	goto st0;
@@ -3236,7 +3206,7 @@ case 118:
 		goto tr164;
 	goto st0;
 tr164:
-#line 392 "unicorn_http.rl"
+#line 362 "unicorn_http.rl"
 	{
     cs = http_parser_first_final;
     goto post_exec;
@@ -3246,23 +3216,23 @@ st124:
 	if ( ++p == pe )
 		goto _test_eof124;
 case 124:
-#line 3250 "unicorn_http.c"
+#line 3220 "unicorn_http.c"
 	goto st0;
 tr157:
-#line 321 "unicorn_http.rl"
+#line 291 "unicorn_http.rl"
 	{ MARK(start.field, p); }
-#line 322 "unicorn_http.rl"
+#line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st119;
 tr165:
-#line 322 "unicorn_http.rl"
+#line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st119;
 st119:
 	if ( ++p == pe )
 		goto _test_eof119;
 case 119:
-#line 3266 "unicorn_http.c"
+#line 3236 "unicorn_http.c"
 	switch( (*p) ) {
 		case 33: goto tr165;
 		case 58: goto tr166;
@@ -3288,18 +3258,18 @@ case 119:
 		goto tr165;
 	goto st0;
 tr168:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st120;
 tr166:
-#line 324 "unicorn_http.rl"
+#line 294 "unicorn_http.rl"
 	{ hp->s.field_len = LEN(start.field, p); }
 	goto st120;
 st120:
 	if ( ++p == pe )
 		goto _test_eof120;
 case 120:
-#line 3303 "unicorn_http.c"
+#line 3273 "unicorn_http.c"
 	switch( (*p) ) {
 		case 9: goto tr168;
 		case 13: goto tr169;
@@ -3310,14 +3280,14 @@ case 120:
 		goto st0;
 	goto tr167;
 tr167:
-#line 325 "unicorn_http.rl"
+#line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st121;
 st121:
 	if ( ++p == pe )
 		goto _test_eof121;
 case 121:
-#line 3321 "unicorn_http.c"
+#line 3291 "unicorn_http.c"
 	switch( (*p) ) {
 		case 13: goto tr171;
 		case 127: goto st0;
@@ -3457,11 +3427,11 @@ case 121:
 	_out: {}
 	}
 
-#line 466 "unicorn_http.rl"
+#line 436 "unicorn_http.rl"
 post_exec: /* "_out:" also goes here */
   if (hp->cs != http_parser_error)
     hp->cs = cs;
-  hp->offset = p - buffer;
+  hp->offset = ulong2uint(p - buffer);
 
   assert(p <= pe && "buffer overflow after parsing execute");
   assert(hp->offset <= len && "offset longer than length");
@@ -3486,26 +3456,29 @@ static void set_url_scheme(VALUE env, VALUE *server_port)
   VALUE scheme = rb_hash_aref(env, g_rack_url_scheme);
 
   if (NIL_P(scheme)) {
-    if (trust_x_forward == Qfalse) {
-      scheme = g_http;
+    /*
+     * would anybody be horribly opposed to removing the X-Forwarded-SSL
+     * and X-Forwarded-Proto handling from this parser?  We've had it
+     * forever and nobody has said anything against it, either.
+     * Anyways, please send comments to our public mailing list:
+     * unicorn-public@bogomips.org (no HTML mail, no subscription necessary)
+     */
+    scheme = rb_hash_aref(env, g_http_x_forwarded_ssl);
+    if (!NIL_P(scheme) && STR_CSTR_EQ(scheme, "on")) {
+      *server_port = g_port_443;
+      scheme = g_https;
     } else {
-      scheme = rb_hash_aref(env, g_http_x_forwarded_ssl);
-      if (!NIL_P(scheme) && STR_CSTR_EQ(scheme, "on")) {
-        *server_port = g_port_443;
-        scheme = g_https;
+      scheme = rb_hash_aref(env, g_http_x_forwarded_proto);
+      if (NIL_P(scheme)) {
+        scheme = g_http;
       } else {
-        scheme = rb_hash_aref(env, g_http_x_forwarded_proto);
-        if (NIL_P(scheme)) {
-          scheme = g_http;
+        long len = RSTRING_LEN(scheme);
+        if (len >= 5 && !memcmp(RSTRING_PTR(scheme), "https", 5)) {
+          if (len != 5)
+            scheme = g_https;
+          *server_port = g_port_443;
         } else {
-          long len = RSTRING_LEN(scheme);
-          if (len >= 5 && !memcmp(RSTRING_PTR(scheme), "https", 5)) {
-            if (len != 5)
-              scheme = g_https;
-            *server_port = g_port_443;
-          } else {
-            scheme = g_http;
-          }
+          scheme = g_http;
         }
       }
     }
@@ -3603,7 +3576,6 @@ static VALUE HttpParser_init(VALUE self)
   http_parser_init(hp);
   hp->buf = rb_str_new(NULL, 0);
   hp->env = rb_hash_new();
-  hp->nr_requests = keepalive_requests;
 
   return self;
 }
@@ -3620,61 +3592,11 @@ static VALUE HttpParser_clear(VALUE self)
   struct http_parser *hp = data_get(self);
 
   http_parser_init(hp);
-  rb_funcall(hp->env, id_clear, 0);
-  rb_ivar_set(self, id_response_start_sent, Qfalse);
+  my_hash_clear(hp->env);
 
   return self;
 }
 
-/**
- * call-seq:
- *    parser.dechunk! => parser
- *
- * Resets the parser to a state suitable for dechunking response bodies
- *
- */
-static VALUE HttpParser_dechunk_bang(VALUE self)
-{
-  struct http_parser *hp = data_get(self);
-
-  http_parser_init(hp);
-
-  /*
-   * we don't care about trailers in dechunk-only mode,
-   * but if we did we'd set UH_FL_HASTRAILER and clear hp->env
-   */
-  if (0) {
-    rb_funcall(hp->env, id_clear, 0);
-    hp->flags = UH_FL_HASTRAILER;
-  }
-
-  hp->flags |= UH_FL_HASBODY | UH_FL_INBODY | UH_FL_CHUNKED;
-  hp->cs = http_parser_en_ChunkedBody;
-
-  return self;
-}
-
-/**
- * call-seq:
- *    parser.reset => nil
- *
- * Resets the parser to it's initial state so that you can reuse it
- * rather than making new ones.
- *
- * This method is deprecated and to be removed in Unicorn 4.x
- */
-static VALUE HttpParser_reset(VALUE self)
-{
-  static int warned;
-
-  if (!warned) {
-    rb_warn("Unicorn::HttpParser#reset is deprecated; "
-            "use Unicorn::HttpParser#clear instead");
-  }
-  HttpParser_clear(self);
-  return Qnil;
-}
-
 static void advance_str(VALUE str, off_t nr)
 {
   long len = RSTRING_LEN(str);
@@ -3837,15 +3759,13 @@ static VALUE HttpParser_keepalive(VALUE self)
  *    parser.next? => true or false
  *
  * Exactly like HttpParser#keepalive?, except it will reset the internal
- * parser state on next parse if it returns true.  It will also respect
- * the maximum *keepalive_requests* value and return false if that is
- * reached.
+ * parser state on next parse if it returns true.
  */
 static VALUE HttpParser_next(VALUE self)
 {
   struct http_parser *hp = data_get(self);
 
-  if ((HP_FL_ALL(hp, KEEPALIVE)) && (hp->nr_requests-- != 0)) {
+  if (HP_FL_ALL(hp, KEEPALIVE)) {
     HP_FL_SET(hp, TO_CLEAR);
     return Qtrue;
   }
@@ -3955,6 +3875,25 @@ static VALUE HttpParser_filter_body(VALUE self, VALUE dst, VALUE src)
   return src;
 }
 
+static VALUE HttpParser_rssset(VALUE self, VALUE boolean)
+{
+  struct http_parser *hp = data_get(self);
+
+  if (RTEST(boolean))
+    HP_FL_SET(hp, RESSTART);
+  else
+    HP_FL_UNSET(hp, RESSTART);
+
+  return boolean; /* ignored by Ruby anyways */
+}
+
+static VALUE HttpParser_rssget(VALUE self)
+{
+  struct http_parser *hp = data_get(self);
+
+  return HP_FL_TEST(hp, RESSTART) ? Qtrue : Qfalse;
+}
+
 #define SET_GLOBAL(var,str) do { \
   var = find_common_field(str, sizeof(str) - 1); \
   assert(!NIL_P(var) && "missed global field"); \
@@ -3964,7 +3903,7 @@ void Init_unicorn_http(void)
 {
   VALUE mUnicorn, cHttpParser;
 
-  mUnicorn = rb_const_get(rb_cObject, rb_intern("Unicorn"));
+  mUnicorn = rb_define_module("Unicorn");
   cHttpParser = rb_define_class_under(mUnicorn, "HttpParser", rb_cObject);
   eHttpParserError =
          rb_define_class_under(mUnicorn, "HttpParserError", rb_eIOError);
@@ -3977,8 +3916,6 @@ void Init_unicorn_http(void)
   rb_define_alloc_func(cHttpParser, HttpParser_alloc);
   rb_define_method(cHttpParser, "initialize", HttpParser_init, 0);
   rb_define_method(cHttpParser, "clear", HttpParser_clear, 0);
-  rb_define_method(cHttpParser, "reset", HttpParser_reset, 0);
-  rb_define_method(cHttpParser, "dechunk!", HttpParser_dechunk_bang, 0);
   rb_define_method(cHttpParser, "parse", HttpParser_parse, 0);
   rb_define_method(cHttpParser, "add_parse", HttpParser_add_parse, 1);
   rb_define_method(cHttpParser, "headers", HttpParser_headers, 2);
@@ -3991,6 +3928,8 @@ void Init_unicorn_http(void)
   rb_define_method(cHttpParser, "next?", HttpParser_next, 0);
   rb_define_method(cHttpParser, "buf", HttpParser_buf, 0);
   rb_define_method(cHttpParser, "env", HttpParser_env, 0);
+  rb_define_method(cHttpParser, "response_start_sent=", HttpParser_rssset, 1);
+  rb_define_method(cHttpParser, "response_start_sent", HttpParser_rssget, 0);
 
   /*
    * The maximum size a single chunk when using chunked transfer encoding.
@@ -4007,14 +3946,6 @@ void Init_unicorn_http(void)
    */
   rb_define_const(cHttpParser, "LENGTH_MAX", OFFT2NUM(UH_OFF_T_MAX));
 
-  /* default value for keepalive_requests */
-  rb_define_const(cHttpParser, "KEEPALIVE_REQUESTS_DEFAULT",
-                  ULONG2NUM(keepalive_requests));
-
-  rb_define_singleton_method(cHttpParser, "keepalive_requests", ka_req, 0);
-  rb_define_singleton_method(cHttpParser, "keepalive_requests=", set_ka_req, 1);
-  rb_define_singleton_method(cHttpParser, "trust_x_forwarded=", set_xftrust, 1);
-  rb_define_singleton_method(cHttpParser, "trust_x_forwarded?", xftrust, 0);
   rb_define_singleton_method(cHttpParser, "max_header_len=", set_maxhdrlen, 1);
 
   init_common_fields();
@@ -4023,9 +3954,11 @@ void Init_unicorn_http(void)
   SET_GLOBAL(g_http_transfer_encoding, "TRANSFER_ENCODING");
   SET_GLOBAL(g_content_length, "CONTENT_LENGTH");
   SET_GLOBAL(g_http_connection, "CONNECTION");
-  id_clear = rb_intern("clear");
   id_set_backtrace = rb_intern("set_backtrace");
-  id_response_start_sent = rb_intern("@response_start_sent");
   init_unicorn_httpdate();
+
+#ifndef HAVE_RB_HASH_CLEAR
+  id_clear = rb_intern("clear");
+#endif
 }
 #undef SET_GLOBAL