ebb 0.0.2 → 0.0.3

data/src/ebb.h

@@ -1,6 +1,6 @@
-/* Ebb Web Server
- * Copyright (c) 2007 Ry Dahl <ry.d4hl@gmail.com>
- * This software is released under the "MIT License". See README file for details.
+/* The Ebb Web Server
+ * Copyright (c) 2008 Ry Dahl. This software is released under the MIT 
+ * License. See README file for details.
  */
 #ifndef ebb_h
 #define ebb_h
@@ -18,7 +18,7 @@
 typedef struct ebb_server ebb_server;
 typedef struct ebb_client ebb_client;
 
-#define EBB_BUFFERSIZE (40*1024)
+#define EBB_BUFFERSIZE (1024 * (80 + 32) * 2)
 #define EBB_MAX_CLIENTS 950
 #define EBB_TIMEOUT 30.0
 #define EBB_MAX_ENV 100
@@ -30,19 +30,29 @@ typedef struct ebb_client ebb_client;
 /*** Ebb Client ***/
 void ebb_client_close(ebb_client*);
 int ebb_client_read(ebb_client *client, char *buffer, int length);
+void ebb_client_write_status(ebb_client*, int status, const char *human_status);
+void ebb_client_write_header(ebb_client*, const char *field, const char *value);
 void ebb_client_write(ebb_client*, const char *data, int length);
 void ebb_client_finished( ebb_client *client);
 
-enum { EBB_REQUEST_METHOD
-     , EBB_REQUEST_URI
-     , EBB_FRAGMENT
-     , EBB_REQUEST_PATH
-     , EBB_QUERY_STRING
-     , EBB_HTTP_VERSION
-     , EBB_SERVER_NAME
-     , EBB_SERVER_PORT
-     , EBB_CONTENT_LENGTH
-     };
+
+struct ebb_env_item {
+  enum { EBB_FIELD_VALUE_PAIR
+       , EBB_REQUEST_METHOD
+       , EBB_REQUEST_URI
+       , EBB_FRAGMENT
+       , EBB_REQUEST_PATH
+       , EBB_QUERY_STRING
+       , EBB_HTTP_VERSION
+       , EBB_SERVER_NAME
+       , EBB_SERVER_PORT
+       , EBB_CONTENT_LENGTH
+       } type;
+ const char *field;
+ int field_length;
+ const char *value;
+ int value_length;
+};
 
 struct ebb_client {
   EBB_TCP_COMMON
@@ -65,12 +75,13 @@ struct ebb_client {
   
   ev_timer timeout_watcher;
   
+  int status_sent;
+  int headers_sent;
+  int body_sent;
+  
   /* the ENV structure */
   int env_size;
-  const char *env_fields[EBB_MAX_ENV];
-  int  env_field_lengths[EBB_MAX_ENV];
-  const char *env_values[EBB_MAX_ENV];
-  int  env_value_lengths[EBB_MAX_ENV];
+  struct ebb_env_item env[EBB_MAX_ENV];
 };
 
 /*** Ebb Server ***/

data/src/ebb_ruby.c

@@ -1,8 +1,7 @@
 /* A ruby binding to the ebb web server
- * Copyright (c) 2007 Ry Dahl <ry.d4hl@gmail.com>
- * This software is released under the "MIT License". See README file for details.
+ * Copyright (c) 2008 Ry Dahl. This software is released under the MIT 
+ * License. See README file for details.
  */
-
 #include <ruby.h>
 #include <assert.h>
 #include <fcntl.h>
@@ -11,7 +10,6 @@
 
 static VALUE cServer;
 static VALUE cClient;
-
 static VALUE global_http_prefix;
 static VALUE global_request_method;
 static VALUE global_request_uri;
@@ -26,51 +24,17 @@ static VALUE global_path_info;
 static VALUE global_content_length;
 static VALUE global_http_host;
 
+/* Variables with a leading underscore are C-level variables */
 
-/* Variables with an underscore are C-level variables */
-
-VALUE env_field(const char *field, int length)
-{
-  VALUE f;
-  char *ch, *end;
-  
-  if(field == NULL) {
-    switch(length) {
-      case EBB_REQUEST_METHOD:  return global_request_method;
-      case EBB_REQUEST_URI:     return global_request_uri;
-      case EBB_FRAGMENT:        return global_fragment;
-      case EBB_REQUEST_PATH:    return global_request_path;
-      case EBB_QUERY_STRING:    return global_query_string;
-      case EBB_HTTP_VERSION:    return global_http_version;
-      case EBB_SERVER_NAME:     return global_server_name;
-      case EBB_SERVER_PORT:     return global_server_port;
-      case EBB_CONTENT_LENGTH:  return global_content_length;
-      default: assert(FALSE); /* unknown const */
-    }
-  } else {
-    f = rb_str_dup(global_http_prefix);
-    f = rb_str_buf_cat(f, field, length); 
-    
-    for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
-      if(*ch == '-') {
-        *ch = '_';
-      } else {
-        *ch = toupper(*ch);
-      }
-    }
-    return f;
-  }
-  assert(FALSE);
-  return Qnil;
-}
+#define ASCII_UPPER(ch) ('a' <= ch && ch <= 'z' ? ch - 'a' + 'A' : ch)
 
 VALUE client_new(ebb_client *_client)
 {
   VALUE client = Data_Wrap_Struct(cClient, 0, 0, _client);
-  // rb_iv_set(client, "@content_length", INT2FIX(_client->content_length));
   return client;
 }
 
+
 void request_cb(ebb_client *_client, void *data)
 {
   VALUE server = (VALUE)data;
@@ -81,23 +45,15 @@ void request_cb(ebb_client *_client, void *data)
   rb_ary_push(waiting_clients, client);
 }
 
+
 VALUE server_alloc(VALUE self)
 {
+  struct ev_loop *loop = ev_default_loop (0);
   ebb_server *_server = ebb_server_alloc();
   VALUE server = Qnil;
   server = Data_Wrap_Struct(cServer, 0, ebb_server_free, _server);
-  return server; 
-}
-
-
-VALUE server_initialize(VALUE x, VALUE server)
-{
-  struct ev_loop *loop = ev_default_loop (0);
-  ebb_server *_server;
-  
-  Data_Get_Struct(server, ebb_server, _server);
   ebb_server_init(_server, loop, request_cb, (void*)server);
-  return Qnil;
+  return server; 
 }
 
 
@@ -146,6 +102,7 @@ VALUE server_process_connections(VALUE x, VALUE server)
     return Qfalse;
 }
 
+
 VALUE server_unlisten(VALUE x, VALUE server)
 {
   ebb_server *_server;
@@ -155,20 +112,56 @@ VALUE server_unlisten(VALUE x, VALUE server)
 }
 
 
