RubyGems - mongrel - Versions diffs - 0.3.12.4 → 0.3.13 - Mend

mongrel 0.3.12.4 → 0.3.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (264) hide show

data/doc/rdoc/index.html ADDED

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<!--
+    RDoc Documentation
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RDoc Documentation</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+</head>
+<frameset rows="20%, 80%">
+    <frameset cols="25%,35%,45%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+    <frame src="files/README.html" name="docwin" />
+</frameset>
+</html>

data/examples/camping/blog.rb CHANGED

@@ -281,7 +281,7 @@ if __FILE__ == $0
   # Use the Configurator as an example rather than Mongrel::Camping.start
   config = Mongrel::Configurator.new :host => "0.0.0.0" do
     listener :port => 3002 do
-      uri "/blog", :handler => CampingHandler.new(Blog)
+      uri "/blog", :handler => Mongrel::Camping::CampingHandler.new(Blog)
       uri "/favicon", :handler => Mongrel::Error404Handler.new("")
       trap("INT") { stop }
       run

data/examples/camping/tepee.rb CHANGED

@@ -115,12 +115,13 @@ module Tepee::Views
   def _markup body
     return '' if body.blank?
     body.gsub!(Tepee::Models::Page::PAGE_LINK) do
-      page = title = $1.underscore
+      page = title = $1
       title = $2 unless $2.empty?
+      page = page.gsub /\W/, '_'
       if Tepee::Models::Page.find(:all, :select => 'title').collect { |p| p.title }.include?(page)
