pitchfork 0.14.0 → 0.16.0

data/ext/pitchfork_http/pitchfork_http.c

@@ -38,12 +38,6 @@ void init_pitchfork_memory_page(VALUE);
 
 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 UINT2NUM(MAX_HEADER_LEN = NUM2UINT(len));
-}
-
 /* keep this small for other servers (e.g. yahns) since every client has one */
 struct http_parser {
   int cs; /* Ragel internal state */
@@ -97,7 +91,7 @@ static inline unsigned int ulong2uint(unsigned long n)
 #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 STR_NEW(M,FPC) str_new(PTR_TO(M), LEN(M, FPC))
 #define STRIPPED_STR_NEW(M,FPC) stripped_str_new(PTR_TO(M), LEN(M, FPC))
 
 #define HP_FL_TEST(hp,fl) ((hp)->flags & (UH_FL_##fl))
@@ -110,13 +104,29 @@ static int is_lws(char c)
   return (c == ' ' || c == '\t');
 }
 
-static VALUE stripped_str_new(const char *str, long len)
+static inline VALUE str_new(const char *str, long len)
+{
+    VALUE rb_str = rb_str_new(str, len);
+    /* The Rack spec states:
+    > If the string values for CGI keys contain non-ASCII characters, they should use ASCII-8BIT encoding.
+    If they are ASCII, only the server is free to encode them as it wishes.
+    We chose to encode them as UTF-8 as any reasonable application would expect that today, and having the
+    same encoding as literal strings makes for slightly faster comparisons.
+    We'd like to also encode other strings that would be valid UTF-8 into UTF-8, but that would
+    violate the spec, so we leave them in BINARY aka ASCII-8BIT. */
+    if (rb_enc_str_asciionly_p(rb_str)) {
+        RB_ENCODING_SET_INLINED(rb_str, rb_utf8_encindex());
+    }
+    return rb_str;
+}
+
+static inline VALUE stripped_str_new(const char *str, long len)
 {
   long end;
 
   for (end = len - 1; end >= 0 && is_lws(str[end]); end--);
 
-  return rb_str_new(str, end + 1);
+  return str_new(str, end + 1);
 }
 
 /*
@@ -315,12 +325,12 @@ static void write_value(VALUE self, struct http_parser *hp,
 /** Machine **/
 
 
-#line 422 "pitchfork_http.rl"
+#line 426 "pitchfork_http.rl"
 
 
 /** Data **/
 
-#line 324 "pitchfork_http.c"
+#line 334 "pitchfork_http.c"
 static const int http_parser_start = 1;
 static const int http_parser_first_final = 122;
 static const int http_parser_error = 0;
@@ -331,7 +341,7 @@ static const int http_parser_en_Trailers = 114;
 static const int http_parser_en_main = 1;
 
 
-#line 426 "pitchfork_http.rl"
+#line 430 "pitchfork_http.rl"
 
 static void http_parser_init(struct http_parser *hp)
 {
@@ -344,12 +354,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 348 "pitchfork_http.c"
+#line 358 "pitchfork_http.c"
 	{
 	cs = http_parser_start;
 	}
 
-#line 438 "pitchfork_http.rl"
+#line 442 "pitchfork_http.rl"
   hp->cs = cs;
 }
 
@@ -377,7 +387,7 @@ http_parser_execute(VALUE self, struct http_parser *hp, char *buffer, size_t len
     goto skip_chunk_data_hack;
   }
   
-#line 381 "pitchfork_http.c"
+#line 391 "pitchfork_http.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -412,14 +422,14 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 423 "pitchfork_http.c"
+#line 433 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr3;
 		case 33: goto st49;
@@ -445,14 +455,14 @@ case 2:
 		goto st49;
 	goto st0;
 tr3:
-#line 327 "pitchfork_http.rl"
+#line 337 "pitchfork_http.rl"
 	{ request_method(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 456 "pitchfork_http.c"
+#line 466 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 42: goto tr5;
 		case 47: goto tr6;
@@ -461,55 +471,54 @@ case 3:
 	}
 	goto st0;
 tr5:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 472 "pitchfork_http.c"
+#line 482 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
 		case 35: goto tr9;
 	}
 	goto st0;
 tr8:
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st5;
 tr42:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