+VALUE env_field(struct ebb_env_item *item)
+{
+  VALUE f;
+  switch(item->type) {
+    case EBB_FIELD_VALUE_PAIR:
+      f = rb_str_new(NULL, RSTRING_LEN(global_http_prefix) + item->field_length);
+      memcpy( RSTRING_PTR(f)
+            , RSTRING_PTR(global_http_prefix)
+            , RSTRING_LEN(global_http_prefix)
+            );
+      int i;
+      for(i = 0; i < item->field_length; i++) {
+        char *ch = RSTRING_PTR(f) + RSTRING_LEN(global_http_prefix) + i;
+        *ch = item->field[i] == '-' ? '_' : ASCII_UPPER(item->field[i]);
+      }
+      return f;
+    case EBB_REQUEST_METHOD:  return global_request_method;
+    case EBB_REQUEST_URI:     return global_request_uri;
+    case EBB_FRAGMENT:        return global_fragment;
+    case EBB_REQUEST_PATH:    return global_request_path;
+    case EBB_QUERY_STRING:    return global_query_string;
+    case EBB_HTTP_VERSION:    return global_http_version;
+    case EBB_SERVER_NAME:     return global_server_name;
+    case EBB_SERVER_PORT:     return global_server_port;
+    case EBB_CONTENT_LENGTH:  return global_content_length;
+  }
+  assert(FALSE);
+  return Qnil;
+}
+
+
+VALUE env_value(struct ebb_env_item *item)
+{
+  if(item->value_length > 0)
+    return rb_str_new(item->value, item->value_length);
+  else
+    return Qnil;
+}
+
+
 VALUE client_env(VALUE x, VALUE client)
 {
   ebb_client *_client;
   VALUE hash = rb_hash_new();
   int i;  
   Data_Get_Struct(client, ebb_client, _client);
-  /* This client->env_fields, client->env_value structure is pretty hacky
-   * and a bit hard to follow. Look at the #defines at the top of ebb.c to
-   * see what they are doing. Basically it's a list of (ptr,length) pairs
-   * for both a field and value
-   */
+  
   for(i=0; i < _client->env_size; i++) {
-    rb_hash_aset(hash, env_field(_client->env_fields[i], _client->env_field_lengths[i])
-                     , rb_str_new(_client->env_values[i], _client->env_value_lengths[i])
+    rb_hash_aset(hash, env_field(&_client->env[i])
+                     , env_value(&_client->env[i])
                      );
   }
   rb_hash_aset(hash, global_path_info, rb_hash_aref(hash, global_request_path));
@@ -199,6 +192,21 @@ VALUE client_read_input(VALUE x, VALUE client, VALUE size)
   return string;
 }
 
+VALUE client_write_status(VALUE x, VALUE client, VALUE status, VALUE human_status)
+{
+  ebb_client *_client;
+  Data_Get_Struct(client, ebb_client, _client);
+  ebb_client_write_status(_client, FIX2INT(status), StringValuePtr(human_status));
+  return Qnil;
+}
+
+VALUE client_write_header(VALUE x, VALUE client, VALUE field, VALUE value)
+{
+  ebb_client *_client;
+  Data_Get_Struct(client, ebb_client, _client);
+  ebb_client_write_header(_client, StringValuePtr(field), StringValuePtr(value));
+  return Qnil;
+}
 
 VALUE client_write(VALUE x, VALUE client, VALUE string)
 {
@@ -241,7 +249,6 @@ void Init_ebb_ext()
   
   cServer = rb_define_class_under(mEbb, "Server", rb_cObject);
   rb_define_alloc_func(cServer, server_alloc);
-  rb_define_singleton_method(mFFI, "server_initialize", server_initialize, 1);
   rb_define_singleton_method(mFFI, "server_process_connections", server_process_connections, 1);
   rb_define_singleton_method(mFFI, "server_listen_on_port", server_listen_on_port, 2);
   rb_define_singleton_method(mFFI, "server_listen_on_socket", server_listen_on_socket, 2);
@@ -249,8 +256,9 @@ void Init_ebb_ext()
   
   cClient = rb_define_class_under(mEbb, "Client", rb_cObject);
   rb_define_singleton_method(mFFI, "client_read_input", client_read_input, 2);
+  rb_define_singleton_method(mFFI, "client_write_status", client_write_status, 3);
+  rb_define_singleton_method(mFFI, "client_write_header", client_write_header, 3);
   rb_define_singleton_method(mFFI, "client_write", client_write, 2);
   rb_define_singleton_method(mFFI, "client_finished", client_finished, 1);
   rb_define_singleton_method(mFFI, "client_env", client_env, 1);
-
 }

data/src/extconf.rb

@@ -38,7 +38,8 @@ $LDFLAGS << " -lpthread "
 $CFLAGS << " -I#{libev_dir} " << flags.join(' ')
 $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
 
+$srcs = ['ebb.c', 'ebb_ruby.c', 'parser.c']
+$objs = ['ebb.o', 'ebb_ruby.o', 'parser.o']
 
 dir_config('ebb_ext')
 create_makefile('ebb_ext')
-

data/src/parser.c

@@ -10,42 +10,52 @@
 #include <ctype.h>
 #include <string.h>
 
+#define TRUE 1
+#define FALSE 0
 #define LEN(AT, FPC) (FPC - buffer - parser->AT)
 #define MARK(M,FPC) (parser->M = (FPC) - buffer)
 #define PTR_TO(F) (buffer + parser->F)
 
 /** machine **/
-#line 122 "src/parser.rl"
+#line 159 "src/parser.rl"
 
 
 /** Data **/
 
-#line 24 "src/parser.c"
+#line 26 "src/parser.c"
 static const int http_parser_start = 1;
-static const int http_parser_first_final = 69;
+static const int http_parser_first_final = 82;
 static const int http_parser_error = 0;
 
 static const int http_parser_en_main = 1;
 
-#line 126 "src/parser.rl"
+#line 163 "src/parser.rl"
 
-int http_parser_init(http_parser *parser)  {
+void http_parser_init(http_parser *parser)  {
   int cs = 0;
   
-#line 36 "src/parser.c"
+#line 38 "src/parser.c"
 	{
 	cs = http_parser_start;
 	}
-#line 130 "src/parser.rl"
+#line 167 "src/parser.rl"
   parser->cs = cs;
+  parser->overflow_error = FALSE;
   parser->body_start = 0;
   parser->content_len = 0;
   parser->mark = 0;
   parser->nread = 0;
   parser->field_len = 0;
-  parser->field_start = 0;    
-
-  return(1);
+  parser->field_start = 0;
+  parser->data = NULL;
+  parser->http_field = NULL;
+  parser->request_method = NULL;
+  parser->request_uri = NULL;
+  parser->fragment = NULL;
+  parser->request_path = NULL;
+  parser->query_string = NULL;
+  parser->http_version = NULL;
+  parser->content_length = NULL;
 }
 
 
@@ -53,21 +63,21 @@ int http_parser_init(http_parser *parser)  {
 size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off)  {
   const char *p, *pe;
   int cs = parser->cs;
-
+  
   assert(off <= len && "offset past end of buffer");
-
+  
   p = buffer+off;
   pe = buffer+len;
-
-  assert(*pe == '\0' && "pointer does not end on NUL");
+  
+  /* Ragel 6 does not require this */
+  // assert(*pe == '\0' && "pointer does not end on NUL");
   assert(pe - p == len - off && "pointers aren't same distance");
-
-
   
-#line 68 "src/parser.c"
+  
+#line 78 "src/parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
 case 1:
@@ -85,32 +95,33 @@ case 1:
 		goto tr0;
 	goto st0;
 st0:
-	goto _out0;
+cs = 0;
+	goto _out;
 tr0:
-#line 20 "src/parser.rl"
+#line 22 "src/parser.rl"
 	{MARK(mark, p); }
 	goto st2;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
-#line 98 "src/parser.c"
+#line 109 "src/parser.c"
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st50;
-		case 95: goto st50;
+		case 36: goto st63;
+		case 95: goto st63;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st50;
+			goto st63;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st50;
+			goto st63;
 	} else
-		goto st50;
+		goto st63;
 	goto st0;
 tr2:
-#line 41 "src/parser.rl"
+#line 50 "src/parser.rl"
 	{ 
     if(parser->request_method != NULL) 
       parser->request_method(parser->data, PTR_TO(mark), LEN(mark, p));
@@ -118,9 +129,9 @@ tr2:
 	goto st3;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
-#line 124 "src/parser.c"
+#line 135 "src/parser.c"
 	switch( (*p) ) {
 		case 42: goto tr4;
 		case 43: goto tr5;
@@ -137,113 +148,169 @@ case 3:
 		goto tr5;
 	goto st0;
 tr4:
-#line 20 "src/parser.rl"
+#line 22 "src/parser.rl"
 	{MARK(mark, p); }
 	goto st4;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
-#line 148 "src/parser.c"
-	if ( (*p) == 32 )
-		goto tr8;
+#line 159 "src/parser.c"
+	switch( (*p) ) {
+		case 32: goto tr8;
+		case 35: goto tr9;
+	}
 	goto st0;
 tr8:
-#line 45 "src/parser.rl"
-	{ 
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
-tr52:
-#line 61 "src/parser.rl"
+tr58:
+#line 22 "src/parser.rl"
+	{MARK(mark, p); }
+#line 88 "src/parser.rl"
+	{
+    /* Don't know if this length is specified somewhere or not */
+    if(LEN(mark, p) > 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
+    if(parser->fragment != NULL)
+      parser->fragment(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st5;
+tr61:
+#line 88 "src/parser.rl"
 	{
+    /* Don't know if this length is specified somewhere or not */
+    if(LEN(mark, p) > 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
+    if(parser->fragment != NULL)
+      parser->fragment(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st5;
+tr69:
+#line 79 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->request_path != NULL)
       parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
   }
-#line 45 "src/parser.rl"
-	{ 
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
-tr62:
-#line 50 "src/parser.rl"
+tr80:
+#line 64 "src/parser.rl"
 	{MARK(query_start, p); }
-#line 51 "src/parser.rl"
+#line 65 "src/parser.rl"
 	{ 
+    if(LEN(query_start, p) > 10 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->query_string != NULL)
       parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 45 "src/parser.rl"
-	{ 
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
-tr65:
-#line 51 "src/parser.rl"
+tr84:
+#line 65 "src/parser.rl"
 	{ 
+    if(LEN(query_start, p) > 10 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->query_string != NULL)
       parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
   }
-#line 45 "src/parser.rl"
-	{ 
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 5; goto _out;}
+    }
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st5;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
-#line 201 "src/parser.c"
+#line 268 "src/parser.c"
 	if ( (*p) == 72 )
-		goto tr9;
+		goto tr10;
 	goto st0;
-tr9:
-#line 20 "src/parser.rl"
+tr10:
+#line 22 "src/parser.rl"
 	{MARK(mark, p); }
 	goto st6;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
-#line 213 "src/parser.c"
+#line 280 "src/parser.c"
 	if ( (*p) == 84 )
 		goto st7;
 	goto st0;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
 	if ( (*p) == 84 )
 		goto st8;
 	goto st0;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
 	if ( (*p) == 80 )
 		goto st9;
 	goto st0;
 st9:
 	if ( ++p == pe )
-		goto _out9;
+		goto _test_eof9;
 case 9:
 	if ( (*p) == 47 )
 		goto st10;
 	goto st0;
 st10:
 	if ( ++p == pe )
-		goto _out10;
+		goto _test_eof10;
 case 10:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st11;
 	goto st0;
 st11:
 	if ( ++p == pe )
-		goto _out11;
+		goto _test_eof11;
 case 11:
 	if ( (*p) == 46 )
 		goto st12;
@@ -252,121 +319,147 @@ case 11:
 	goto st0;
 st12:
 	if ( ++p == pe )
-		goto _out12;
+		goto _test_eof12;
 case 12:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st13;
 	goto st0;
 st13:
 	if ( ++p == pe )
-		goto _out13;
+		goto _test_eof13;
 case 13:
 	if ( (*p) == 13 )
-		goto tr17;
+		goto tr18;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st13;
 	goto st0;
-tr17:
-#line 56 "src/parser.rl"
+tr18:
+#line 74 "src/parser.rl"
 	{	
     if(parser->http_version != NULL)
       parser->http_version(parser->data, PTR_TO(mark), LEN(mark, p));
   }
 	goto st14;
-tr26:
-#line 29 "src/parser.rl"
-	{ 
+tr27:
+#line 33 "src/parser.rl"
+	{ MARK(mark, p); }
+#line 34 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 80 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 14; goto _out;}
+    }
     if(parser->http_field != NULL) {
       parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
     }
   }
 	goto st14;
-tr44:
-#line 29 "src/parser.rl"
-	{ 
+tr30:
+#line 34 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 80 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 14; goto _out;}
+    }
     if(parser->http_field != NULL) {
       parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
     }
   }
-#line 35 "src/parser.rl"
+	goto st14;
+tr47:
+#line 44 "src/parser.rl"
 	{
     if(parser->content_length != NULL) {
       parser->content_length(parser->data, PTR_TO(mark), LEN(mark, p));
     }
+  }
+#line 34 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 80 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 14; goto _out;}
+    }
+    if(parser->http_field != NULL) {
+      parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
+    }
   }
 	goto st14;
 st14:
 	if ( ++p == pe )
-		goto _out14;
+		goto _test_eof14;
 case 14:
-#line 303 "src/parser.c"
+#line 392 "src/parser.c"
 	if ( (*p) == 10 )
 		goto st15;
 	goto st0;
 st15:
 	if ( ++p == pe )
-		goto _out15;
+		goto _test_eof15;
 case 15:
 	switch( (*p) ) {
 		case 13: goto st16;
-		case 33: goto tr20;
-		case 67: goto tr21;
-		case 99: goto tr21;
-		case 124: goto tr20;
-		case 126: goto tr20;
+		case 33: goto tr21;
+		case 67: goto tr22;
+		case 99: goto tr22;
+		case 124: goto tr21;
+		case 126: goto tr21;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr20;
+				goto tr21;
 		} else if ( (*p) >= 35 )
-			goto tr20;
+			goto tr21;
 	} else if ( (*p) > 46 ) {
 		if ( (*p) < 65 ) {
 			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr20;
+				goto tr21;
 		} else if ( (*p) > 90 ) {
 			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr20;
+				goto tr21;
 		} else
-			goto tr20;
+			goto tr21;
 	} else
-		goto tr20;
+		goto tr21;
 	goto st0;
 st16:
 	if ( ++p == pe )
-		goto _out16;
+		goto _test_eof16;
 case 16:
 	if ( (*p) == 10 )
-		goto tr22;
+		goto tr23;
 	goto st0;
-tr22:
-#line 66 "src/parser.rl"
-	{ 
+tr23:
+#line 98 "src/parser.rl"
+	{
+    if(parser->nread > 1024 * (80 + 32)) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 82; goto _out;}
+    }
     parser->body_start = p - buffer + 1; 
     if(parser->header_done != NULL)
       parser->header_done(parser->data, p + 1, pe - p - 1);
-    goto _out69;
+    {p++; cs = 82; goto _out;}
   }
-	goto st69;
-st69:
+	goto st82;
+st82:
 	if ( ++p == pe )
-		goto _out69;
-case 69:
-#line 357 "src/parser.c"
+		goto _test_eof82;
+case 82:
+#line 450 "src/parser.c"
 	goto st0;
-tr20:
-#line 23 "src/parser.rl"
+tr21:
+#line 24 "src/parser.rl"
 	{ MARK(field_start, p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
-		goto _out17;
+		goto _test_eof17;
 case 17:
-#line 367 "src/parser.c"
+#line 460 "src/parser.c"
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 124: goto st17;
 		case 126: goto st17;
 	}
@@ -388,50 +481,54 @@ case 17:
 	} else
 		goto st17;
 	goto st0;
-tr24:
-#line 24 "src/parser.rl"
+tr25:
+#line 25 "src/parser.rl"
 	{ 
     parser->field_len = LEN(field_start, p);
+    if(parser->field_len > 256) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 18; goto _out;}
+    }
   }
 	goto st18;
-tr27:
-#line 28 "src/parser.rl"
+tr28:
+#line 33 "src/parser.rl"
 	{ MARK(mark, p); }
 	goto st18;
 st18:
 	if ( ++p == pe )
-		goto _out18;
+		goto _test_eof18;
 case 18:
-#line 406 "src/parser.c"
+#line 503 "src/parser.c"
 	switch( (*p) ) {
-		case 13: goto tr26;
-		case 32: goto tr27;
+		case 13: goto tr27;
+		case 32: goto tr28;
 	}
-	goto tr25;
-tr25:
-#line 28 "src/parser.rl"
+	goto tr26;
+tr26:
+#line 33 "src/parser.rl"
 	{ MARK(mark, p); }
 	goto st19;
 st19:
 	if ( ++p == pe )
-		goto _out19;
+		goto _test_eof19;
 case 19:
-#line 420 "src/parser.c"
+#line 517 "src/parser.c"
 	if ( (*p) == 13 )
-		goto tr26;
+		goto tr30;
 	goto st19;
-tr21:
-#line 23 "src/parser.rl"
+tr22:
+#line 24 "src/parser.rl"
 	{ MARK(field_start, p); }
 	goto st20;
 st20:
 	if ( ++p == pe )
-		goto _out20;
+		goto _test_eof20;
 case 20:
-#line 432 "src/parser.c"
+#line 529 "src/parser.c"
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 79: goto st21;
 		case 111: goto st21;
 		case 124: goto st17;
@@ -457,11 +554,11 @@ case 20:
 	goto st0;
 st21:
 	if ( ++p == pe )
-		goto _out21;
+		goto _test_eof21;
 case 21:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 78: goto st22;
 		case 110: goto st22;
 		case 124: goto st17;
@@ -487,11 +584,11 @@ case 21:
 	goto st0;
 st22:
 	if ( ++p == pe )
-		goto _out22;
+		goto _test_eof22;
 case 22:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 84: goto st23;
 		case 116: goto st23;
 		case 124: goto st17;
@@ -517,11 +614,11 @@ case 22:
 	goto st0;
 st23:
 	if ( ++p == pe )
-		goto _out23;
+		goto _test_eof23;
 case 23:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 69: goto st24;
 		case 101: goto st24;
 		case 124: goto st17;
@@ -547,11 +644,11 @@ case 23:
 	goto st0;
 st24:
 	if ( ++p == pe )
-		goto _out24;
+		goto _test_eof24;
 case 24:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 78: goto st25;
 		case 110: goto st25;
 		case 124: goto st17;
@@ -577,11 +674,11 @@ case 24:
 	goto st0;
 st25:
 	if ( ++p == pe )
-		goto _out25;
+		goto _test_eof25;
 case 25:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 84: goto st26;
 		case 116: goto st26;
 		case 124: goto st17;
@@ -607,13 +704,13 @@ case 25:
 	goto st0;
 st26:
 	if ( ++p == pe )
-		goto _out26;
+		goto _test_eof26;
 case 26:
 	switch( (*p) ) {
 		case 33: goto st17;
 		case 45: goto st27;
 		case 46: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 124: goto st17;
 		case 126: goto st17;
 	}
@@ -634,11 +731,11 @@ case 26:
 	goto st0;
 st27:
 	if ( ++p == pe )
-		goto _out27;
+		goto _test_eof27;
 case 27:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 76: goto st28;
 		case 108: goto st28;
 		case 124: goto st17;
@@ -664,11 +761,11 @@ case 27:
 	goto st0;
 st28:
 	if ( ++p == pe )
-		goto _out28;
+		goto _test_eof28;
 case 28:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 69: goto st29;
 		case 101: goto st29;
 		case 124: goto st17;
@@ -694,11 +791,11 @@ case 28:
 	goto st0;
 st29:
 	if ( ++p == pe )
-		goto _out29;
+		goto _test_eof29;
 case 29:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 78: goto st30;
 		case 110: goto st30;
 		case 124: goto st17;
@@ -724,11 +821,11 @@ case 29:
 	goto st0;
 st30:
 	if ( ++p == pe )
-		goto _out30;
+		goto _test_eof30;
 case 30:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 71: goto st31;
 		case 103: goto st31;
 		case 124: goto st17;
@@ -754,11 +851,11 @@ case 30:
 	goto st0;
 st31:
 	if ( ++p == pe )
-		goto _out31;
+		goto _test_eof31;
 case 31:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 84: goto st32;
 		case 116: goto st32;
 		case 124: goto st17;
@@ -784,11 +881,11 @@ case 31:
 	goto st0;
 st32:
 	if ( ++p == pe )
-		goto _out32;
+		goto _test_eof32;
 case 32:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr24;
+		case 58: goto tr25;
 		case 72: goto st33;
 		case 104: goto st33;
 		case 124: goto st17;
@@ -814,11 +911,11 @@ case 32:
 	goto st0;
 st33:
 	if ( ++p == pe )
-		goto _out33;
+		goto _test_eof33;
 case 33:
 	switch( (*p) ) {
 		case 33: goto st17;
-		case 58: goto tr42;
+		case 58: goto tr44;
 		case 124: goto st17;
 		case 126: goto st17;
 	}
@@ -840,745 +937,981 @@ case 33:
 	} else
 		goto st17;
 	goto st0;
-tr42:
-#line 24 "src/parser.rl"
+tr44:
+#line 25 "src/parser.rl"
 	{ 
     parser->field_len = LEN(field_start, p);
+    if(parser->field_len > 256) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 34; goto _out;}
+    }
   }
 	goto st34;
 tr45:
-#line 20 "src/parser.rl"
-	{MARK(mark, p); }
-#line 28 "src/parser.rl"
+#line 33 "src/parser.rl"
 	{ MARK(mark, p); }
 	goto st34;
 st34:
 	if ( ++p == pe )
-		goto _out34;
+		goto _test_eof34;
 case 34:
-#line 860 "src/parser.c"
+#line 959 "src/parser.c"
 	switch( (*p) ) {
-		case 13: goto tr44;
+		case 13: goto tr27;
 		case 32: goto tr45;
 	}
-	goto tr43;
-tr43:
-#line 20 "src/parser.rl"
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto tr46;
+	goto tr26;
+tr46:
+#line 22 "src/parser.rl"
 	{MARK(mark, p); }
-#line 28 "src/parser.rl"
+#line 33 "src/parser.rl"
 	{ MARK(mark, p); }
 	goto st35;
 st35:
 	if ( ++p == pe )
-		goto _out35;
+		goto _test_eof35;
 case 35:
-#line 876 "src/parser.c"
+#line 977 "src/parser.c"
 	if ( (*p) == 13 )
-		goto tr44;
-	goto st35;
-tr5:
-#line 20 "src/parser.rl"
-	{MARK(mark, p); }
-	goto st36;
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st36;
+	goto st19;
 st36:
 	if ( ++p == pe )
-		goto _out36;
+		goto _test_eof36;
 case 36:
-#line 888 "src/parser.c"
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st37;
+	goto st19;
+st37:
+	if ( ++p == pe )
+		goto _test_eof37;
+case 37:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st38;
+	goto st19;
+st38:
+	if ( ++p == pe )
+		goto _test_eof38;
+case 38:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st39;
+	goto st19;
+st39:
+	if ( ++p == pe )
+		goto _test_eof39;
+case 39:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st40;
+	goto st19;
+st40:
+	if ( ++p == pe )
+		goto _test_eof40;
+case 40:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st41;
+	goto st19;
+st41:
+	if ( ++p == pe )
+		goto _test_eof41;
+case 41:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st42;
+	goto st19;
+st42:
+	if ( ++p == pe )
+		goto _test_eof42;
+case 42:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st43;
+	goto st19;
+st43:
+	if ( ++p == pe )
+		goto _test_eof43;
+case 43:
+	if ( (*p) == 13 )
+		goto tr47;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st44;
+	goto st19;
+st44:
+	if ( ++p == pe )
+		goto _test_eof44;
+case 44:
+	if ( (*p) == 13 )
+		goto tr47;
+	goto st19;
+tr9:
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st45;
+tr70:
+#line 79 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->request_path != NULL)
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
+  }
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st45;
+tr81:
+#line 64 "src/parser.rl"
+	{MARK(query_start, p); }
+#line 65 "src/parser.rl"
+	{ 
+    if(LEN(query_start, p) > 10 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+  }
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st45;
+tr85:
+#line 65 "src/parser.rl"
+	{ 
+    if(LEN(query_start, p) > 10 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, p));
+  }
+#line 55 "src/parser.rl"
+	{
+    if(LEN(mark, p) > 12 * 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 45; goto _out;}
+    }
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
+  }
+	goto st45;
+st45:
+	if ( ++p == pe )
+		goto _test_eof45;
+case 45:
+#line 1139 "src/parser.c"
+	switch( (*p) ) {
+		case 32: goto tr58;
+		case 37: goto tr59;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 127: goto st0;
+	}
+	if ( (*p) > 31 ) {
+		if ( 34 <= (*p) && (*p) <= 35 )
+			goto st0;
+	} else if ( (*p) >= 0 )
+		goto st0;
+	goto tr57;
+tr57:
+#line 22 "src/parser.rl"
+	{MARK(mark, p); }
+	goto st46;
+st46:
+	if ( ++p == pe )
+		goto _test_eof46;
+case 46:
+#line 1161 "src/parser.c"
+	switch( (*p) ) {
+		case 32: goto tr61;
+		case 37: goto st47;
+		case 60: goto st0;
+		case 62: goto st0;
+		case 127: goto st0;
+	}
+	if ( (*p) > 31 ) {
+		if ( 34 <= (*p) && (*p) <= 35 )
+			goto st0;
+	} else if ( (*p) >= 0 )
+		goto st0;
+	goto st46;
+tr59:
+#line 22 "src/parser.rl"
+	{MARK(mark, p); }
+	goto st47;
+st47:
+	if ( ++p == pe )
+		goto _test_eof47;
+case 47:
+#line 1183 "src/parser.c"
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st48;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st48;
+	} else
+		goto st48;
+	goto st0;
+st48:
+	if ( ++p == pe )
+		goto _test_eof48;
+case 48:
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st46;
+	} else if ( (*p) > 70 ) {
+		if ( 97 <= (*p) && (*p) <= 102 )
+			goto st46;
+	} else
+		goto st46;
+	goto st0;
+tr5:
+#line 22 "src/parser.rl"
+	{MARK(mark, p); }
+	goto st49;
+st49:
+	if ( ++p == pe )
+		goto _test_eof49;
+case 49:
+#line 1214 "src/parser.c"
 	switch( (*p) ) {
-		case 43: goto st36;
-		case 58: goto st37;
+		case 43: goto st49;
+		case 58: goto st50;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st36;
+			goto st49;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) > 90 ) {
 			if ( 97 <= (*p) && (*p) <= 122 )
-				goto st36;
+				goto st49;
 		} else if ( (*p) >= 65 )