-        %Q{<a href="#{R Show, page}">#{title}</a>}
+        %Q{<a href="#{self/R(Show, page)}">#{title}</a>}
       else
-        %Q{<span>#{title}<a href="#{R Edit, page, 1}">?</a></span>}
+        %Q{<span>#{title}<a href="#{self/R(Edit, page, 1)}">?</a></span>}
       end
     end
     RedCloth.new(body, [ :hard_breaks ]).to_html

data/examples/simpletest.rb CHANGED

@@ -1,22 +1,15 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib")
 require 'mongrel'
 require 'yaml'
-require 'zlib'
 class SimpleHandler < Mongrel::HttpHandler
-    def process(request, response)
-      response.start do |head,out|
-        head["Content-Type"] = "text/html"
-        results = "<html><body>Your request:<br /><pre>#{request.params.to_yaml}</pre><a href=\"/files\">View the files.</a></body></html>"
-        if request.params["HTTP_ACCEPT_ENCODING"] == "gzip,deflate"
-          head["Content-Encoding"] = "deflate"
-          # send it back deflated
-          out << Zlib::Deflate.deflate(results)
-        else
-          # no gzip supported, send it back normal
-          out << results
-        end
-      end
+  def process(request, response)
+    response.start do |head,out|
+      head["Content-Type"] = "text/html"
+      results = "<html><body>Your request:<br /><pre>#{request.params.to_yaml}</pre><a href=\"/files\">View the files.</a></body></html>"
+      out << results
     end
+  end
 end
 class DumbHandler < Mongrel::HttpHandler
@@ -34,11 +27,19 @@ if ARGV.length != 3
   exit(1)
 end
+stats = Mongrel::StatisticsFilter.new(:sample_rate => 1)
 config = Mongrel::Configurator.new :host => ARGV[0], :port => ARGV[1] do
   listener do
     uri "/", :handler => SimpleHandler.new
+    uri "/", :handler => Mongrel::DeflateFilter.new
+    uri "/", :handler => stats
     uri "/dumb", :handler => DumbHandler.new
+    uri "/dumb", :handler => Mongrel::DeflateFilter.new
+    uri "/dumb", :handler => stats
     uri "/files", :handler => Mongrel::DirHandler.new(ARGV[2])
+    uri "/files", :handler => stats
+    uri "/status", :handler => Mongrel::StatusHandler.new(:stats_filter => stats)
   end
   trap("INT") { stop }

data/ext/http11/http11.c CHANGED

@@ -1,3 +1,22 @@
+/* Mongrel Web Server - A Mostly Ruby Webserver and Library
+ *
+ * Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 #include "ruby.h"
 #include "ext_help.h"
 #include <assert.h>
@@ -23,7 +42,6 @@ static VALUE global_content_type;
 static VALUE global_http_content_type;
 static VALUE global_gateway_interface;
 static VALUE global_gateway_interface_value;
-static VALUE global_interface_value;
 static VALUE global_server_name;
 static VALUE global_server_port;
 static VALUE global_server_protocol;
@@ -33,6 +51,8 @@ static VALUE global_mongrel_version;
 static VALUE global_server_software;
 static VALUE global_port_80;
+#define TRIE_INCREASE 30
 /** Defines common length and error messages for input length validation. */
 #define DEF_MAX_LENGTH(N,length) const size_t MAX_##N##_LENGTH = length; const char *MAX_##N##_LENGTH_ERR = "HTTP element " # N  " is longer than the " # length " allowed length.";
@@ -64,7 +84,7 @@ void http_field(void *data, const char *field, size_t flen, const char *value, s
   v = rb_str_new(value, vlen);
   f = rb_str_dup(global_http_prefix);
   f = rb_str_buf_cat(f, field, flen);
   for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
     if(*ch == '-') {
       *ch = '_';
@@ -101,7 +121,7 @@ void query_string(void *data, const char *at, size_t length)
 {
   VALUE req = (VALUE)data;
   VALUE val = Qnil;
   VALIDATE_MAX_LENGTH(length, QUERY_STRING);
   val = rb_str_new(at, length);
@@ -122,8 +142,6 @@ void header_done(void *data, const char *at, size_t length)
 {
   VALUE req = (VALUE)data;
   VALUE temp = Qnil;
-  VALUE host = Qnil;
-  VALUE port = Qnil;
   VALUE ctype = Qnil;
   VALUE clen = Qnil;
   char *colon = NULL;
@@ -238,7 +256,7 @@ VALUE HttpParser_finish(VALUE self)
 /**
  * call-seq:
- *    parser.execute(req_hash, data) -> Integer
+ *    parser.execute(req_hash, data, start) -> Integer
  *
  * Takes a Hash and a String of data, parses the String of data filling in the Hash
  * returning an Integer to indicate how much of the data has been read.  No matter
@@ -248,25 +266,42 @@ VALUE HttpParser_finish(VALUE self)
  * This function now throws an exception when there is a parsing error.  This makes
  * the logic for working with the parser much easier.  You can still test for an
  * error, but now you need to wrap the parser with an exception handling block.
+ *
+ * The third argument allows for parsing a partial request and then continuing
+ * the parsing from that position.  It needs all of the original data as well
+ * so you have to append to the data buffer as you read.
  */
-VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data)
+VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
 {
   http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
-  http->data = (void *)req_hash;
-  http_parser_execute(http, RSTRING(data)->ptr, RSTRING(data)->len);
+  int from = 0;
+  char *dptr = NULL;
+  long dlen = 0;
-  VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
+  DATA_GET(self, http_parser, http);
-  if(http_parser_has_error(http)) {
-    rb_raise(eHttpParserError, "Invalid HTTP format, parsing fails.");
+  from = FIX2INT(start);
+  dptr = RSTRING(data)->ptr;
+  dlen = RSTRING(data)->len;
+  if(from >= dlen) {
+    rb_raise(eHttpParserError, "Requested start is after data buffer end.");
   } else {
-    return INT2FIX(http_parser_nread(http));
+    http->data = (void *)req_hash;
+    http_parser_execute(http, dptr, dlen, from);
+    VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
+    if(http_parser_has_error(http)) {
+      rb_raise(eHttpParserError, "Invalid HTTP format, parsing fails.");
+    } else {
+      return INT2FIX(http_parser_nread(http));
+    }
   }
 }
 /**
  * call-seq:
  *    parser.error? -> true/false
@@ -323,7 +358,6 @@ void URIClassifier_free(void *data)
 }
-#define TRIE_INCREASE 30
 VALUE URIClassifier_alloc(VALUE klass)
 {
@@ -520,7 +554,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 0.3.12.4");
+  DEF_GLOBAL(mongrel_version, "Mongrel 0.3.13");
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
@@ -531,7 +565,7 @@ void Init_http11()
   rb_define_method(cHttpParser, "initialize", HttpParser_init,0);
   rb_define_method(cHttpParser, "reset", HttpParser_reset,0);
   rb_define_method(cHttpParser, "finish", HttpParser_finish,0);
-  rb_define_method(cHttpParser, "execute", HttpParser_execute,2);
+  rb_define_method(cHttpParser, "execute", HttpParser_execute,3);
   rb_define_method(cHttpParser, "error?", HttpParser_has_error,0);
   rb_define_method(cHttpParser, "finished?", HttpParser_is_finished,0);
   rb_define_method(cHttpParser, "nread", HttpParser_nread,0);

data/ext/http11/http11_parser.c CHANGED

@@ -1,4 +1,23 @@
 #line 1 "ext/http11/http11_parser.rl"
+/* Mongrel Web Server - A Mostly Ruby Webserver and Library
+ *
+ * Copyright (C) 2005 Zed A. Shaw zedshaw AT zedshaw dot com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 #include "http11_parser.h"
 #include <stdio.h>
 #include <assert.h>
@@ -6,51 +25,61 @@
 #include <ctype.h>
 #include <string.h>
-#define MARK(S,F) (S)->mark = (F);
+#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 107 "ext/http11/http11_parser.rl"
+#line 121 "ext/http11/http11_parser.rl"
 /** Data **/
-#line 18 "ext/http11/http11_parser.c"
+#line 39 "ext/http11/http11_parser.c"
 static int http_parser_start = 0;
 static int http_parser_first_final = 51;
 static int http_parser_error = 1;
-#line 111 "ext/http11/http11_parser.rl"
+#line 125 "ext/http11/http11_parser.rl"
 int http_parser_init(http_parser *parser)  {
     int cs = 0;
-#line 30 "ext/http11/http11_parser.c"
+#line 51 "ext/http11/http11_parser.c"
 	{
 	cs = http_parser_start;
 	}
-#line 115 "ext/http11/http11_parser.rl"
+#line 129 "ext/http11/http11_parser.rl"
     parser->cs = cs;
-    parser->body_start = NULL;
+    parser->body_start = 0;
     parser->content_len = 0;
-    parser->mark = NULL;
+    parser->mark = 0;
     parser->nread = 0;
+    parser->field_len = 0;
+    parser->field_start = 0;
     return(1);
 }
 /** exec **/
-size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len)  {
+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;
-    p = buffer;
+    assert(off <= len && "offset past end of buffer");
+    p = buffer+off;
     pe = buffer+len;
+    assert(*pe == '\0' && "pointer does not end on NUL");
+    assert(pe - p == len - off && "pointers aren't same distance");
-#line 54 "ext/http11/http11_parser.c"
+#line 83 "ext/http11/http11_parser.c"
 	{
 	p -= 1;
 	if ( ++p == pe )
@@ -74,16 +103,16 @@ case 0:
 st1:
 	goto _out1;
 tr14:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _out2;
 case 2:
-#line 85 "ext/http11/http11_parser.c"
+#line 114 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st32;
 		case 95: goto st32;
 	}
@@ -96,19 +125,18 @@ case 2:
 	} else
 		goto st32;
 	goto st1;
-tr17:
-#line 30 "ext/http11/http11_parser.rl"
+tr18:
+#line 48 "ext/http11/http11_parser.rl"
 	{
-      	       assert(p - parser->mark >= 0 && "buffer overflow");
 	       if(parser->request_method != NULL)
-	       	       parser->request_method(parser->data, parser->mark, p - parser->mark);
+	       	       parser->request_method(parser->data, PTR_TO(mark), LEN(mark, p));
 	}
 	goto st3;
 st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-#line 112 "ext/http11/http11_parser.c"
+#line 140 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
 		case 42: goto tr10;
 		case 43: goto tr11;
@@ -125,50 +153,48 @@ case 3:
 		goto tr11;
 	goto st1;
 tr10:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _out4;
 case 4:
-#line 136 "ext/http11/http11_parser.c"
+#line 164 "ext/http11/http11_parser.c"
 	if ( (*p) == 32 )
-		goto tr19;
+		goto tr20;
 	goto st1;
-tr19:
-#line 35 "ext/http11/http11_parser.rl"
+tr20:
+#line 52 "ext/http11/http11_parser.rl"
 	{
-       	       assert(p - parser->mark >= 0 && "buffer overflow");
 	       if(parser->request_uri != NULL)
-	       	       parser->request_uri(parser->data, parser->mark, p - parser->mark);
+	       	       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
 	}
 	goto st5;
-tr31:
-#line 40 "ext/http11/http11_parser.rl"
+tr32:
+#line 56 "ext/http11/http11_parser.rl"
 	{
-       	       assert(p - parser->mark >= 0 && "buffer overflow");
 	       if(parser->query_string != NULL)
-	       	       parser->query_string(parser->data, parser->mark, p - parser->mark);
+	       	       parser->query_string(parser->data, PTR_TO(mark), LEN(mark, p));
 	}
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _out5;
 case 5:
-#line 160 "ext/http11/http11_parser.c"
+#line 186 "ext/http11/http11_parser.c"
 	if ( (*p) == 72 )
 		goto tr3;
 	goto st1;
 tr3:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
 	goto st6;
 st6:
 	if ( ++p == pe )
 		goto _out6;
 case 6:
-#line 172 "ext/http11/http11_parser.c"
+#line 198 "ext/http11/http11_parser.c"
 	if ( (*p) == 84 )
 		goto st7;
 	goto st1;
@@ -221,26 +247,22 @@ st13:
 		goto _out13;
 case 13:
 	if ( (*p) == 13 )
-		goto tr22;
+		goto tr23;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st13;
 	goto st1;
-tr22:
-#line 46 "ext/http11/http11_parser.rl"
+tr23:
+#line 61 "ext/http11/http11_parser.rl"
 	{
-       	       assert(p - parser->mark >= 0 && "buffer overflow");
 	       if(parser->http_version != NULL)
-	       	       parser->http_version(parser->data, parser->mark, p - parser->mark);
+	       	       parser->http_version(parser->data, PTR_TO(mark), LEN(mark, p));
 	}
 	goto st14;
-tr34:
-#line 22 "ext/http11/http11_parser.rl"
+tr35:
+#line 43 "ext/http11/http11_parser.rl"
 	{
-      	       assert(p - (parser->mark - 1) >= 0 && "buffer overflow");
 	       if(parser->http_field != NULL) {
-	       	       parser->http_field(parser->data,
-		       		parser->field_start, parser->field_len,
-				parser->mark+1, p - (parser->mark +1));
+	       	       parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
 		}
 	}
 	goto st14;
@@ -248,7 +270,7 @@ st14:
 	if ( ++p == pe )
 		goto _out14;
 case 14:
-#line 252 "ext/http11/http11_parser.c"
+#line 274 "ext/http11/http11_parser.c"
 	if ( (*p) == 10 )
 		goto st15;
 	goto st1;
@@ -258,39 +280,39 @@ st15:
 case 15:
 	switch( (*p) ) {
 		case 13: goto st16;
-		case 33: goto tr21;
-		case 124: goto tr21;
-		case 126: goto tr21;
+		case 33: goto tr22;
+		case 124: goto tr22;
+		case 126: goto tr22;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr21;
+				goto tr22;
 		} else if ( (*p) >= 35 )
-			goto tr21;
+			goto tr22;
 	} else if ( (*p) > 46 ) {
 		if ( (*p) < 65 ) {
 			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr21;
+				goto tr22;
 		} else if ( (*p) > 90 ) {
 			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr21;
+				goto tr22;
 		} else
-			goto tr21;
+			goto tr22;
 	} else
-		goto tr21;
+		goto tr22;
 	goto st1;
 st16:
 	if ( ++p == pe )
 		goto _out16;
 case 16:
 	if ( (*p) == 10 )
-		goto tr25;
+		goto tr26;
 	goto st1;
-tr25:
-#line 52 "ext/http11/http11_parser.rl"
+tr26:
+#line 66 "ext/http11/http11_parser.rl"
 	{
-	       parser->body_start = p+1;
+	       parser->body_start = p - buffer + 1;
 	       if(parser->header_done != NULL)
 	       	       parser->header_done(parser->data, p, 0);
 	       goto _out51;
@@ -300,17 +322,17 @@ st51:
 	if ( ++p == pe )
 		goto _out51;
 case 51:
-#line 304 "ext/http11/http11_parser.c"
+#line 326 "ext/http11/http11_parser.c"
 	goto st1;
-tr21:
-#line 16 "ext/http11/http11_parser.rl"
-	{ parser->field_start = p; }
+tr22:
+#line 37 "ext/http11/http11_parser.rl"
+	{ MARK(field_start, p); }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _out17;
 case 17:
-#line 314 "ext/http11/http11_parser.c"
+#line 336 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
 		case 33: goto st17;
 		case 58: goto tr16;
@@ -336,68 +358,75 @@ case 17:
 		goto st17;
 	goto st1;
 tr16:
-#line 17 "ext/http11/http11_parser.rl"
+#line 38 "ext/http11/http11_parser.rl"
 	{
-	       parser->field_len = (p - parser->field_start);
+	       parser->field_len = LEN(field_start, p);
 	}
 	goto st18;
 st18:
 	if ( ++p == pe )
 		goto _out18;
 case 18:
-#line 349 "ext/http11/http11_parser.c"
-	if ( (*p) == 13 )
-		goto tr34;
-	goto tr37;
-tr37:
-#line 21 "ext/http11/http11_parser.rl"
-	{ MARK(parser, p); }
-	goto st19;
+#line 371 "ext/http11/http11_parser.c"
+	if ( (*p) == 32 )
+		goto st19;
+	goto st1;
 st19:
 	if ( ++p == pe )
 		goto _out19;
 case 19:
-#line 361 "ext/http11/http11_parser.c"
 	if ( (*p) == 13 )
-		goto tr34;
-	goto st19;
-tr11:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
+		goto tr35;
+	goto tr38;
+tr38:
+#line 42 "ext/http11/http11_parser.rl"
+	{ MARK(mark, p); }
 	goto st20;
 st20:
 	if ( ++p == pe )
 		goto _out20;
 case 20:
-#line 373 "ext/http11/http11_parser.c"
+#line 390 "ext/http11/http11_parser.c"
+	if ( (*p) == 13 )
+		goto tr35;
+	goto st20;
+tr11:
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
+	goto st21;
+st21:
+	if ( ++p == pe )
+		goto _out21;
+case 21:
+#line 402 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 43: goto st20;
-		case 58: goto st21;
+		case 43: goto st21;
+		case 58: goto st22;
 	}
 	if ( (*p) < 48 ) {
 		if ( 45 <= (*p) && (*p) <= 46 )
-			goto st20;
+			goto st21;
 	} else if ( (*p) > 57 ) {
 		if ( (*p) > 90 ) {
 			if ( 97 <= (*p) && (*p) <= 122 )
-				goto st20;
+				goto st21;
 		} else if ( (*p) >= 65 )
-			goto st20;
+			goto st21;
 	} else
-		goto st20;
+		goto st21;
 	goto st1;
 tr13:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
-	goto st21;
-st21:
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
+	goto st22;
+st22:
 	if ( ++p == pe )
-		goto _out21;
-case 21:
-#line 398 "ext/http11/http11_parser.c"
+		goto _out22;
+case 22:
+#line 427 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr19;
-		case 37: goto st22;
+		case 32: goto tr20;
+		case 37: goto st23;
 		case 60: goto st1;
 		case 62: goto st1;
 		case 127: goto st1;
@@ -407,67 +436,48 @@ case 21:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto st21;
-st22:
+	goto st22;
+st23:
 	if ( ++p == pe )
-		goto _out22;
-case 22:
+		goto _out23;
+case 23:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st23;
+			goto st24;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st23;
+			goto st24;
 	} else
-		goto st23;
+		goto st24;
 	goto st1;
-st23:
+st24:
 	if ( ++p == pe )
-		goto _out23;
-case 23:
+		goto _out24;
+case 24:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st21;
+			goto st22;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st21;
+			goto st22;
 	} else
-		goto st21;
+		goto st22;
 	goto st1;
 tr12:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
-	goto st24;
-st24:
-	if ( ++p == pe )
-		goto _out24;
-case 24:
-#line 446 "ext/http11/http11_parser.c"
-	switch( (*p) ) {
-		case 32: goto tr19;
-		case 37: goto st26;
-		case 47: goto st1;
-		case 60: goto st1;
-		case 62: goto st1;
-		case 63: goto tr28;
-		case 127: goto st1;
-	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st1;
-	} else if ( (*p) >= 0 )
-		goto st1;
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
 	goto st25;
 st25:
 	if ( ++p == pe )
 		goto _out25;
 case 25:
+#line 475 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr19;
+		case 32: goto tr20;
 		case 37: goto st26;
 		case 60: goto st1;
 		case 62: goto st1;
-		case 63: goto tr28;
+		case 63: goto tr30;
 		case 127: goto st1;
 	}
 	if ( (*p) > 31 ) {
@@ -502,22 +512,21 @@ case 27:
 	} else
 		goto st25;
 	goto st1;
-tr28:
-#line 35 "ext/http11/http11_parser.rl"
+tr30:
+#line 52 "ext/http11/http11_parser.rl"
 	{
-       	       assert(p - parser->mark >= 0 && "buffer overflow");
 	       if(parser->request_uri != NULL)
-	       	       parser->request_uri(parser->data, parser->mark, p - parser->mark);
+	       	       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, p));
 	}
 	goto st28;
 st28:
 	if ( ++p == pe )
 		goto _out28;
 case 28:
-#line 518 "ext/http11/http11_parser.c"
+#line 527 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr31;
-		case 37: goto tr36;
+		case 32: goto tr32;
+		case 37: goto tr37;
 		case 60: goto st1;
 		case 62: goto st1;
 		case 127: goto st1;
@@ -527,18 +536,18 @@ case 28:
 			goto st1;
 	} else if ( (*p) >= 0 )
 		goto st1;
