pitchfork 0.1.2 → 0.2.0

data/ext/pitchfork_http/pitchfork_http.c

@@ -226,7 +226,7 @@ static int is_chunked(VALUE v)
   return rb_funcall(cHttpParser, id_is_chunked_p, 1, v) != Qfalse;
 }
 
-static void write_value(struct http_parser *hp,
+static void write_value(VALUE self, struct http_parser *hp,
                         const char *buffer, const char *p)
 {
   VALUE f = find_common_field(PTR_TO(start.field), hp->s.field_len);
@@ -246,7 +246,7 @@ static void write_value(struct http_parser *hp,
      * rack env variable.
      */
     if (CONST_MEM_EQ("VERSION", field, flen)) {
-      hp->cont = Qnil;
+      RB_OBJ_WRITE(self, &hp->cont, Qnil);
       return;
     }
     f = uncommon_field(field, flen);
@@ -298,16 +298,16 @@ static void write_value(struct http_parser *hp,
 
   e = rb_hash_aref(hp->env, f);
   if (NIL_P(e)) {
-    hp->cont = rb_hash_aset(hp->env, f, v);
+    RB_OBJ_WRITE(self, &hp->cont, rb_hash_aset(hp->env, f, v));
   } else if (f == g_http_host) {
     /*
      * ignored, absolute URLs in REQUEST_URI take precedence over
      * the Host: header (ref: rfc 2616, section 5.2.1)
      */
-     hp->cont = Qnil;
+    RB_OBJ_WRITE(self, &hp->cont, Qnil);
   } else {
     rb_str_buf_cat(e, ",", 1);
-    hp->cont = rb_str_buf_append(e, v);
+    RB_OBJ_WRITE(self, &hp->cont, rb_str_buf_append(e, v));
   }
 }
 
@@ -354,7 +354,7 @@ static void http_parser_init(struct http_parser *hp)
 
 /** exec **/
 static void
-http_parser_execute(struct http_parser *hp, char *buffer, size_t len)
+http_parser_execute(VALUE self, struct http_parser *hp, char *buffer, size_t len)
 {
   const char *p, *pe;
   int cs = hp->cs;
@@ -491,7 +491,7 @@ tr8:
     }
   }
 	goto st5;
-tr41:
+tr42:
 #line 317 "pitchfork_http.rl"
 	{MARK(mark, p); }
 #line 346 "pitchfork_http.rl"
@@ -500,14 +500,14 @@ tr41:
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st5;
-tr44:
+tr45:
 #line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st5;
-tr48:
+tr49:
 #line 356 "pitchfork_http.rl"
 	{
     VALUE val;
@@ -536,7 +536,7 @@ tr48:
     }
   }
 	goto st5;
-tr54:
+tr55:
 #line 350 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 #line 351 "pitchfork_http.rl"
@@ -561,7 +561,7 @@ tr54:
     }
   }
 	goto st5;
-tr58:
+tr59:
 #line 351 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -663,25 +663,25 @@ tr18:
 #line 355 "pitchfork_http.rl"
 	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st14;
-tr25:
+tr26:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
-tr30:
+tr29:
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
-tr35:
+tr36:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
+	{ write_value(self, hp, buffer, p); }
 	goto st14;
 tr39:
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
+	{ write_value(self, hp, buffer, p); }
 	goto st14;
 st14:
 	if ( ++p == pe )
@@ -715,7 +715,7 @@ case 14:
 	} else
 		goto tr23;
 	goto st0;
-tr24:
+tr25:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st15;
@@ -725,67 +725,67 @@ st15:
 case 15:
 #line 727 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 9: goto tr24;