-#line 347 "pitchfork_http.rl"
+#line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
-    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    if (STR_CSTR_EQ(str, "*")) {
+      VALUE str = rb_str_new("*", 1);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
   }
 	goto st5;
 tr45:
-#line 347 "pitchfork_http.rl"
+#line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
-    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    if (STR_CSTR_EQ(str, "*")) {
+      VALUE str = rb_str_new("*", 1);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
   }
 	goto st5;
 tr49:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -520,88 +529,55 @@ tr49:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st5;
 tr55:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st5;
 tr59:
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 593 "pitchfork_http.c"
+#line 569 "pitchfork_http.c"
 	if ( (*p) == 72 )
 		goto tr10;
 	goto st0;
 tr10:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-#line 605 "pitchfork_http.c"
+#line 581 "pitchfork_http.c"
 	if ( (*p) == 84 )
 		goto st7;
 	goto st0;
@@ -661,34 +637,34 @@ case 13:
 		goto st13;
 	goto st0;
 tr18:
-#line 356 "pitchfork_http.rl"
+#line 360 "pitchfork_http.rl"
 	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st14;
 tr26:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
 tr29:
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
 tr36:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st14;
 tr39:
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st14;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-#line 692 "pitchfork_http.c"
+#line 668 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 9: goto st15;
 		case 10: goto tr21;
@@ -717,14 +693,14 @@ case 14:
 		goto tr23;
 	goto st0;
 tr25:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st15;
 st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-#line 728 "pitchfork_http.c"
+#line 704 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 9: goto tr25;
 		case 10: goto tr26;
@@ -736,14 +712,14 @@ case 15:
 		goto st0;
 	goto tr24;
 tr24:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st16;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-#line 747 "pitchfork_http.c"
+#line 723 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr29;
 		case 13: goto tr30;
@@ -756,39 +732,39 @@ case 16:
 		goto st0;
 	goto st16;
 tr19:
-#line 356 "pitchfork_http.rl"
+#line 360 "pitchfork_http.rl"
 	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st17;
 tr27:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st17;
 tr30:
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st17;
 tr37:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st17;
 tr40:
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 787 "pitchfork_http.c"
+#line 763 "pitchfork_http.c"
 	if ( (*p) == 10 )
 		goto st14;
 	goto st0;
 tr21:
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -809,23 +785,12 @@ tr21:
   }
 	goto st122;
 tr104:
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -846,14 +811,19 @@ tr104:
   }
 	goto st122;
 tr108:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
-#line 347 "pitchfork_http.rl"
+#line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
-    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    if (STR_CSTR_EQ(str, "*")) {
+      VALUE str = rb_str_new("*", 1);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
   }
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -874,12 +844,17 @@ tr108:
   }
 	goto st122;
 tr112:
-#line 347 "pitchfork_http.rl"
+#line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
-    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    if (STR_CSTR_EQ(str, "*")) {
+      VALUE str = rb_str_new("*", 1);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
   }
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -900,7 +875,7 @@ tr112:
   }
 	goto st122;
 tr117:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -911,23 +886,12 @@ tr117:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -948,30 +912,19 @@ tr117:
   }
 	goto st122;
 tr124:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -992,28 +945,17 @@ tr124:
   }
 	goto st122;
 tr129:
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
-#line 372 "pitchfork_http.rl"
+#line 376 "pitchfork_http.rl"
 	{
     finalize_header(hp);
 
@@ -1037,44 +979,43 @@ st122:
 	if ( ++p == pe )
 		goto _test_eof122;
 case 122:
-#line 1041 "pitchfork_http.c"
+#line 983 "pitchfork_http.c"
 	goto st0;
 tr105:
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st18;
 tr109:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
-#line 347 "pitchfork_http.rl"
+#line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
-    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    if (STR_CSTR_EQ(str, "*")) {
+      VALUE str = rb_str_new("*", 1);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
   }
 	goto st18;
 tr113:
-#line 347 "pitchfork_http.rl"
+#line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
-    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    VALUE str = rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+    if (STR_CSTR_EQ(str, "*")) {
+      VALUE str = rb_str_new("*", 1);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
   }
 	goto st18;
 tr118:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -1085,94 +1026,61 @@ tr118:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st18;
 tr125:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st18;
 tr130:
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st18;
 st18:
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-#line 1158 "pitchfork_http.c"
+#line 1066 "pitchfork_http.c"
 	if ( (*p) == 10 )
 		goto tr21;
 	goto st0;
 tr23:
-#line 320 "pitchfork_http.rl"
+#line 330 "pitchfork_http.rl"
 	{ MARK(start.field, p); }
-#line 321 "pitchfork_http.rl"
+#line 331 "pitchfork_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st19;
 tr32:
-#line 321 "pitchfork_http.rl"
+#line 331 "pitchfork_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st19;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-#line 1176 "pitchfork_http.c"
+#line 1084 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 33: goto tr32;
 		case 58: goto tr33;
@@ -1198,18 +1106,18 @@ case 19:
 		goto tr32;
 	goto st0;
 tr35:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st20;
 tr33:
-#line 323 "pitchfork_http.rl"
+#line 333 "pitchfork_http.rl"
 	{ hp->s.field_len = LEN(start.field, p); }
 	goto st20;
 st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-#line 1213 "pitchfork_http.c"
+#line 1121 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 9: goto tr35;
 		case 10: goto tr36;
@@ -1221,14 +1129,14 @@ case 20:
 		goto st0;
 	goto tr34;
 tr34:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st21;
 st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 1232 "pitchfork_http.c"
+#line 1140 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr39;
 		case 13: goto tr40;
@@ -1241,25 +1149,14 @@ case 21:
 		goto st0;
 	goto st21;
 tr9:
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st22;
 tr50:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -1270,76 +1167,43 @@ tr50:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st22;
 tr56:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st22;
 tr60:
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 1343 "pitchfork_http.c"
+#line 1207 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr42;
 		case 35: goto st0;
@@ -1350,14 +1214,14 @@ case 22:
 		goto st0;
 	goto tr41;
 tr41:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st23;
 st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-#line 1361 "pitchfork_http.c"
+#line 1225 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr45;
 		case 35: goto st0;
@@ -1368,14 +1232,14 @@ case 23:
 		goto st0;
 	goto st23;
 tr43:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 1379 "pitchfork_http.c"
+#line 1243 "pitchfork_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st25;
@@ -1399,20 +1263,20 @@ case 25:
 		goto st23;
 	goto st0;
 tr6:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st26;
 tr76:
-#line 331 "pitchfork_http.rl"
+#line 341 "pitchfork_http.rl"
 	{ rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, p)); }
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st26;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 1416 "pitchfork_http.c"
+#line 1280 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr49;
 		case 35: goto tr50;
@@ -1450,7 +1314,7 @@ case 28:
 		goto st26;
 	goto st0;
 tr52:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -1466,7 +1330,7 @@ st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 1470 "pitchfork_http.c"
+#line 1334 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr55;
 		case 35: goto tr56;
@@ -1477,14 +1341,14 @@ case 29:
 		goto st0;
 	goto tr54;
 tr54:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 	goto st30;
 st30:
 	if ( ++p == pe )
 		goto _test_eof30;
 case 30:
-#line 1488 "pitchfork_http.c"
+#line 1352 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr59;
 		case 35: goto tr60;
@@ -1495,14 +1359,14 @@ case 30:
 		goto st0;
 	goto st30;
 tr57:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 	goto st31;
 st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-#line 1506 "pitchfork_http.c"
+#line 1370 "pitchfork_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st32;
@@ -1526,58 +1390,58 @@ case 32:
 		goto st30;
 	goto st0;
 tr7:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st33;
 st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 1539 "pitchfork_http.c"
+#line 1403 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 84: goto tr63;
 		case 116: goto tr63;
 	}
 	goto st0;
 tr63:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st34;
 st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 1553 "pitchfork_http.c"