-	goto tr35;
-tr35:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
+	goto tr36;
+tr36:
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
 	goto st29;
 st29:
 	if ( ++p == pe )
 		goto _out29;
 case 29:
-#line 540 "ext/http11/http11_parser.c"
+#line 549 "ext/http11/http11_parser.c"
 	switch( (*p) ) {
-		case 32: goto tr31;
+		case 32: goto tr32;
 		case 37: goto st30;
 		case 60: goto st1;
 		case 62: goto st1;
@@ -550,15 +559,15 @@ case 29:
 	} else if ( (*p) >= 0 )
 		goto st1;
 	goto st29;
-tr36:
-#line 14 "ext/http11/http11_parser.rl"
-	{MARK(parser, p); }
+tr37:
+#line 35 "ext/http11/http11_parser.rl"
+	{MARK(mark, p); }
 	goto st30;
 st30:
 	if ( ++p == pe )
 		goto _out30;
 case 30:
-#line 562 "ext/http11/http11_parser.c"
+#line 571 "ext/http11/http11_parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st31;
@@ -586,7 +595,7 @@ st32:
 		goto _out32;
 case 32:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st33;
 		case 95: goto st33;
 	}
@@ -604,7 +613,7 @@ st33:
 		goto _out33;
 case 33:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st34;
 		case 95: goto st34;
 	}