-			goto st36;
+			goto st49;
 	} else
-		goto st36;
+		goto st49;
 	goto st0;
 tr7:
-#line 20 "src/parser.rl"
+#line 22 "src/parser.rl"
 	{MARK(mark, p); }
-	goto st37;
-st37:
+	goto st50;
+st50:
 	if ( ++p == pe )
-		goto _out37;
-case 37:
-#line 913 "src/parser.c"
+		goto _test_eof50;
+case 50:
+#line 1239 "src/parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
-		case 37: goto st38;
+		case 34: goto st0;
+		case 35: goto tr9;
+		case 37: goto st51;
 		case 60: goto st0;
 		case 62: goto st0;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto st37;
-st38:
+	goto st50;
+st51:
 	if ( ++p == pe )
-		goto _out38;
-case 38:
+		goto _test_eof51;
+case 51:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st39;
+			goto st52;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st39;
+			goto st52;
 	} else
-		goto st39;
+		goto st52;
 	goto st0;
-st39:
+st52:
 	if ( ++p == pe )
-		goto _out39;
-case 39:
+		goto _test_eof52;
+case 52:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st37;
+			goto st50;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st37;
+			goto st50;
 	} else
-		goto st37;
+		goto st50;
 	goto st0;
 tr6:
-#line 20 "src/parser.rl"
+#line 22 "src/parser.rl"
 	{MARK(mark, p); }