-		case 10: goto tr25;
-		case 13: goto tr26;
-		case 32: goto tr24;
+		case 9: goto tr25;
+		case 10: goto tr26;
+		case 13: goto tr27;
+		case 32: goto tr25;
+		case 127: goto st0;
+	}
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto tr24;
+tr24:
+#line 323 "pitchfork_http.rl"
+	{ MARK(mark, p); }
+	goto st16;
+st16:
+	if ( ++p == pe )
+		goto _test_eof16;
+case 16:
+#line 746 "pitchfork_http.c"
+	switch( (*p) ) {
+		case 10: goto tr29;
+		case 13: goto tr30;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( (*p) > 8 ) {
+		if ( 11 <= (*p) && (*p) <= 31 )
+			goto st0;
+	} else if ( (*p) >= 0 )
 		goto st0;
-	goto tr27;
+	goto st16;
 tr19:
 #line 355 "pitchfork_http.rl"
 	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
-	goto st16;
-tr26:
+	goto st17;
+tr27:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
-	goto st16;
-tr31:
+	goto st17;
+tr30:
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
-	goto st16;
-tr36:
+	goto st17;
+tr37:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
-	goto st16;
+	{ write_value(self, hp, buffer, p); }
+	goto st17;
 tr40:
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
-	goto st16;
-st16:
-	if ( ++p == pe )
-		goto _test_eof16;
-case 16:
-#line 766 "pitchfork_http.c"
-	if ( (*p) == 10 )
-		goto st14;
-	goto st0;
-tr27:
-#line 323 "pitchfork_http.rl"
-	{ MARK(mark, p); }
+	{ write_value(self, hp, buffer, p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 778 "pitchfork_http.c"
-	switch( (*p) ) {
-		case 10: goto tr30;
-		case 13: goto tr31;
-		case 127: goto st0;
-	}
-	if ( (*p) > 8 ) {
-		if ( 11 <= (*p) && (*p) <= 31 )
-			goto st0;
-	} else
-		goto st0;
-	goto st17;
+#line 786 "pitchfork_http.c"
+	if ( (*p) == 10 )
+		goto st14;
+	goto st0;
 tr21:
 #line 371 "pitchfork_http.rl"
 	{
@@ -844,7 +844,7 @@ tr104:
     goto post_exec;
   }
 	goto st122;
-tr107:
+tr108:
 #line 317 "pitchfork_http.rl"
 	{MARK(mark, p); }
 #line 346 "pitchfork_http.rl"
@@ -872,7 +872,7 @@ tr107:
     goto post_exec;
   }
 	goto st122;
-tr111:
+tr112:
 #line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
@@ -898,7 +898,7 @@ tr111:
     goto post_exec;
   }
 	goto st122;
-tr116:
+tr117:
 #line 356 "pitchfork_http.rl"
 	{
     VALUE val;
@@ -946,7 +946,7 @@ tr116:
     goto post_exec;
   }
 	goto st122;
-tr123:
+tr124:
 #line 350 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 #line 351 "pitchfork_http.rl"
@@ -990,7 +990,7 @@ tr123:
     goto post_exec;
   }
 	goto st122;
-tr128:
+tr129:
 #line 351 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -1056,7 +1056,7 @@ tr105:
     }
   }
 	goto st18;
-tr108:
+tr109:
 #line 317 "pitchfork_http.rl"
 	{MARK(mark, p); }
 #line 346 "pitchfork_http.rl"
@@ -1065,14 +1065,14 @@ tr108:
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st18;
-tr112:
+tr113:
 #line 346 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st18;
-tr117:
+tr118:
 #line 356 "pitchfork_http.rl"
 	{
     VALUE val;
@@ -1101,7 +1101,7 @@ tr117:
     }
   }
 	goto st18;
-tr124:
+tr125:
 #line 350 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 #line 351 "pitchfork_http.rl"
@@ -1126,7 +1126,7 @@ tr124:
     }
   }
 	goto st18;
-tr129:
+tr130:
 #line 351 "pitchfork_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -1196,7 +1196,7 @@ case 19:
 	} else
 		goto tr32;
 	goto st0;
-tr34:
+tr35:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st20;
@@ -1210,16 +1210,16 @@ st20:
 case 20:
 #line 1212 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 9: goto tr34;
-		case 10: goto tr35;
-		case 13: goto tr36;
-		case 32: goto tr34;
+		case 9: goto tr35;
+		case 10: goto tr36;
+		case 13: goto tr37;
+		case 32: goto tr35;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr37;
-tr37:
+	goto tr34;
+tr34:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st21;
@@ -1236,7 +1236,7 @@ case 21:
 	if ( (*p) > 8 ) {
 		if ( 11 <= (*p) && (*p) <= 31 )
 			goto st0;
-	} else
+	} else if ( (*p) >= 0 )
 		goto st0;
 	goto st21;
 tr9:
@@ -1340,15 +1340,15 @@ st22:
 case 22:
 #line 1342 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 32: goto tr41;
+		case 32: goto tr42;
 		case 35: goto st0;
 		case 37: goto tr43;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr42;
-tr42:
+	goto tr41;
+tr41:
 #line 317 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st23;
@@ -1358,12 +1358,12 @@ st23:
 case 23:
 #line 1360 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 32: goto tr44;
+		case 32: goto tr45;
 		case 35: goto st0;
 		case 37: goto st24;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st23;
 tr43:
@@ -1413,13 +1413,13 @@ st26:
 case 26:
 #line 1415 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 32: goto tr48;
+		case 32: goto tr49;
 		case 35: goto tr50;
 		case 37: goto st27;
 		case 63: goto tr52;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st26;
 st27:
@@ -1467,15 +1467,15 @@ st29:
 case 29:
 #line 1469 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 32: goto tr54;
+		case 32: goto tr55;
 		case 35: goto tr56;
 		case 37: goto tr57;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr55;
-tr55:
+	goto tr54;
+tr54:
 #line 350 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 	goto st30;
@@ -1485,12 +1485,12 @@ st30:
 case 30:
 #line 1487 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 32: goto tr58;
+		case 32: goto tr59;
 		case 35: goto tr60;
 		case 37: goto st31;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st30;
 tr57:
@@ -1620,7 +1620,7 @@ case 39:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) < 65 ) {
@@ -1646,7 +1646,7 @@ case 40:
 		case 127: goto st0;
 	}
 	if ( (*p) < 34 ) {
-		if ( (*p) <= 32 )
+		if ( 0 <= (*p) && (*p) <= 32 )
 			goto st0;
 	} else if ( (*p) > 35 ) {
 		if ( 62 <= (*p) && (*p) <= 63 )
@@ -1702,7 +1702,7 @@ case 43:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) < 65 ) {
@@ -1728,7 +1728,7 @@ case 44:
 		case 127: goto st0;
 	}
 	if ( (*p) < 34 ) {
-		if ( (*p) <= 32 )
+		if ( 0 <= (*p) && (*p) <= 32 )
 			goto st0;
 	} else if ( (*p) > 35 ) {
 		if ( (*p) > 57 ) {
@@ -1759,7 +1759,7 @@ case 45:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 58 ) {
 		if ( (*p) < 65 ) {
@@ -1789,7 +1789,7 @@ case 46:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 58 ) {
 		if ( (*p) < 65 ) {
@@ -1816,7 +1816,7 @@ case 47:
 		case 127: goto st0;
 	}
 	if ( (*p) < 34 ) {
-		if ( (*p) <= 32 )
+		if ( 0 <= (*p) && (*p) <= 32 )
 			goto st0;
 	} else if ( (*p) > 35 ) {
 		if ( 62 <= (*p) && (*p) <= 63 )
@@ -2571,17 +2571,17 @@ st73:
 case 73:
 #line 2573 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 10: goto tr107;
-		case 13: goto tr108;
-		case 32: goto tr41;
+		case 10: goto tr108;
+		case 13: goto tr109;
+		case 32: goto tr42;
 		case 35: goto st0;
 		case 37: goto tr110;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr109;
-tr109:
+	goto tr107;
+tr107:
 #line 317 "pitchfork_http.rl"
 	{MARK(mark, p); }
 	goto st74;
@@ -2591,14 +2591,14 @@ st74:
 case 74:
 #line 2593 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 10: goto tr111;
-		case 13: goto tr112;
-		case 32: goto tr44;
+		case 10: goto tr112;
+		case 13: goto tr113;
+		case 32: goto tr45;
 		case 35: goto st0;
 		case 37: goto st75;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st74;
 tr110:
@@ -2648,15 +2648,15 @@ st77:
 case 77:
 #line 2650 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 10: goto tr116;
-		case 13: goto tr117;
-		case 32: goto tr48;
+		case 10: goto tr117;
+		case 13: goto tr118;
+		case 32: goto tr49;
 		case 35: goto tr119;
 		case 37: goto st78;
 		case 63: goto tr121;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st77;
 st78:
@@ -2704,17 +2704,17 @@ st80:
 case 80:
 #line 2706 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 10: goto tr123;
-		case 13: goto tr124;
-		case 32: goto tr54;
+		case 10: goto tr124;
+		case 13: goto tr125;
+		case 32: goto tr55;
 		case 35: goto tr126;
 		case 37: goto tr127;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr125;
-tr125:
+	goto tr123;
+tr123:
 #line 350 "pitchfork_http.rl"
 	{MARK(start.query, p); }
 	goto st81;
@@ -2724,14 +2724,14 @@ st81:
 case 81:
 #line 2726 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 10: goto tr128;
-		case 13: goto tr129;
-		case 32: goto tr58;
+		case 10: goto tr129;
+		case 13: goto tr130;
+		case 32: goto tr59;
 		case 35: goto tr131;
 		case 37: goto st82;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st81;
 tr127:
@@ -2861,7 +2861,7 @@ case 90:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) < 65 ) {
@@ -2887,7 +2887,7 @@ case 91:
 		case 127: goto st0;
 	}
 	if ( (*p) < 34 ) {
-		if ( (*p) <= 32 )
+		if ( 0 <= (*p) && (*p) <= 32 )
 			goto st0;
 	} else if ( (*p) > 35 ) {
 		if ( 62 <= (*p) && (*p) <= 63 )
@@ -2943,7 +2943,7 @@ case 94:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) < 65 ) {
@@ -2969,7 +2969,7 @@ case 95:
 		case 127: goto st0;
 	}
 	if ( (*p) < 34 ) {
-		if ( (*p) <= 32 )
+		if ( 0 <= (*p) && (*p) <= 32 )
 			goto st0;
 	} else if ( (*p) > 35 ) {
 		if ( (*p) > 57 ) {
@@ -3000,7 +3000,7 @@ case 96:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 58 ) {
 		if ( (*p) < 65 ) {
@@ -3030,7 +3030,7 @@ case 97:
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 35 )
 				goto st0;
-		} else
+		} else if ( (*p) >= 0 )
 			goto st0;
 	} else if ( (*p) > 58 ) {
 		if ( (*p) < 65 ) {
@@ -3057,7 +3057,7 @@ case 98:
 		case 127: goto st0;
 	}
 	if ( (*p) < 34 ) {
-		if ( (*p) <= 32 )
+		if ( 0 <= (*p) && (*p) <= 32 )
 			goto st0;
 	} else if ( (*p) > 35 ) {
 		if ( 62 <= (*p) && (*p) <= 63 )
@@ -3404,25 +3404,25 @@ case 113:
 	} else
 		goto st113;
 	goto st0;
-tr171:
+tr172:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st114;
-tr176:
+tr175:
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st114;
-tr181:
+tr182:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
+	{ write_value(self, hp, buffer, p); }
 	goto st114;
 tr185:
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
+	{ write_value(self, hp, buffer, p); }
 	goto st114;
 st114:
 	if ( ++p == pe )
@@ -3456,7 +3456,7 @@ case 114:
 	} else
 		goto tr169;
 	goto st0;