@@ -622,7 +631,7 @@ st34:
 		goto _out34;
 case 34:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st35;
 		case 95: goto st35;
 	}
@@ -640,7 +649,7 @@ st35:
 		goto _out35;
 case 35:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st36;
 		case 95: goto st36;
 	}
@@ -658,7 +667,7 @@ st36:
 		goto _out36;
 case 36:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st37;
 		case 95: goto st37;
 	}
@@ -676,7 +685,7 @@ st37:
 		goto _out37;
 case 37:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st38;
 		case 95: goto st38;
 	}
@@ -694,7 +703,7 @@ st38:
 		goto _out38;
 case 38:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st39;
 		case 95: goto st39;
 	}
@@ -712,7 +721,7 @@ st39:
 		goto _out39;
 case 39:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st40;
 		case 95: goto st40;
 	}
@@ -730,7 +739,7 @@ st40:
 		goto _out40;
 case 40:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st41;
 		case 95: goto st41;
 	}
@@ -748,7 +757,7 @@ st41:
 		goto _out41;
 case 41:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st42;
 		case 95: goto st42;
 	}
@@ -766,7 +775,7 @@ st42:
 		goto _out42;
 case 42:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st43;
 		case 95: goto st43;
 	}
@@ -784,7 +793,7 @@ st43:
 		goto _out43;
 case 43:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st44;
 		case 95: goto st44;
 	}
