puma 2.0.0.b5 → 5.0.0.beta1

data/ext/puma_http11/org/jruby/puma/Http11.java

@@ -11,7 +11,6 @@ import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 
 import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 import org.jruby.exceptions.RaiseException;
@@ -20,6 +19,7 @@ import org.jruby.util.ByteList;
 
 /**
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
+ * @author <a href="mailto:headius@headius.com">Charles Oliver Nutter</a>
  */
 public class Http11 extends RubyObject {
     public final static int MAX_FIELD_NAME_LENGTH = 256;
@@ -30,13 +30,23 @@ public class Http11 extends RubyObject {
     public final static String MAX_REQUEST_URI_LENGTH_ERR = "HTTP element REQUEST_URI is longer than the 12288 allowed length.";
     public final static int MAX_FRAGMENT_LENGTH = 1024;
     public final static String MAX_FRAGMENT_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 1024 allowed length.";
-    public final static int MAX_REQUEST_PATH_LENGTH = 1024;
-    public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 1024 allowed length.";
+    public final static int MAX_REQUEST_PATH_LENGTH = 8192;
+    public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 8192 allowed length.";
     public final static int MAX_QUERY_STRING_LENGTH = 1024 * 10;
     public final static String MAX_QUERY_STRING_LENGTH_ERR = "HTTP element QUERY_STRING is longer than the 10240 allowed length.";
     public final static int MAX_HEADER_LENGTH = 1024 * (80 + 32);
     public final static String MAX_HEADER_LENGTH_ERR = "HTTP element HEADER is longer than the 114688 allowed length.";
 
+    public static final ByteList CONTENT_TYPE_BYTELIST = new ByteList(ByteList.plain("CONTENT_TYPE"));
+    public static final ByteList CONTENT_LENGTH_BYTELIST = new ByteList(ByteList.plain("CONTENT_LENGTH"));
+    public static final ByteList HTTP_PREFIX_BYTELIST = new ByteList(ByteList.plain("HTTP_"));
+    public static final ByteList COMMA_SPACE_BYTELIST = new ByteList(ByteList.plain(", "));
+    public static final ByteList REQUEST_METHOD_BYTELIST = new ByteList(ByteList.plain("REQUEST_METHOD"));
+    public static final ByteList REQUEST_URI_BYTELIST = new ByteList(ByteList.plain("REQUEST_URI"));
+    public static final ByteList FRAGMENT_BYTELIST = new ByteList(ByteList.plain("FRAGMENT"));
+    public static final ByteList REQUEST_PATH_BYTELIST = new ByteList(ByteList.plain("REQUEST_PATH"));
+    public static final ByteList QUERY_STRING_BYTELIST = new ByteList(ByteList.plain("QUERY_STRING"));
+    public static final ByteList HTTP_VERSION_BYTELIST = new ByteList(ByteList.plain("HTTP_VERSION"));
 
     private static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
@@ -53,118 +63,104 @@ public class Http11 extends RubyObject {
     }
 
     private Ruby runtime;
-    private RubyClass eHttpParserError;
     private Http11Parser hp;
     private RubyString body;
 
     public Http11(Ruby runtime, RubyClass clazz) {
         super(runtime,clazz);
         this.runtime = runtime;
-        this.eHttpParserError = (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError");
         this.hp = new Http11Parser();
-        this.hp.parser.http_field = http_field;
-        this.hp.parser.request_method = request_method;
-        this.hp.parser.request_uri = request_uri;
-        this.hp.parser.fragment = fragment;
-        this.hp.parser.request_path = request_path;
-        this.hp.parser.query_string = query_string;
-        this.hp.parser.http_version = http_version;
-        this.hp.parser.header_done = header_done;
         this.hp.parser.init();
     }
 
-    public void validateMaxLength(int len, int max, String msg) {
+    public static void validateMaxLength(Ruby runtime, int len, int max, String msg) {
         if(len>max) {
-            throw new RaiseException(runtime, eHttpParserError, msg, true);
+            throw newHTTPParserError(runtime, msg);
         }
     }
 
-    private Http11Parser.FieldCB http_field = new Http11Parser.FieldCB() {
-            public void call(Object data, int field, int flen, int value, int vlen) {
-                RubyHash req = (RubyHash)data;
-                RubyString v,f;
-                validateMaxLength(flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
-                validateMaxLength(vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
-
-                v = RubyString.newString(runtime, new ByteList(Http11.this.hp.parser.buffer,value,vlen));
-                ByteList b = new ByteList(Http11.this.hp.parser.buffer,field,flen);
-                for(int i = 0,j = b.length();i<j;i++) {
-                    if((b.get(i) & 0xFF) == '-') {
-                        b.set(i, (byte)'_');
-                    } else {
-                        b.set(i, (byte)Character.toUpperCase((char)b.get(i)));
-                    }
-                }
-
-                String as = b.toString();
-
-                if(as.equals("CONTENT_LENGTH") || as.equals("CONTENT_TYPE")) {
-                  f = RubyString.newString(runtime, b);
-                } else {
-                  f = RubyString.newString(runtime, "HTTP_");
-                  f.cat(b);
-                }
-                req.op_aset(req.getRuntime().getCurrentContext(), f,v);
-            }
-        };
+    private static RaiseException newHTTPParserError(Ruby runtime, String msg) {
+        return runtime.newRaiseException(getHTTPParserError(runtime), msg);
+    }
 
-    private Http11Parser.ElementCB request_method = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
-                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_METHOD"),val);
-            }
-        };
-
-    private Http11Parser.ElementCB request_uri = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                validateMaxLength(length, MAX_REQUEST_URI_LENGTH, MAX_REQUEST_URI_LENGTH_ERR);
-                RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
-                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_URI"),val);
-            }
-        };
-
-    private Http11Parser.ElementCB fragment = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                validateMaxLength(length, MAX_FRAGMENT_LENGTH, MAX_FRAGMENT_LENGTH_ERR);
-                RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
-                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("FRAGMENT"),val);
-            }
-        };
-
-    private Http11Parser.ElementCB request_path = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                validateMaxLength(length, MAX_REQUEST_PATH_LENGTH, MAX_REQUEST_PATH_LENGTH_ERR);
-                RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
-                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_PATH"),val);
-            }
-        };
-
-    private Http11Parser.ElementCB query_string = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                validateMaxLength(length, MAX_QUERY_STRING_LENGTH, MAX_QUERY_STRING_LENGTH_ERR);
-                RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
-                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("QUERY_STRING"),val);
-            }
-        };
+    private static RubyClass getHTTPParserError(Ruby runtime) {
+        // Cheaper to look this up lazily than cache eagerly and consume a field, since it's rarely encountered
+        return (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError");
+    }
 
-    private Http11Parser.ElementCB http_version = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                RubyHash req = (RubyHash)data;
-                RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
-                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("HTTP_VERSION"),val);
+    public static void http_field(Ruby runtime, RubyHash req, ByteList buffer, int field, int flen, int value, int vlen) {
+        RubyString f;
+        IRubyObject v;
+        validateMaxLength(runtime, flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
+        validateMaxLength(runtime, vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
+
+        ByteList b = new ByteList(buffer,field,flen);
+        for(int i = 0,j = b.length();i<j;i++) {
+            int bite = b.get(i) & 0xFF;
+            if(bite == '-') {
+                b.set(i, (byte)'_');
+            } else {
+                b.set(i, (byte)Character.toUpperCase(bite));
             }
-        };
+        }
 
-    private Http11Parser.ElementCB header_done = new Http11Parser.ElementCB() {
-            public void call(Object data, int at, int length) {
-                body = RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length));
-            }
-        };
+        while (vlen > 0 && Character.isWhitespace(buffer.get(value + vlen - 1))) vlen--;
+
+        if (b.equals(CONTENT_LENGTH_BYTELIST) || b.equals(CONTENT_TYPE_BYTELIST)) {
+          f = RubyString.newString(runtime, b);
+        } else {
+          f = RubyString.newStringShared(runtime, HTTP_PREFIX_BYTELIST);
+          f.cat(b);
+        }
+
+        b = new ByteList(buffer, value, vlen);
+        v = req.fastARef(f);
+        if (v == null || v.isNil()) {
+            req.fastASet(f, RubyString.newString(runtime, b));
+        } else {
+            RubyString vs = v.convertToString();
+            vs.cat(COMMA_SPACE_BYTELIST);
+            vs.cat(b);
+        }
+    }
+
+    public static void request_method(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
+        req.fastASet(RubyString.newStringShared(runtime, REQUEST_METHOD_BYTELIST),val);
+    }
+
+    public static void request_uri(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        validateMaxLength(runtime, length, MAX_REQUEST_URI_LENGTH, MAX_REQUEST_URI_LENGTH_ERR);
+        RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
+        req.fastASet(RubyString.newStringShared(runtime, REQUEST_URI_BYTELIST),val);
+    }
+
+    public static void fragment(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        validateMaxLength(runtime, length, MAX_FRAGMENT_LENGTH, MAX_FRAGMENT_LENGTH_ERR);
+        RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
+        req.fastASet(RubyString.newStringShared(runtime, FRAGMENT_BYTELIST),val);
+    }
+
+    public static void request_path(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        validateMaxLength(runtime, length, MAX_REQUEST_PATH_LENGTH, MAX_REQUEST_PATH_LENGTH_ERR);
+        RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
+        req.fastASet(RubyString.newStringShared(runtime, REQUEST_PATH_BYTELIST),val);
+    }
+
+    public static void query_string(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        validateMaxLength(runtime, length, MAX_QUERY_STRING_LENGTH, MAX_QUERY_STRING_LENGTH_ERR);
+        RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
+        req.fastASet(RubyString.newStringShared(runtime, QUERY_STRING_BYTELIST),val);
+    }
+
+    public static void http_version(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
+        req.fastASet(RubyString.newStringShared(runtime, HTTP_VERSION_BYTELIST),val);
+    }
+
+    public void header_done(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
+        body = RubyString.newStringShared(runtime, new ByteList(buffer, at, length));
+    }
 
     @JRubyMethod
     public IRubyObject initialize() {
@@ -186,19 +182,24 @@ public class Http11 extends RubyObject {
 
     @JRubyMethod
     public IRubyObject execute(IRubyObject req_hash, IRubyObject data, IRubyObject start) {
-        int from = 0;
-        from = RubyNumeric.fix2int(start);
+        int from = RubyNumeric.fix2int(start);
         ByteList d = ((RubyString)data).getByteList();
         if(from >= d.length()) {
-            throw new RaiseException(runtime, eHttpParserError, "Requested start is after data buffer end.", true);
+            throw newHTTPParserError(runtime, "Requested start is after data buffer end.");
         } else {
-            this.hp.parser.data = req_hash;
-            this.hp.execute(d,from);
-            validateMaxLength(this.hp.parser.nread,MAX_HEADER_LENGTH, MAX_HEADER_LENGTH_ERR);
-            if(this.hp.has_error()) {
-                throw new RaiseException(runtime, eHttpParserError, "Invalid HTTP format, parsing fails.", true);
+            Http11Parser hp = this.hp;
+            Http11Parser.HttpParser parser = hp.parser;
+
+            parser.data = (RubyHash) req_hash;
+
+            hp.execute(runtime, this, d,from);
+
+            validateMaxLength(runtime, parser.nread,MAX_HEADER_LENGTH, MAX_HEADER_LENGTH_ERR);
+
+            if(hp.has_error()) {
+                throw newHTTPParserError(runtime, "Invalid HTTP format, parsing fails. Are you trying to open an SSL connection to a non-SSL Puma?");
             } else {
-                return runtime.newFixnum(this.hp.parser.nread);
+                return runtime.newFixnum(parser.nread);
             }
         }
     }
@@ -217,7 +218,7 @@ public class Http11 extends RubyObject {
     public IRubyObject nread() {
         return runtime.newFixnum(this.hp.parser.nread);
     }
-    
+
     @JRubyMethod
     public IRubyObject body() {
         return body;

data/ext/puma_http11/org/jruby/puma/Http11Parser.java

@@ -2,6 +2,8 @@
 // line 1 "ext/puma_http11/http11_parser.java.rl"
 package org.jruby.puma;
 
+import org.jruby.Ruby;
+import org.jruby.RubyHash;
 import org.jruby.util.ByteList;
 
 public class Http11Parser {
@@ -9,13 +11,13 @@ public class Http11Parser {
 /** Machine **/
 
 
-// line 65 "ext/puma_http11/http11_parser.java.rl"
+// line 58 "ext/puma_http11/http11_parser.java.rl"
 
 
 /** Data **/
 
-// line 18 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
-private static byte[] init__http_parser_actions_0()
+// line 20 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+private static byte[] init__puma_parser_actions_0()
 {
 	return new byte [] {
 	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
@@ -25,24 +27,23 @@ private static byte[] init__http_parser_actions_0()
 	};
 }
 
-private static final byte _http_parser_actions[] = init__http_parser_actions_0();
+private static final byte _puma_parser_actions[] = init__puma_parser_actions_0();
 
 
-private static short[] init__http_parser_key_offsets_0()
+private static short[] init__puma_parser_key_offsets_0()
 {
 	return new short [] {
 	    0,    0,    8,   17,   27,   29,   30,   31,   32,   33,   34,   36,
-	   39,   41,   44,   45,   61,   62,   78,   80,   81,   90,   99,  105,
-	  111,  121,  130,  136,  142,  153,  159,  165,  175,  181,  187,  196,
-	  205,  211,  217,  226,  235,  244,  253,  262,  271,  280,  289,  298,
-	  307,  316,  325,  334,  343,  352,  361,  370,  379,  380
+	   39,   41,   44,   45,   61,   62,   78,   80,   81,   89,   97,  107,
+	  115,  124,  132,  140,  149,  158,  167,  176,  185,  194,  203,  212,
+	  221,  230,  239,  248,  257,  266,  275,  284,  293,  302,  303
 	};
 }
 
-private static final short _http_parser_key_offsets[] = init__http_parser_key_offsets_0();
+private static final short _puma_parser_key_offsets[] = init__puma_parser_key_offsets_0();
 
 
-private static char[] init__http_parser_trans_keys_0()
+private static char[] init__puma_parser_trans_keys_0()
 {
 	return new char [] {
 	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
@@ -51,81 +52,72 @@ private static char[] init__http_parser_trans_keys_0()
 	   46,   48,   57,   48,   57,   13,   48,   57,   10,   13,   33,  124,
 	  126,   35,   39,   42,   43,   45,   46,   48,   57,   65,   90,   94,
 	  122,   10,   33,   58,  124,  126,   35,   39,   42,   43,   45,   46,
-	   48,   57,   65,   90,   94,  122,   13,   32,   13,   32,   37,   60,
-	   62,  127,    0,   31,   34,   35,   32,   37,   60,   62,  127,    0,
-	   31,   34,   35,   48,   57,   65,   70,   97,  102,   48,   57,   65,
-	   70,   97,  102,   43,   58,   45,   46,   48,   57,   65,   90,   97,
-	  122,   32,   34,   35,   37,   60,   62,  127,    0,   31,   48,   57,
-	   65,   70,   97,  102,   48,   57,   65,   70,   97,  102,   32,   34,
-	   35,   37,   59,   60,   62,   63,  127,    0,   31,   48,   57,   65,
-	   70,   97,  102,   48,   57,   65,   70,   97,  102,   32,   34,   35,
-	   37,   60,   62,   63,  127,    0,   31,   48,   57,   65,   70,   97,
-	  102,   48,   57,   65,   70,   97,  102,   32,   34,   35,   37,   60,
-	   62,  127,    0,   31,   32,   34,   35,   37,   60,   62,  127,    0,
-	   31,   48,   57,   65,   70,   97,  102,   48,   57,   65,   70,   97,
-	  102,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,    0
+	   48,   57,   65,   90,   94,  122,   13,   32,   13,   32,   60,   62,
+	  127,    0,   31,   34,   35,   32,   60,   62,  127,    0,   31,   34,
+	   35,   43,   58,   45,   46,   48,   57,   65,   90,   97,  122,   32,
+	   34,   35,   60,   62,  127,    0,   31,   32,   34,   35,   60,   62,
+	   63,  127,    0,   31,   32,   34,   35,   60,   62,  127,    0,   31,
+	   32,   34,   35,   60,   62,  127,    0,   31,   32,   36,   95,   45,
+	   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,
+	   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,
+	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
+	   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,
+	   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,
+	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
+	   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,
+	   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,
+	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
+	   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,
+	   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,
+	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
+	   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,
+	   65,   90,   32,    0
 	};
 }
 
-private static final char _http_parser_trans_keys[] = init__http_parser_trans_keys_0();
+private static final char _puma_parser_trans_keys[] = init__puma_parser_trans_keys_0();
 
 
-private static byte[] init__http_parser_single_lengths_0()
+private static byte[] init__puma_parser_single_lengths_0()
 {
 	return new byte [] {
 	    0,    2,    3,    4,    2,    1,    1,    1,    1,    1,    0,    1,
-	    0,    1,    1,    4,    1,    4,    2,    1,    5,    5,    0,    0,
-	    2,    7,    0,    0,    9,    0,    0,    8,    0,    0,    7,    7,
-	    0,    0,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-	    3,    3,    3,    3,    3,    3,    3,    3,    1,    0
+	    0,    1,    1,    4,    1,    4,    2,    1,    4,    4,    2,    6,
+	    7,    6,    6,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    3,    3,    3,    3,    1,    0
 	};
 }
 
-private static final byte _http_parser_single_lengths[] = init__http_parser_single_lengths_0();
+private static final byte _puma_parser_single_lengths[] = init__puma_parser_single_lengths_0();
 
 
-private static byte[] init__http_parser_range_lengths_0()
+private static byte[] init__puma_parser_range_lengths_0()
 {
 	return new byte [] {
 	    0,    3,    3,    3,    0,    0,    0,    0,    0,    0,    1,    1,
-	    1,    1,    0,    6,    0,    6,    0,    0,    2,    2,    3,    3,
-	    4,    1,    3,    3,    1,    3,    3,    1,    3,    3,    1,    1,
-	    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-	    3,    3,    3,    3,    3,    3,    3,    3,    0,    0
+	    1,    1,    0,    6,    0,    6,    0,    0,    2,    2,    4,    1,
+	    1,    1,    1,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    3,    3,    3,    3,    0,    0
 	};
 }
 
-private static final byte _http_parser_range_lengths[] = init__http_parser_range_lengths_0();
+private static final byte _puma_parser_range_lengths[] = init__puma_parser_range_lengths_0();
 
 
-private static short[] init__http_parser_index_offsets_0()
+private static short[] init__puma_parser_index_offsets_0()
 {
 	return new short [] {
 	    0,    0,    6,   13,   21,   24,   26,   28,   30,   32,   34,   36,
-	   39,   41,   44,   46,   57,   59,   70,   73,   75,   83,   91,   95,
-	   99,  106,  115,  119,  123,  134,  138,  142,  152,  156,  160,  169,
-	  178,  182,  186,  193,  200,  207,  214,  221,  228,  235,  242,  249,
-	  256,  263,  270,  277,  284,  291,  298,  305,  312,  314
+	   39,   41,   44,   46,   57,   59,   70,   73,   75,   82,   89,   96,
+	  104,  113,  121,  129,  136,  143,  150,  157,  164,  171,  178,  185,
+	  192,  199,  206,  213,  220,  227,  234,  241,  248,  255,  257
 	};
 }
 
-private static final short _http_parser_index_offsets[] = init__http_parser_index_offsets_0();
+private static final short _puma_parser_index_offsets[] = init__puma_parser_index_offsets_0();
 
 
-private static byte[] init__http_parser_indicies_0()
+private static byte[] init__puma_parser_indicies_0()
 {
 	return new byte [] {
 	    0,    0,    0,    0,    0,    1,    2,    3,    3,    3,    3,    3,
@@ -134,80 +126,73 @@ private static byte[] init__http_parser_indicies_0()
 	   16,   15,    1,   17,    1,   18,   17,    1,   19,    1,   20,   21,
 	   21,   21,   21,   21,   21,   21,   21,   21,    1,   22,    1,   23,
 	   24,   23,   23,   23,   23,   23,   23,   23,   23,    1,   26,   27,
-	   25,   29,   28,   30,   32,    1,    1,    1,    1,    1,   31,   33,
-	   35,    1,    1,    1,    1,    1,   34,   36,   36,   36,    1,   34,
-	   34,   34,    1,   37,   38,   37,   37,   37,   37,    1,    8,    1,
-	    9,   39,    1,    1,    1,    1,   38,   40,   40,   40,    1,   38,
-	   38,   38,    1,   41,    1,   43,   44,   45,    1,    1,   46,    1,
-	    1,   42,   47,   47,   47,    1,   42,   42,   42,    1,    8,    1,
-	    9,   49,    1,    1,   50,    1,    1,   48,   51,   51,   51,    1,
-	   48,   48,   48,    1,   52,    1,   54,   55,    1,    1,    1,    1,
-	   53,   56,    1,   58,   59,    1,    1,    1,    1,   57,   60,   60,
-	   60,    1,   57,   57,   57,    1,    2,   61,   61,   61,   61,   61,
+	   25,   29,   28,   30,    1,    1,    1,    1,    1,   31,   32,    1,
+	    1,    1,    1,    1,   33,   34,   35,   34,   34,   34,   34,    1,
+	    8,    1,    9,    1,    1,    1,    1,   35,   36,    1,   38,    1,
+	    1,   39,    1,    1,   37,   40,    1,   42,    1,    1,    1,    1,
+	   41,   43,    1,   45,    1,    1,    1,    1,   44,    2,   46,   46,
+	   46,   46,   46,    1,    2,   47,   47,   47,   47,   47,    1,    2,
+	   48,   48,   48,   48,   48,    1,    2,   49,   49,   49,   49,   49,
+	    1,    2,   50,   50,   50,   50,   50,    1,    2,   51,   51,   51,
+	   51,   51,    1,    2,   52,   52,   52,   52,   52,    1,    2,   53,
+	   53,   53,   53,   53,    1,    2,   54,   54,   54,   54,   54,    1,
+	    2,   55,   55,   55,   55,   55,    1,    2,   56,   56,   56,   56,
+	   56,    1,    2,   57,   57,   57,   57,   57,    1,    2,   58,   58,
+	   58,   58,   58,    1,    2,   59,   59,   59,   59,   59,    1,    2,
+	   60,   60,   60,   60,   60,    1,    2,   61,   61,   61,   61,   61,
 	    1,    2,   62,   62,   62,   62,   62,    1,    2,   63,   63,   63,
-	   63,   63,    1,    2,   64,   64,   64,   64,   64,    1,    2,   65,
-	   65,   65,   65,   65,    1,    2,   66,   66,   66,   66,   66,    1,
-	    2,   67,   67,   67,   67,   67,    1,    2,   68,   68,   68,   68,
-	   68,    1,    2,   69,   69,   69,   69,   69,    1,    2,   70,   70,
-	   70,   70,   70,    1,    2,   71,   71,   71,   71,   71,    1,    2,
-	   72,   72,   72,   72,   72,    1,    2,   73,   73,   73,   73,   73,
-	    1,    2,   74,   74,   74,   74,   74,    1,    2,   75,   75,   75,
-	   75,   75,    1,    2,   76,   76,   76,   76,   76,    1,    2,   77,
-	   77,   77,   77,   77,    1,    2,   78,   78,   78,   78,   78,    1,
-	    2,    1,    1,    0
+	   63,   63,    1,    2,    1,    1,    0
 	};
 }
 
-private static final byte _http_parser_indicies[] = init__http_parser_indicies_0();
+private static final byte _puma_parser_indicies[] = init__puma_parser_indicies_0();
 
 
-private static byte[] init__http_parser_trans_targs_0()
+private static byte[] init__puma_parser_trans_targs_0()
 {
 	return new byte [] {
-	    2,    0,    3,   38,    4,   24,   28,   25,    5,   20,    6,    7,
-	    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,   57,   17,
-	   18,   19,   14,   18,   19,   14,    5,   21,   22,    5,   21,   22,
-	   23,   24,   25,   26,   27,    5,   28,   20,   29,   31,   34,   30,
-	   31,   32,   34,   33,    5,   35,   20,   36,    5,   35,   20,   36,
-	   37,   39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-	   50,   51,   52,   53,   54,   55,   56
+	    2,    0,    3,   27,    4,   22,   24,   23,    5,   20,    6,    7,
+	    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,   46,   17,
+	   18,   19,   14,   18,   19,   14,    5,   21,    5,   21,   22,   23,
+	    5,   24,   20,   25,    5,   26,   20,    5,   26,   20,   28,   29,
+	   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
+	   42,   43,   44,   45
 	};
 }
 
-private static final byte _http_parser_trans_targs[] = init__http_parser_trans_targs_0();
+private static final byte _puma_parser_trans_targs[] = init__puma_parser_trans_targs_0();
 
 
-private static byte[] init__http_parser_trans_actions_0()
+private static byte[] init__puma_parser_trans_actions_0()
 {
 	return new byte [] {
 	    1,    0,   11,    0,    1,    1,    1,    1,   13,   13,    1,    0,
 	    0,    0,    0,    0,    0,    0,   19,    0,    0,   28,   23,    3,
-	    5,    7,   31,    7,    0,    9,   25,    1,    1,   15,    0,    0,
-	    0,    0,    0,    0,    0,   37,    0,   37,    0,   21,   21,    0,
-	    0,    0,    0,    0,   40,   17,   40,   17,   34,    0,   34,    0,
+	    5,    7,   31,    7,    0,    9,   25,    1,   15,    0,    0,    0,
+	   37,    0,   37,   21,   40,   17,   40,   34,    0,   34,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0
+	    0,    0,    0,    0
 	};
 }
 
-private static final byte _http_parser_trans_actions[] = init__http_parser_trans_actions_0();
+private static final byte _puma_parser_trans_actions[] = init__puma_parser_trans_actions_0();
 
 
-static final int http_parser_start = 1;
-static final int http_parser_first_final = 57;
-static final int http_parser_error = 0;
+static final int puma_parser_start = 1;
+static final int puma_parser_first_final = 46;
+static final int puma_parser_error = 0;
 
-static final int http_parser_en_main = 1;
+static final int puma_parser_en_main = 1;
 
 
-// line 69 "ext/puma_http11/http11_parser.java.rl"
+// line 62 "ext/puma_http11/http11_parser.java.rl"
 
    public static interface ElementCB {
-     public void call(Object data, int at, int length);
+     public void call(Ruby runtime, RubyHash data, ByteList buffer, int at, int length);
    }
 
    public static interface FieldCB {
-     public void call(Object data, int field, int flen, int value, int vlen);
+     public void call(Ruby runtime, RubyHash data, ByteList buffer, int field, int flen, int value, int vlen);
    }
 
    public static class HttpParser {
@@ -220,28 +205,19 @@ static final int http_parser_en_main = 1;
       int field_len;
       int query_start;
 
-      Object data;
+      RubyHash data;
       ByteList buffer;
 
-      public FieldCB http_field;
-      public ElementCB request_method;
-      public ElementCB request_uri;
-      public ElementCB fragment;
-      public ElementCB request_path;
-      public ElementCB query_string;
-      public ElementCB http_version;
-      public ElementCB header_done;
-
       public void init() {
           cs = 0;
 
           
-// line 240 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+// line 218 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
-	cs = http_parser_start;
+	cs = puma_parser_start;
 	}
 
-// line 104 "ext/puma_http11/http11_parser.java.rl"
+// line 90 "ext/puma_http11/http11_parser.java.rl"
 
           body_start = 0;
           content_len = 0;
@@ -254,7 +230,7 @@ static final int http_parser_en_main = 1;
 
    public final HttpParser parser = new HttpParser();
 
-   public int execute(ByteList buffer, int off) {
+   public int execute(Ruby runtime, Http11 http, ByteList buffer, int off) {
      int p, pe;
      int cs = parser.cs;
      int len = buffer.length();
@@ -268,7 +244,7 @@ static final int http_parser_en_main = 1;
      parser.buffer = buffer;
 
      
-// line 272 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+// line 250 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -290,9 +266,9 @@ static final int http_parser_en_main = 1;
 	}
 case 1:
 	_match: do {
-	_keys = _http_parser_key_offsets[cs];
-	_trans = _http_parser_index_offsets[cs];
-	_klen = _http_parser_single_lengths[cs];
+	_keys = _puma_parser_key_offsets[cs];
+	_trans = _puma_parser_index_offsets[cs];
+	_klen = _puma_parser_single_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -302,9 +278,9 @@ case 1:
 				break;
 
 			_mid = _lower + ((_upper-_lower) >> 1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 1;
-			else if ( data[p] > _http_parser_trans_keys[_mid] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid] )
 				_lower = _mid + 1;
 			else {
 				_trans += (_mid - _keys);
@@ -315,7 +291,7 @@ case 1:
 		_trans += _klen;
 	}
 
-	_klen = _http_parser_range_lengths[cs];
+	_klen = _puma_parser_range_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -325,9 +301,9 @@ case 1:
 				break;
 
 			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 2;
-			else if ( data[p] > _http_parser_trans_keys[_mid+1] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid+1] )
 				_lower = _mid + 2;
 			else {
 				_trans += ((_mid - _keys)>>1);
@@ -338,102 +314,93 @@ case 1:
 	}
 	} while (false);
 
-	_trans = _http_parser_indicies[_trans];
-	cs = _http_parser_trans_targs[_trans];
+	_trans = _puma_parser_indicies[_trans];
+	cs = _puma_parser_trans_targs[_trans];
 
-	if ( _http_parser_trans_actions[_trans] != 0 ) {
-		_acts = _http_parser_trans_actions[_trans];
-		_nacts = (int) _http_parser_actions[_acts++];
+	if ( _puma_parser_trans_actions[_trans] != 0 ) {
+		_acts = _puma_parser_trans_actions[_trans];
+		_nacts = (int) _puma_parser_actions[_acts++];
 		while ( _nacts-- > 0 )
 	{
-			switch ( _http_parser_actions[_acts++] )
+			switch ( _puma_parser_actions[_acts++] )
 			{
 	case 0:
-// line 13 "ext/puma_http11/http11_parser.java.rl"
+// line 15 "ext/puma_http11/http11_parser.java.rl"
 	{parser.mark = p; }
 	break;
 	case 1:
-// line 15 "ext/puma_http11/http11_parser.java.rl"
+// line 17 "ext/puma_http11/http11_parser.java.rl"
 	{ parser.field_start = p; }
 	break;
 	case 2:
-// line 16 "ext/puma_http11/http11_parser.java.rl"
+// line 18 "ext/puma_http11/http11_parser.java.rl"
 	{ /* FIXME stub */ }
 	break;
 	case 3:
-// line 17 "ext/puma_http11/http11_parser.java.rl"
+// line 19 "ext/puma_http11/http11_parser.java.rl"
 	{ 
     parser.field_len = p-parser.field_start;
   }
 	break;
 	case 4:
-// line 21 "ext/puma_http11/http11_parser.java.rl"
+// line 23 "ext/puma_http11/http11_parser.java.rl"
 	{ parser.mark = p; }
 	break;
 	case 5:
-// line 22 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    if(parser.http_field != null) {
-      parser.http_field.call(parser.data, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
-    }
+// line 24 "ext/puma_http11/http11_parser.java.rl"
+	{
+    Http11.http_field(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
   }
 	break;
 	case 6:
 // line 27 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    if(parser.request_method != null) 
-      parser.request_method.call(parser.data, parser.mark, p-parser.mark);
+	{
+    Http11.request_method(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
   }
 	break;
 	case 7:
-// line 31 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    if(parser.request_uri != null)
-      parser.request_uri.call(parser.data, parser.mark, p-parser.mark);
+// line 30 "ext/puma_http11/http11_parser.java.rl"
+	{
+    Http11.request_uri(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
   }
 	break;
 	case 8:
-// line 35 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    if(parser.fragment != null)
-      parser.fragment.call(parser.data, parser.mark, p-parser.mark);
+// line 33 "ext/puma_http11/http11_parser.java.rl"
+	{
+    Http11.fragment(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
   }
 	break;
 	case 9:
-// line 40 "ext/puma_http11/http11_parser.java.rl"
+// line 37 "ext/puma_http11/http11_parser.java.rl"
 	{parser.query_start = p; }
 	break;
 	case 10:
-// line 41 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    if(parser.query_string != null)
-      parser.query_string.call(parser.data, parser.query_start, p-parser.query_start);
+// line 38 "ext/puma_http11/http11_parser.java.rl"
+	{
+    Http11.query_string(runtime, parser.data, parser.buffer, parser.query_start, p-parser.query_start);
   }
 	break;
 	case 11:
-// line 46 "ext/puma_http11/http11_parser.java.rl"
-	{	
-    if(parser.http_version != null)
-      parser.http_version.call(parser.data, parser.mark, p-parser.mark);
+// line 42 "ext/puma_http11/http11_parser.java.rl"
+	{
+    Http11.http_version(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
   }
 	break;
 	case 12:
-// line 51 "ext/puma_http11/http11_parser.java.rl"
+// line 46 "ext/puma_http11/http11_parser.java.rl"
 	{
-    if(parser.request_path != null)
-      parser.request_path.call(parser.data, parser.mark, p-parser.mark);
+    Http11.request_path(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
   }
 	break;
 	case 13:
-// line 56 "ext/puma_http11/http11_parser.java.rl"
+// line 50 "ext/puma_http11/http11_parser.java.rl"
 	{ 
-    parser.body_start = p + 1; 
-    if(parser.header_done != null)
-      parser.header_done.call(parser.data, p + 1, pe - p - 1);
+    parser.body_start = p + 1;
+    http.header_done(runtime, parser.data, parser.buffer, p + 1, pe - p - 1);
     { p += 1; _goto_targ = 5; if (true)  continue _goto;}
   }
 	break;
-// line 437 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+// line 406 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 			}
 		}
 	}
@@ -453,7 +420,7 @@ case 5:
 	break; }
 	}
 
-// line 130 "ext/puma_http11/http11_parser.java.rl"
+// line 116 "ext/puma_http11/http11_parser.java.rl"
 
      parser.cs = cs;
      parser.nread += (p - off);
@@ -479,10 +446,10 @@ case 5:
   }
 
   public boolean has_error() {
-    return parser.cs == http_parser_error;
+    return parser.cs == puma_parser_error;
   }
 
   public boolean is_finished() {
-    return parser.cs == http_parser_first_final;
+    return parser.cs == puma_parser_first_final;
   }
 }