-tr170:
+tr171:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st115;
@@ -3466,63 +3466,63 @@ st115:
 case 115:
 #line 3468 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 9: goto tr170;
-		case 10: goto tr171;
-		case 13: goto tr172;
-		case 32: goto tr170;
+		case 9: goto tr171;
+		case 10: goto tr172;
+		case 13: goto tr173;
+		case 32: goto tr171;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr173;
-tr172:
+	goto tr170;
+tr170:
+#line 323 "pitchfork_http.rl"
+	{ MARK(mark, p); }
+	goto st116;
+st116:
+	if ( ++p == pe )
+		goto _test_eof116;
+case 116:
+#line 3487 "pitchfork_http.c"
+	switch( (*p) ) {
+		case 10: goto tr175;
+		case 13: goto tr176;
+		case 127: goto st0;
+	}
+	if ( (*p) > 8 ) {
+		if ( 11 <= (*p) && (*p) <= 31 )
+			goto st0;
+	} else if ( (*p) >= 0 )
+		goto st0;
+	goto st116;
+tr173:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
-	goto st116;
-tr177:
+	goto st117;
+tr176:
 #line 325 "pitchfork_http.rl"
 	{ write_cont_value(hp, buffer, p); }
-	goto st116;
-tr182:
+	goto st117;
+tr183:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
-	goto st116;
+	{ write_value(self, hp, buffer, p); }
+	goto st117;
 tr186:
 #line 324 "pitchfork_http.rl"
-	{ write_value(hp, buffer, p); }
-	goto st116;
-st116:
-	if ( ++p == pe )
-		goto _test_eof116;
-case 116:
-#line 3503 "pitchfork_http.c"
-	if ( (*p) == 10 )
-		goto st114;
-	goto st0;
-tr173:
-#line 323 "pitchfork_http.rl"
-	{ MARK(mark, p); }
+	{ write_value(self, hp, buffer, p); }
 	goto st117;
 st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 3515 "pitchfork_http.c"
-	switch( (*p) ) {
-		case 10: goto tr176;
-		case 13: goto tr177;
-		case 127: goto st0;
-	}
-	if ( (*p) > 8 ) {
-		if ( 11 <= (*p) && (*p) <= 31 )
-			goto st0;
-	} else
-		goto st0;
-	goto st117;
+#line 3523 "pitchfork_http.c"
+	if ( (*p) == 10 )
+		goto st114;
+	goto st0;
 tr167:
 #line 390 "pitchfork_http.rl"
 	{
@@ -3582,7 +3582,7 @@ case 119:
 	} else
 		goto tr178;
 	goto st0;