-	goto st40;
-st40:
+	goto st53;
+st53:
 	if ( ++p == pe )
-		goto _out40;
-case 40:
-#line 961 "src/parser.c"
+		goto _test_eof53;
+case 53:
+#line 1286 "src/parser.c"
 	switch( (*p) ) {
-		case 32: goto tr52;
-		case 37: goto st41;
-		case 59: goto tr54;
+		case 32: goto tr69;
+		case 34: goto st0;
+		case 35: goto tr70;
+		case 37: goto st54;
+		case 59: goto tr72;
 		case 60: goto st0;
 		case 62: goto st0;
-		case 63: goto tr55;
+		case 63: goto tr73;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto st40;
-st41:
+	goto st53;
+st54:
 	if ( ++p == pe )
-		goto _out41;
-case 41:
+		goto _test_eof54;
+case 54:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st42;
+			goto st55;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st42;
+			goto st55;
 	} else
-		goto st42;
+		goto st55;
 	goto st0;
-st42:
+st55:
 	if ( ++p == pe )
-		goto _out42;
-case 42:
+		goto _test_eof55;
+case 55:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st40;
+			goto st53;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st40;
+			goto st53;
 	} else
-		goto st40;
+		goto st53;
 	goto st0;
-tr54:
-#line 61 "src/parser.rl"
+tr72:
+#line 79 "src/parser.rl"
 	{
+    if(LEN(mark, p) > 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 56; goto _out;}
+    }
     if(parser->request_path != NULL)
       parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
   }