@@ -802,7 +811,7 @@ st44:
 		goto _out44;
 case 44:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st45;
 		case 95: goto st45;
 	}
@@ -820,7 +829,7 @@ st45:
 		goto _out45;
 case 45:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st46;
 		case 95: goto st46;
 	}
@@ -838,7 +847,7 @@ st46:
 		goto _out46;
 case 46:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st47;
 		case 95: goto st47;
 	}
@@ -856,7 +865,7 @@ st47:
 		goto _out47;
 case 47:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st48;
 		case 95: goto st48;
 	}
@@ -874,7 +883,7 @@ st48:
 		goto _out48;
 case 48:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st49;
 		case 95: goto st49;
 	}
@@ -892,7 +901,7 @@ st49:
 		goto _out49;
 case 49:
 	switch( (*p) ) {
-		case 32: goto tr17;
+		case 32: goto tr18;
 		case 36: goto st50;
 		case 95: goto st50;
 	}
@@ -910,7 +919,7 @@ st50:
 		goto _out50;
 case 50:
 	if ( (*p) == 32 )
-		goto tr17;
+		goto tr18;
 	goto st1;
 	}
 	_out1: cs = 1; goto _out;
@@ -967,15 +976,23 @@ case 50:
 	_out: {}
 	}
-#line 134 "ext/http11/http11_parser.rl"
+#line 156 "ext/http11/http11_parser.rl"
     parser->cs = cs;
-    parser->nread = p - buffer;
+    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");
     if(parser->body_start) {
         /* final \r\n combo encountered so stop right here */
-#line 978 "ext/http11/http11_parser.c"
-#line 140 "ext/http11/http11_parser.rl"
+#line 995 "ext/http11/http11_parser.c"
+#line 170 "ext/http11/http11_parser.rl"
 	parser->nread++;
     }
@@ -987,8 +1004,8 @@ int http_parser_finish(http_parser *parser)
 	int cs = parser->cs;
-#line 991 "ext/http11/http11_parser.c"
-#line 151 "ext/http11/http11_parser.rl"
+#line 1008 "ext/http11/http11_parser.c"
+#line 181 "ext/http11/http11_parser.rl"
 	parser->cs = cs;