+#line 1417 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 84: goto tr64;
 		case 116: goto tr64;
 	}
 	goto st0;
 tr64:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 1567 "pitchfork_http.c"
+#line 1431 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 80: goto tr65;
 		case 112: goto tr65;
 	}
 	goto st0;
 tr65:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st36;
 st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-#line 1581 "pitchfork_http.c"
+#line 1445 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 58: goto tr66;
 		case 83: goto tr67;
@@ -1585,7 +1449,7 @@ case 36:
 	}
 	goto st0;
 tr66:
-#line 328 "pitchfork_http.rl"
+#line 338 "pitchfork_http.rl"
 	{
     rb_hash_aset(hp->env, g_rack_url_scheme, STR_NEW(mark, p));
   }
@@ -1594,7 +1458,7 @@ st37:
 	if ( ++p == pe )
 		goto _test_eof37;
 case 37:
-#line 1598 "pitchfork_http.c"
+#line 1462 "pitchfork_http.c"
 	if ( (*p) == 47 )
 		goto st38;
 	goto st0;
@@ -1682,14 +1546,14 @@ case 42:
 		goto st40;
 	goto st0;
 tr72:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st43;
 st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 1693 "pitchfork_http.c"
+#line 1557 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 37: goto st41;
 		case 47: goto tr76;
@@ -1741,14 +1605,14 @@ case 44:
 		goto st0;
 	goto st40;
 tr73:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st45;
 st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 1752 "pitchfork_http.c"
+#line 1616 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 37: goto st41;
 		case 47: goto st0;
@@ -1826,14 +1690,14 @@ case 47:
 		goto st0;
 	goto st40;
 tr67:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st48;
 st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
-#line 1837 "pitchfork_http.c"
+#line 1701 "pitchfork_http.c"
 	if ( (*p) == 58 )
 		goto tr66;
 	goto st0;
@@ -2349,14 +2213,14 @@ case 67:
 		goto tr3;
 	goto st0;
 tr2:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st68;
 st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 2360 "pitchfork_http.c"
+#line 2224 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 32: goto tr3;
 		case 33: goto st49;
@@ -2440,14 +2304,14 @@ case 70:
 		goto st51;
 	goto st0;
 tr100:
-#line 327 "pitchfork_http.rl"
+#line 337 "pitchfork_http.rl"
 	{ request_method(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st71;
 st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 2451 "pitchfork_http.c"
+#line 2315 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 42: goto tr101;
 		case 47: goto tr102;
@@ -2456,14 +2320,14 @@ case 71:
 	}
 	goto st0;
 tr101:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st72;
 st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 2467 "pitchfork_http.c"
+#line 2331 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr104;
 		case 13: goto tr105;
@@ -2472,25 +2336,14 @@ case 72:
 	}
 	goto st0;
 tr106:
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st73;
 tr119:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -2501,76 +2354,43 @@ tr119:
     if (!STR_CSTR_EQ(val, "*"))
       rb_hash_aset(hp->env, g_path_info, val);
   }
-#line 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st73;
 tr126:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st73;
 tr131:
-#line 352 "pitchfork_http.rl"
+#line 356 "pitchfork_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 332 "pitchfork_http.rl"
+#line 342 "pitchfork_http.rl"
 	{
-    VALUE str;
-
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
-    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
-    /*
-     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
-     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
-     */
-    if (STR_CSTR_EQ(str, "*")) {
-      str = rb_str_new(NULL, 0);
-      rb_hash_aset(hp->env, g_path_info, str);
-      rb_hash_aset(hp->env, g_request_path, str);
-    }
+    rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
   }
 	goto st73;
 st73:
 	if ( ++p == pe )
 		goto _test_eof73;
 case 73:
-#line 2574 "pitchfork_http.c"
+#line 2394 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr108;
 		case 13: goto tr109;
@@ -2583,14 +2403,14 @@ case 73:
 		goto st0;
 	goto tr107;
 tr107:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st74;
 st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 2594 "pitchfork_http.c"