-	goto st43;
-st43:
+	goto st56;
+st56:
 	if ( ++p == pe )
-		goto _out43;
-case 43:
-#line 1014 "src/parser.c"
+		goto _test_eof56;
+case 56:
+#line 1342 "src/parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
-		case 37: goto st44;
+		case 34: goto st0;
+		case 35: goto tr9;
+		case 37: goto st57;
 		case 60: goto st0;
 		case 62: goto st0;
-		case 63: goto st46;
+		case 63: goto st59;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto st43;
-st44:
+	goto st56;
+st57:
 	if ( ++p == pe )
-		goto _out44;
-case 44:
+		goto _test_eof57;
+case 57:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st45;
+			goto st58;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st45;
+			goto st58;
 	} else
-		goto st45;
+		goto st58;
 	goto st0;
-st45:
+st58:
 	if ( ++p == pe )
-		goto _out45;
-case 45:
+		goto _test_eof58;
+case 58:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st43;
+			goto st56;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st43;
+			goto st56;
 	} else
-		goto st43;
+		goto st56;
 	goto st0;
-tr55:
-#line 61 "src/parser.rl"
+tr73:
+#line 79 "src/parser.rl"
 	{
+    if(LEN(mark, p) > 1024) {
+      parser->overflow_error = TRUE;
+      {p++; cs = 59; goto _out;}
+    }
     if(parser->request_path != NULL)
       parser->request_path(parser->data, PTR_TO(mark), LEN(mark,p));
   }