-tr180:
+tr181:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st120;
@@ -3596,16 +3596,16 @@ st120:
 case 120:
 #line 3598 "pitchfork_http.c"
 	switch( (*p) ) {
-		case 9: goto tr180;
-		case 10: goto tr181;
-		case 13: goto tr182;
-		case 32: goto tr180;
+		case 9: goto tr181;
+		case 10: goto tr182;
+		case 13: goto tr183;
+		case 32: goto tr181;
 		case 127: goto st0;
 	}
-	if ( (*p) <= 31 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr183;
-tr183:
+	goto tr180;
+tr180:
 #line 323 "pitchfork_http.rl"
 	{ MARK(mark, p); }
 	goto st121;
@@ -3622,7 +3622,7 @@ case 121:
 	if ( (*p) > 8 ) {
 		if ( 11 <= (*p) && (*p) <= 31 )
 			goto st0;
-	} else
+	} else if ( (*p) >= 0 )
 		goto st0;
 	goto st121;
 	}
@@ -3779,9 +3779,13 @@ static size_t hp_memsize(const void *ptr)
 }
 
 static const rb_data_type_t hp_type = {
-  "pitchfork_http",
-  { hp_mark, RUBY_TYPED_DEFAULT_FREE, hp_memsize, /* reserved */ },
-  /* parent, data, [ flags ] */
+    .wrap_struct_name = "pitchfork_http_parser",
+    .function = {
+        .dmark = hp_mark,
+        .dfree = RUBY_TYPED_DEFAULT_FREE,
+        .dsize = hp_memsize,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
 static struct http_parser *data_get(VALUE self)
@@ -3912,8 +3916,8 @@ static VALUE HttpParser_init(VALUE self)
   struct http_parser *hp = data_get(self);
 
   http_parser_init(hp);
-  hp->buf = rb_str_new(NULL, 0);
-  hp->env = rb_hash_new();
+  RB_OBJ_WRITE(self, &hp->buf, rb_str_new(NULL, 0));
+  RB_OBJ_WRITE(self, &hp->env, rb_hash_new());
 
   return self;
 }
@@ -3994,7 +3998,7 @@ static VALUE HttpParser_parse(VALUE self)
   if (HP_FL_TEST(hp, TO_CLEAR))
     HttpParser_clear(self);
 
-  http_parser_execute(hp, RSTRING_PTR(data), RSTRING_LEN(data));
+  http_parser_execute(self, hp, RSTRING_PTR(data), RSTRING_LEN(data));
   if (hp->offset > MAX_HEADER_LEN)
     parser_raise(e413, "HTTP header is too large");
 
@@ -4050,8 +4054,8 @@ static VALUE HttpParser_headers(VALUE self, VALUE env, VALUE buf)
 {
   struct http_parser *hp = data_get(self);
 
-  hp->env = env;
-  hp->buf = buf;
+  RB_OBJ_WRITE(self, &hp->buf, buf);
+  RB_OBJ_WRITE(self, &hp->env, env);
 
   return HttpParser_parse(self);
 }
@@ -4179,9 +4183,9 @@ static VALUE HttpParser_filter_body(VALUE self, VALUE dst, VALUE src)
       rb_str_resize(dst, srclen); /* we can never copy more than srclen bytes */
 
       hp->s.dest_offset = 0;
-      hp->cont = dst;
-      hp->buf = src;
-      http_parser_execute(hp, srcptr, srclen);
+      RB_OBJ_WRITE(self, &hp->cont, dst);
+      RB_OBJ_WRITE(self, &hp->buf, src);
+      http_parser_execute(self, hp, srcptr, srclen);
       if (hp->cs == http_parser_error)
         parser_raise(eHttpParserError, "Invalid HTTP format, parsing fails.");
 
@@ -4211,7 +4215,7 @@ static VALUE HttpParser_filter_body(VALUE self, VALUE dst, VALUE src)
        * This causes copy-on-write behavior to be triggered anyways
        * when the +src+ buffer is modified (when reading off the socket).
        */
-      hp->buf = src;
+      RB_OBJ_WRITE(self, &hp->buf, src);
       memcpy(RSTRING_PTR(dst), srcptr, nr);
       hp->len.content -= nr;
       if (hp->len.content == 0) {