+#line 2414 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr112;
 		case 13: goto tr113;
@@ -2603,14 +2423,14 @@ case 74:
 		goto st0;
 	goto st74;
 tr110:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st75;
 st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 2614 "pitchfork_http.c"
+#line 2434 "pitchfork_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st76;
@@ -2634,20 +2454,20 @@ case 76:
 		goto st74;
 	goto st0;
 tr102:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st77;
 tr147:
-#line 331 "pitchfork_http.rl"
+#line 341 "pitchfork_http.rl"
 	{ rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, p)); }
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st77;
 st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
-#line 2651 "pitchfork_http.c"
+#line 2471 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr117;
 		case 13: goto tr118;
@@ -2687,7 +2507,7 @@ case 79:
 		goto st77;
 	goto st0;
 tr121:
-#line 357 "pitchfork_http.rl"
+#line 361 "pitchfork_http.rl"
 	{
     VALUE val;
 
@@ -2703,7 +2523,7 @@ st80:
 	if ( ++p == pe )
 		goto _test_eof80;
 case 80:
-#line 2707 "pitchfork_http.c"
+#line 2527 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr124;
 		case 13: goto tr125;
@@ -2716,14 +2536,14 @@ case 80:
 		goto st0;
 	goto tr123;
 tr123:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 	goto st81;
 st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 2727 "pitchfork_http.c"
+#line 2547 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr129;
 		case 13: goto tr130;
@@ -2736,14 +2556,14 @@ case 81:
 		goto st0;
 	goto st81;
 tr127:
-#line 351 "pitchfork_http.rl"
+#line 355 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 	goto st82;
 st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 2747 "pitchfork_http.c"
+#line 2567 "pitchfork_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st83;
@@ -2767,58 +2587,58 @@ case 83:
 		goto st81;
 	goto st0;
 tr103:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st84;
 st84:
 	if ( ++p == pe )
 		goto _test_eof84;
 case 84:
-#line 2780 "pitchfork_http.c"
+#line 2600 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 84: goto tr134;
 		case 116: goto tr134;
 	}
 	goto st0;
 tr134:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st85;
 st85:
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 2794 "pitchfork_http.c"
+#line 2614 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 84: goto tr135;
 		case 116: goto tr135;
 	}
 	goto st0;
 tr135:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st86;
 st86:
 	if ( ++p == pe )
 		goto _test_eof86;
 case 86:
-#line 2808 "pitchfork_http.c"
+#line 2628 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 80: goto tr136;
 		case 112: goto tr136;
 	}
 	goto st0;
 tr136:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st87;
 st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2822 "pitchfork_http.c"
+#line 2642 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 58: goto tr137;
 		case 83: goto tr138;
@@ -2826,7 +2646,7 @@ case 87:
 	}
 	goto st0;
 tr137:
-#line 328 "pitchfork_http.rl"
+#line 338 "pitchfork_http.rl"
 	{
     rb_hash_aset(hp->env, g_rack_url_scheme, STR_NEW(mark, p));
   }
@@ -2835,7 +2655,7 @@ st88:
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 2839 "pitchfork_http.c"
+#line 2659 "pitchfork_http.c"
 	if ( (*p) == 47 )
 		goto st89;
 	goto st0;
@@ -2923,14 +2743,14 @@ case 93:
 		goto st91;
 	goto st0;
 tr143:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st94;
 st94:
 	if ( ++p == pe )
 		goto _test_eof94;
 case 94:
-#line 2934 "pitchfork_http.c"
+#line 2754 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 37: goto st92;
 		case 47: goto tr147;
@@ -2982,14 +2802,14 @@ case 95:
 		goto st0;
 	goto st91;
 tr144:
-#line 318 "pitchfork_http.rl"
+#line 328 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st96;
 st96:
 	if ( ++p == pe )
 		goto _test_eof96;
 case 96:
-#line 2993 "pitchfork_http.c"
+#line 2813 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 37: goto st92;
 		case 47: goto st0;