-	goto st46;
-st46:
+	goto st59;
+st59:
 	if ( ++p == pe )
-		goto _out46;
-case 46:
-#line 1066 "src/parser.c"
+		goto _test_eof59;
+case 59:
+#line 1397 "src/parser.c"
 	switch( (*p) ) {
-		case 32: goto tr62;
-		case 37: goto tr63;
+		case 32: goto tr80;
+		case 34: goto st0;
+		case 35: goto tr81;
+		case 37: goto tr82;
 		case 60: goto st0;
 		case 62: goto st0;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr61;
-tr61:
-#line 50 "src/parser.rl"
+	goto tr79;
+tr79:
+#line 64 "src/parser.rl"
 	{MARK(query_start, p); }
-	goto st47;
-st47:
+	goto st60;
+st60:
 	if ( ++p == pe )
-		goto _out47;
-case 47:
-#line 1088 "src/parser.c"
+		goto _test_eof60;
+case 60:
+#line 1418 "src/parser.c"
 	switch( (*p) ) {
-		case 32: goto tr65;
-		case 37: goto st48;
+		case 32: goto tr84;
+		case 34: goto st0;
+		case 35: goto tr85;
+		case 37: goto st61;
 		case 60: goto st0;
 		case 62: goto st0;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto st47;
-tr63:
-#line 50 "src/parser.rl"
+	goto st60;
+tr82:
+#line 64 "src/parser.rl"
 	{MARK(query_start, p); }
-	goto st48;
-st48:
+	goto st61;
+st61:
 	if ( ++p == pe )
-		goto _out48;
-case 48:
-#line 1110 "src/parser.c"
+		goto _test_eof61;
+case 61:
+#line 1439 "src/parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st49;
+			goto st62;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st49;
+			goto st62;
 	} else
-		goto st49;
+		goto st62;
 	goto st0;
-st49:
+st62:
 	if ( ++p == pe )
-		goto _out49;
-case 49:
+		goto _test_eof62;
+case 62:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st47;
+			goto st60;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st47;
+			goto st60;
 	} else
-		goto st47;
+		goto st60;
 	goto st0;
-st50:
+st63:
 	if ( ++p == pe )
-		goto _out50;
-case 50:
+		goto _test_eof63;
+case 63:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st51;
-		case 95: goto st51;
+		case 36: goto st64;
+		case 95: goto st64;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st51;
+			goto st64;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st51;
+			goto st64;
 	} else
-		goto st51;
+		goto st64;
 	goto st0;
-st51:
+st64:
 	if ( ++p == pe )
-		goto _out51;
-case 51:
+		goto _test_eof64;
+case 64:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st52;
-		case 95: goto st52;
+		case 36: goto st65;
+		case 95: goto st65;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st52;
+			goto st65;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st52;
+			goto st65;
 	} else
-		goto st52;
+		goto st65;
 	goto st0;
-st52:
+st65:
 	if ( ++p == pe )
-		goto _out52;
-case 52:
+		goto _test_eof65;
+case 65:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st53;
-		case 95: goto st53;
+		case 36: goto st66;
+		case 95: goto st66;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st53;
+			goto st66;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st53;
+			goto st66;
 	} else
-		goto st53;
+		goto st66;
 	goto st0;
-st53:
+st66:
 	if ( ++p == pe )
-		goto _out53;
-case 53:
+		goto _test_eof66;
+case 66:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st54;
-		case 95: goto st54;
+		case 36: goto st67;
+		case 95: goto st67;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st54;
+			goto st67;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st54;
+			goto st67;
 	} else
-		goto st54;
+		goto st67;
 	goto st0;
-st54:
+st67:
 	if ( ++p == pe )
-		goto _out54;
-case 54:
+		goto _test_eof67;
+case 67:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st55;
-		case 95: goto st55;
+		case 36: goto st68;
+		case 95: goto st68;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st55;
+			goto st68;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st55;
+			goto st68;
 	} else
-		goto st55;
+		goto st68;
 	goto st0;
-st55:
+st68:
 	if ( ++p == pe )
-		goto _out55;
-case 55:
+		goto _test_eof68;
+case 68:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st56;
-		case 95: goto st56;
+		case 36: goto st69;
+		case 95: goto st69;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st56;
+			goto st69;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st56;
+			goto st69;
 	} else
-		goto st56;
+		goto st69;
 	goto st0;
-st56:
+st69:
 	if ( ++p == pe )
-		goto _out56;
-case 56:
+		goto _test_eof69;
+case 69:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st57;
-		case 95: goto st57;
+		case 36: goto st70;
+		case 95: goto st70;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st57;
+			goto st70;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st57;
+			goto st70;
 	} else
-		goto st57;
+		goto st70;
 	goto st0;
-st57:
+st70:
 	if ( ++p == pe )
-		goto _out57;
-case 57:
+		goto _test_eof70;
+case 70:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st58;
-		case 95: goto st58;
+		case 36: goto st71;
+		case 95: goto st71;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st58;
+			goto st71;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st58;
+			goto st71;
 	} else
-		goto st58;
+		goto st71;
 	goto st0;
-st58:
+st71:
 	if ( ++p == pe )
-		goto _out58;
-case 58:
+		goto _test_eof71;
+case 71:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st59;
-		case 95: goto st59;
+		case 36: goto st72;
+		case 95: goto st72;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st59;
+			goto st72;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st59;
+			goto st72;
 	} else
-		goto st59;
+		goto st72;
 	goto st0;
-st59:
+st72:
 	if ( ++p == pe )
-		goto _out59;
-case 59:
+		goto _test_eof72;
+case 72:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st60;
-		case 95: goto st60;
+		case 36: goto st73;
+		case 95: goto st73;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st60;
+			goto st73;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st60;
+			goto st73;
 	} else
-		goto st60;
+		goto st73;
 	goto st0;
-st60:
+st73:
 	if ( ++p == pe )
-		goto _out60;
-case 60:
+		goto _test_eof73;
+case 73:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st61;
-		case 95: goto st61;
+		case 36: goto st74;
+		case 95: goto st74;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st61;
+			goto st74;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st61;
+			goto st74;
 	} else
-		goto st61;
+		goto st74;
 	goto st0;
-st61:
+st74:
 	if ( ++p == pe )
-		goto _out61;
-case 61:
+		goto _test_eof74;
+case 74:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st62;
-		case 95: goto st62;
+		case 36: goto st75;
+		case 95: goto st75;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st62;
+			goto st75;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st62;
+			goto st75;
 	} else
-		goto st62;
+		goto st75;
 	goto st0;
-st62:
+st75:
 	if ( ++p == pe )
-		goto _out62;
-case 62:
+		goto _test_eof75;
+case 75:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st63;
-		case 95: goto st63;
+		case 36: goto st76;
+		case 95: goto st76;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st63;
+			goto st76;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st63;
+			goto st76;
 	} else
-		goto st63;
+		goto st76;
 	goto st0;
-st63:
+st76:
 	if ( ++p == pe )
-		goto _out63;
-case 63:
+		goto _test_eof76;
+case 76:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st64;
-		case 95: goto st64;
+		case 36: goto st77;
+		case 95: goto st77;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st64;
+			goto st77;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st64;
+			goto st77;
 	} else
-		goto st64;
+		goto st77;
 	goto st0;
-st64:
+st77:
 	if ( ++p == pe )
-		goto _out64;
-case 64:
+		goto _test_eof77;
+case 77:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st65;
-		case 95: goto st65;
+		case 36: goto st78;
+		case 95: goto st78;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st65;
+			goto st78;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st65;
+			goto st78;
 	} else
-		goto st65;
+		goto st78;
 	goto st0;
-st65:
+st78:
 	if ( ++p == pe )
-		goto _out65;
-case 65:
+		goto _test_eof78;
+case 78:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st66;
-		case 95: goto st66;
+		case 36: goto st79;
+		case 95: goto st79;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st66;
+			goto st79;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st66;
+			goto st79;
 	} else
-		goto st66;
+		goto st79;
 	goto st0;
-st66:
+st79:
 	if ( ++p == pe )
-		goto _out66;
-case 66:
+		goto _test_eof79;
+case 79:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st67;
-		case 95: goto st67;
+		case 36: goto st80;
+		case 95: goto st80;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st67;
+			goto st80;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st67;
+			goto st80;
 	} else
-		goto st67;
+		goto st80;
 	goto st0;
-st67:
+st80:
 	if ( ++p == pe )
-		goto _out67;
-case 67:
+		goto _test_eof80;
+case 80:
 	switch( (*p) ) {
 		case 32: goto tr2;
-		case 36: goto st68;
-		case 95: goto st68;
+		case 36: goto st81;
+		case 95: goto st81;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st68;
+			goto st81;
 	} else if ( (*p) > 57 ) {
 		if ( 65 <= (*p) && (*p) <= 90 )
-			goto st68;
+			goto st81;
 	} else
-		goto st68;
+		goto st81;
 	goto st0;
-st68:
+st81:
 	if ( ++p == pe )