@@ -3067,14 +2887,14 @@ case 98:
 		goto st0;
 	goto st91;
 tr138:
-#line 322 "pitchfork_http.rl"
+#line 332 "pitchfork_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st99;
 st99:
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 3078 "pitchfork_http.c"
+#line 2898 "pitchfork_http.c"
 	if ( (*p) == 58 )
 		goto tr137;
 	goto st0;
@@ -3094,7 +2914,7 @@ case 100:
 		goto tr152;
 	goto st0;
 tr151:
-#line 367 "pitchfork_http.rl"
+#line 371 "pitchfork_http.rl"
 	{
     hp->len.chunk = step_incr(hp->len.chunk, (*p), 16);
     if (hp->len.chunk < 0)
@@ -3105,7 +2925,7 @@ st101:
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 3109 "pitchfork_http.c"
+#line 2929 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr153;
 		case 13: goto st102;
@@ -3122,7 +2942,7 @@ case 101:
 		goto tr152;
 	goto st0;
 tr153:
-#line 396 "pitchfork_http.rl"
+#line 400 "pitchfork_http.rl"
 	{
     HP_FL_SET(hp, INTRAILER);
     cs = http_parser_en_Trailers;
@@ -3135,7 +2955,7 @@ st123:
 	if ( ++p == pe )
 		goto _test_eof123;
 case 123:
-#line 3139 "pitchfork_http.c"
+#line 2959 "pitchfork_http.c"
 	goto st0;
 st102:
 	if ( ++p == pe )
@@ -3145,7 +2965,7 @@ case 102:
 		goto tr153;
 	goto st0;
 tr152:
-#line 367 "pitchfork_http.rl"
+#line 371 "pitchfork_http.rl"
 	{
     hp->len.chunk = step_incr(hp->len.chunk, (*p), 16);
     if (hp->len.chunk < 0)
@@ -3156,7 +2976,7 @@ st103:
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 3160 "pitchfork_http.c"
+#line 2980 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto st104;
 		case 13: goto st107;
@@ -3177,7 +2997,7 @@ st104:
 case 104:
 	goto tr159;
 tr159:
-#line 404 "pitchfork_http.rl"
+#line 408 "pitchfork_http.rl"
 	{
   skip_chunk_data_hack: {
     size_t nr = MIN((size_t)hp->len.chunk, REMAINING);
@@ -3199,7 +3019,7 @@ st105:
 	if ( ++p == pe )
 		goto _test_eof105;
 case 105:
-#line 3203 "pitchfork_http.c"
+#line 3023 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto st100;
 		case 13: goto st106;
@@ -3406,30 +3226,30 @@ case 113:
 		goto st113;
 	goto st0;
 tr172:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st114;
 tr175:
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st114;
 tr182:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st114;
 tr185:
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st114;
 st114:
 	if ( ++p == pe )
 		goto _test_eof114;
 case 114:
-#line 3433 "pitchfork_http.c"
+#line 3253 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 9: goto st115;
 		case 10: goto tr167;
@@ -3458,14 +3278,14 @@ case 114:
 		goto tr169;
 	goto st0;
 tr171:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st115;
 st115:
 	if ( ++p == pe )
 		goto _test_eof115;
 case 115:
-#line 3469 "pitchfork_http.c"
+#line 3289 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 9: goto tr171;
 		case 10: goto tr172;
@@ -3477,14 +3297,14 @@ case 115:
 		goto st0;
 	goto tr170;
 tr170:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st116;
 st116:
 	if ( ++p == pe )
 		goto _test_eof116;
 case 116:
-#line 3488 "pitchfork_http.c"
+#line 3308 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr175;
 		case 13: goto tr176;
@@ -3497,35 +3317,35 @@ case 116:
 		goto st0;
 	goto st116;
 tr173:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st117;
 tr176:
-#line 326 "pitchfork_http.rl"
+#line 336 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st117;
 tr183:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st117;
 tr186:
-#line 325 "pitchfork_http.rl"
+#line 335 "pitchfork_http.rl"
 	{ write_value(self, hp, buffer, p); }
 	goto st117;
 st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 3524 "pitchfork_http.c"
+#line 3344 "pitchfork_http.c"
 	if ( (*p) == 10 )
 		goto st114;
 	goto st0;
 tr167:
-#line 391 "pitchfork_http.rl"
+#line 395 "pitchfork_http.rl"
 	{
     cs = http_parser_first_final;
     goto post_exec;
@@ -3535,7 +3355,7 @@ st124:
 	if ( ++p == pe )
 		goto _test_eof124;
 case 124:
-#line 3539 "pitchfork_http.c"
+#line 3359 "pitchfork_http.c"
 	goto st0;
 st118:
 	if ( ++p == pe )
@@ -3545,20 +3365,20 @@ case 118:
 		goto tr167;
 	goto st0;
 tr169:
-#line 320 "pitchfork_http.rl"
+#line 330 "pitchfork_http.rl"
 	{ MARK(start.field, p); }
-#line 321 "pitchfork_http.rl"
+#line 331 "pitchfork_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st119;
 tr178:
-#line 321 "pitchfork_http.rl"
+#line 331 "pitchfork_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st119;
 st119:
 	if ( ++p == pe )
 		goto _test_eof119;
 case 119:
-#line 3562 "pitchfork_http.c"
+#line 3382 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 33: goto tr178;
 		case 58: goto tr179;
@@ -3584,18 +3404,18 @@ case 119:
 		goto tr178;
 	goto st0;
 tr181:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st120;
 tr179:
-#line 323 "pitchfork_http.rl"
+#line 333 "pitchfork_http.rl"
 	{ hp->s.field_len = LEN(start.field, p); }
 	goto st120;
 st120:
 	if ( ++p == pe )
 		goto _test_eof120;
 case 120:
-#line 3599 "pitchfork_http.c"
+#line 3419 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 9: goto tr181;
 		case 10: goto tr182;
@@ -3607,14 +3427,14 @@ case 120:
 		goto st0;
 	goto tr180;
 tr180:
-#line 324 "pitchfork_http.rl"
+#line 334 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st121;
 st121:
 	if ( ++p == pe )
 		goto _test_eof121;
 case 121:
-#line 3618 "pitchfork_http.c"
+#line 3438 "pitchfork_http.c"
 	switch( (*p) ) {
 		case 10: goto tr185;
 		case 13: goto tr186;
@@ -3755,7 +3575,7 @@ case 121:
 	_out: {}
 	}
 
-#line 465 "pitchfork_http.rl"
+#line 469 "pitchfork_http.rl"
 post_exec: /* "_out:" also goes here */
   if (hp->cs != http_parser_error)
     hp->cs = cs;
@@ -3906,6 +3726,12 @@ static VALUE HttpParser_alloc(VALUE klass)
   return TypedData_Make_Struct(klass, struct http_parser, &hp_type, hp);
 }
 
+#ifndef HAVE_RB_HASH_NEW_CAPA
+static inline VALUE rb_hash_new_capa(long capa) {
+    return rb_hash_new();
+}
+#endif
+
 /**
  * call-seq:
  *    parser.new => parser
@@ -3918,7 +3744,7 @@ static VALUE HttpParser_init(VALUE self)
 
   http_parser_init(hp);
   RB_OBJ_WRITE(self, &hp->buf, rb_str_new(NULL, 0));
-  RB_OBJ_WRITE(self, &hp->env, rb_hash_new());
+  RB_OBJ_WRITE(self, &hp->env, rb_hash_new_capa(32)); // Even the simplest request will have 10 keys
 
   return self;
 }
@@ -4304,8 +4130,6 @@ RUBY_FUNC_EXPORTED void Init_pitchfork_http(void)
    */
   rb_define_const(cHttpParser, "LENGTH_MAX", OFFT2NUM(UH_OFF_T_MAX));
 
-  rb_define_singleton_method(cHttpParser, "max_header_len=", set_maxhdrlen, 1);
-
   init_common_fields();
   SET_GLOBAL(g_http_host, "HOST");
   SET_GLOBAL(g_http_trailer, "TRAILER");