-		goto _out68;
-case 68:
+		goto _test_eof81;
+case 81:
 	if ( (*p) == 32 )
 		goto tr2;
 	goto st0;
 	}
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out13: cs = 13; goto _out; 
-	_out14: cs = 14; goto _out; 
-	_out15: cs = 15; goto _out; 
-	_out16: cs = 16; goto _out; 
-	_out69: cs = 69; goto _out; 
-	_out17: cs = 17; goto _out; 
-	_out18: cs = 18; goto _out; 
-	_out19: cs = 19; goto _out; 
-	_out20: cs = 20; goto _out; 
-	_out21: cs = 21; goto _out; 
-	_out22: cs = 22; goto _out; 
-	_out23: cs = 23; goto _out; 
-	_out24: cs = 24; goto _out; 
-	_out25: cs = 25; goto _out; 
-	_out26: cs = 26; goto _out; 
-	_out27: cs = 27; goto _out; 
-	_out28: cs = 28; goto _out; 
-	_out29: cs = 29; goto _out; 
-	_out30: cs = 30; goto _out; 
-	_out31: cs = 31; goto _out; 
-	_out32: cs = 32; goto _out; 
-	_out33: cs = 33; goto _out; 
-	_out34: cs = 34; goto _out; 
-	_out35: cs = 35; goto _out; 
-	_out36: cs = 36; goto _out; 
-	_out37: cs = 37; goto _out; 
-	_out38: cs = 38; goto _out; 
-	_out39: cs = 39; goto _out; 
-	_out40: cs = 40; goto _out; 
-	_out41: cs = 41; goto _out; 
-	_out42: cs = 42; goto _out; 
-	_out43: cs = 43; goto _out; 
-	_out44: cs = 44; goto _out; 
-	_out45: cs = 45; goto _out; 
-	_out46: cs = 46; goto _out; 
-	_out47: cs = 47; goto _out; 
-	_out48: cs = 48; goto _out; 
-	_out49: cs = 49; goto _out; 
-	_out50: cs = 50; goto _out; 
-	_out51: cs = 51; goto _out; 
-	_out52: cs = 52; goto _out; 
-	_out53: cs = 53; goto _out; 
-	_out54: cs = 54; goto _out; 
-	_out55: cs = 55; goto _out; 
-	_out56: cs = 56; goto _out; 
-	_out57: cs = 57; goto _out; 
-	_out58: cs = 58; goto _out; 
-	_out59: cs = 59; goto _out; 
-	_out60: cs = 60; goto _out; 
-	_out61: cs = 61; goto _out; 
-	_out62: cs = 62; goto _out; 
-	_out63: cs = 63; goto _out; 
-	_out64: cs = 64; goto _out; 
-	_out65: cs = 65; goto _out; 
-	_out66: cs = 66; goto _out; 
-	_out67: cs = 67; goto _out; 
-	_out68: cs = 68; goto _out; 
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+	_test_eof82: cs = 82; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof18: cs = 18; goto _test_eof; 
+	_test_eof19: cs = 19; goto _test_eof; 
+	_test_eof20: cs = 20; goto _test_eof; 
+	_test_eof21: cs = 21; goto _test_eof; 
+	_test_eof22: cs = 22; goto _test_eof; 
+	_test_eof23: cs = 23; goto _test_eof; 
+	_test_eof24: cs = 24; goto _test_eof; 
+	_test_eof25: cs = 25; goto _test_eof; 
+	_test_eof26: cs = 26; goto _test_eof; 
+	_test_eof27: cs = 27; goto _test_eof; 
+	_test_eof28: cs = 28; goto _test_eof; 
+	_test_eof29: cs = 29; goto _test_eof; 
+	_test_eof30: cs = 30; goto _test_eof; 
+	_test_eof31: cs = 31; goto _test_eof; 
+	_test_eof32: cs = 32; goto _test_eof; 
+	_test_eof33: cs = 33; goto _test_eof; 
+	_test_eof34: cs = 34; goto _test_eof; 
+	_test_eof35: cs = 35; goto _test_eof; 
+	_test_eof36: cs = 36; goto _test_eof; 
+	_test_eof37: cs = 37; goto _test_eof; 
+	_test_eof38: cs = 38; goto _test_eof; 
+	_test_eof39: cs = 39; goto _test_eof; 
+	_test_eof40: cs = 40; goto _test_eof; 
+	_test_eof41: cs = 41; goto _test_eof; 
+	_test_eof42: cs = 42; goto _test_eof; 
+	_test_eof43: cs = 43; goto _test_eof; 
+	_test_eof44: cs = 44; goto _test_eof; 
+	_test_eof45: cs = 45; goto _test_eof; 
+	_test_eof46: cs = 46; goto _test_eof; 
+	_test_eof47: cs = 47; goto _test_eof; 
+	_test_eof48: cs = 48; goto _test_eof; 
+	_test_eof49: cs = 49; goto _test_eof; 
+	_test_eof50: cs = 50; goto _test_eof; 
+	_test_eof51: cs = 51; goto _test_eof; 
+	_test_eof52: cs = 52; goto _test_eof; 
+	_test_eof53: cs = 53; goto _test_eof; 
+	_test_eof54: cs = 54; goto _test_eof; 
+	_test_eof55: cs = 55; goto _test_eof; 
+	_test_eof56: cs = 56; goto _test_eof; 
+	_test_eof57: cs = 57; goto _test_eof; 
+	_test_eof58: cs = 58; goto _test_eof; 
+	_test_eof59: cs = 59; goto _test_eof; 
+	_test_eof60: cs = 60; goto _test_eof; 
+	_test_eof61: cs = 61; goto _test_eof; 
+	_test_eof62: cs = 62; goto _test_eof; 
+	_test_eof63: cs = 63; goto _test_eof; 
+	_test_eof64: cs = 64; goto _test_eof; 
+	_test_eof65: cs = 65; goto _test_eof; 
+	_test_eof66: cs = 66; goto _test_eof; 
+	_test_eof67: cs = 67; goto _test_eof; 
+	_test_eof68: cs = 68; goto _test_eof; 
+	_test_eof69: cs = 69; goto _test_eof; 
+	_test_eof70: cs = 70; goto _test_eof; 
+	_test_eof71: cs = 71; goto _test_eof; 
+	_test_eof72: cs = 72; goto _test_eof; 
+	_test_eof73: cs = 73; goto _test_eof; 
+	_test_eof74: cs = 74; goto _test_eof; 
+	_test_eof75: cs = 75; goto _test_eof; 
+	_test_eof76: cs = 76; goto _test_eof; 
+	_test_eof77: cs = 77; goto _test_eof; 
+	_test_eof78: cs = 78; goto _test_eof; 
+	_test_eof79: cs = 79; goto _test_eof; 
+	_test_eof80: cs = 80; goto _test_eof; 
+	_test_eof81: cs = 81; goto _test_eof; 
 
+	_test_eof: {}
 	_out: {}
 	}
-#line 157 "src/parser.rl"
-
+#line 202 "src/parser.rl"
+  
   parser->cs = cs;
   parser->nread += p - (buffer + off);
-
+  
   assert(p <= pe && "buffer overflow after parsing execute");
   assert(parser->nread <= len && "nread longer than length");
   assert(parser->body_start <= len && "body starts after buffer end");
   assert(parser->mark < len && "mark is after buffer end");
   assert(parser->field_len <= len && "field has length longer than whole buffer");
   assert(parser->field_start < len && "field starts after buffer end");
-
+  
+  /* Ragel 6 does not use write eof; no need for this
   if(parser->body_start) {
-    /* final \r\n combo encountered so stop right here */
-    
-#line 1552 "src/parser.c"
-#line 171 "src/parser.rl"
+    // final \r\n combo encountered so stop right here 
     parser->nread++;
+    %% write eof;
   }
-
+  */
+  
   return(parser->nread);
 }
 
 int http_parser_finish(http_parser *parser)
 {
-  int cs = parser->cs;
-
-  
-#line 1565 "src/parser.c"
-#line 182 "src/parser.rl"
-
-  parser->cs = cs;
-
-  if (http_parser_has_error(parser) ) {
+  if (http_parser_has_error(parser))
     return -1;
-  } else if (http_parser_is_finished(parser) ) {
+  else if (http_parser_is_finished(parser))
     return 1;
-  } else {
+  else
     return 0;
-  }
 }
 
 int http_parser_has_error(http_parser *parser) {
-  return parser->cs == http_parser_error;
+  return parser->cs == http_parser_error || parser->overflow_error;
 }
 
 int http_parser_is_finished(http_parser *parser) {
-  return parser->cs == http_parser_first_final;
-}
+  return parser->cs >= http_parser_first_final;
+}