mongrel 1.1.5 → 1.2.0.pre2

data/ext/http11/http11_parser.java.rl

@@ -13,6 +13,7 @@ public class Http11Parser {
   action mark {parser.mark = fpc; }
 
   action start_field { parser.field_start = fpc; }
+  action snake_upcase_field { /* FIXME stub */ }
   action write_field { 
     parser.field_len = fpc-parser.field_start;
   }
@@ -115,12 +116,12 @@ public class Http11Parser {
    public int execute(ByteList buffer, int off) {
      int p, pe;
      int cs = parser.cs;
-     int len = buffer.realSize;
+     int len = buffer.length();
      assert off<=len : "offset past end of buffer";
 
      p = off;
      pe = len;
-     byte[] data = buffer.bytes;
+     byte[] data = buffer.unsafeBytes();
      parser.buffer = buffer;
 
      %% write exec;
@@ -135,22 +136,10 @@ public class Http11Parser {
      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>0) {
-        /* final \r\n combo encountered so stop right here */
-        %%write eof;
-        parser.nread++;
-     }
-
      return parser.nread;
    }
 
    public int finish() {
-     int cs = parser.cs;
-
-     %%write eof;
-
-     parser.cs = cs;
- 
     if(has_error()) {
       return -1;
     } else if(is_finished()) {

data/ext/http11/http11_parser.rl

@@ -9,6 +9,18 @@
 #include <ctype.h>
 #include <string.h>
 
+/*
+ * capitalizes all lower-case ASCII characters,
+ * converts dashes to underscores.
+ */
+static void snake_upcase_char(char *c)
+{
+    if (*c >= 'a' && *c <= 'z')
+      *c &= ~0x20;
+    else if (*c == '-')
+      *c = '_';
+}
+
 #define LEN(AT, FPC) (FPC - buffer - parser->AT)
 #define MARK(M,FPC) (parser->M = (FPC) - buffer)
 #define PTR_TO(F) (buffer + parser->F)
@@ -23,12 +35,13 @@
 
 
   action start_field { MARK(field_start, fpc); }
+  action snake_upcase_field { snake_upcase_char((char *)fpc); }
   action write_field { 
     parser->field_len = LEN(field_start, fpc);
   }
 
   action start_value { MARK(mark, fpc); }
-  action write_value { 
+  action write_value {
     if(parser->http_field != NULL) {
       parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc));
     }
@@ -41,7 +54,7 @@
     if(parser->request_uri != NULL)
       parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
   }
-  action fragment { 
+  action fragment {
     if(parser->fragment != NULL)
       parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc));
   }
@@ -101,13 +114,13 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
   p = buffer+off;
   pe = buffer+len;
 
-  assert(*pe == '\0' && "pointer does not end on NUL");
+  /* assert(*pe == '\0' && "pointer does not end on NUL"); */
   assert(pe - p == len - off && "pointers aren't same distance");
 
-
   %% write exec;
 
-  parser->cs = cs;
+  if (!http_parser_has_error(parser))
+    parser->cs = cs;
   parser->nread += p - (buffer + off);
 
   assert(p <= pe && "buffer overflow after parsing execute");
@@ -117,23 +130,11 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
   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 */
-    %%write eof;
-    parser->nread++;
-  }
-
   return(parser->nread);
 }
 
 int http_parser_finish(http_parser *parser)
 {
-  int cs = parser->cs;
-
-  %%write eof;
-
-  parser->cs = cs;
-
   if (http_parser_has_error(parser) ) {
     return -1;
   } else if (http_parser_is_finished(parser) ) {
@@ -148,5 +149,5 @@ int http_parser_has_error(http_parser *parser) {
 }
 
 int http_parser_is_finished(http_parser *parser) {
-  return parser->cs == http_parser_first_final;
+  return parser->cs >= http_parser_first_final;
 }

data/ext/http11/http11_parser_common.rl

@@ -41,7 +41,7 @@
   HTTP_Version = ( "HTTP/" http_number ) >mark %http_version ;
   Request_Line = ( Method " " Request_URI ("#" Fragment){0,1} " " HTTP_Version CRLF ) ;
 
-  field_name = ( token -- ":" )+ >start_field %write_field;
+  field_name = ( token -- ":" )+ >start_field $snake_upcase_field %write_field;
 
   field_value = any* >start_value %write_value;
 

data/ext/{http11_java → http11}/org/jruby/mongrel/Http11.java

@@ -1,30 +1,3 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2007 Ola Bini <ola@ologix.com>
- * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the CPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the CPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
 package org.jruby.mongrel;
 
 import org.jruby.Ruby;
@@ -35,8 +8,10 @@ import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 
-import org.jruby.runtime.CallbackFactory;
+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;
@@ -73,16 +48,8 @@ public class Http11 extends RubyObject {
         RubyModule mMongrel = runtime.defineModule("Mongrel");
         mMongrel.defineClassUnder("HttpParserError",runtime.getClass("IOError"),runtime.getClass("IOError").getAllocator());
 
-        CallbackFactory cf = runtime.callbackFactory(Http11.class);
-
         RubyClass cHttpParser = mMongrel.defineClassUnder("HttpParser",runtime.getObject(),ALLOCATOR);
-        cHttpParser.defineFastMethod("initialize",cf.getFastMethod("initialize"));
-        cHttpParser.defineFastMethod("reset",cf.getFastMethod("reset"));
-        cHttpParser.defineFastMethod("finish",cf.getFastMethod("finish"));
-        cHttpParser.defineFastMethod("execute",cf.getFastMethod("execute", IRubyObject.class, IRubyObject.class, IRubyObject.class));
-        cHttpParser.defineFastMethod("error?",cf.getFastMethod("has_error"));
-        cHttpParser.defineFastMethod("finished?",cf.getFastMethod("is_finished"));
-        cHttpParser.defineFastMethod("nread",cf.getFastMethod("nread"));
+        cHttpParser.defineAnnotatedMethods(Http11.class);
     }
 
     private Ruby runtime;
@@ -121,15 +88,15 @@ public class Http11 extends RubyObject {
                 v = RubyString.newString(runtime, new ByteList(Http11.this.hp.parser.buffer,value,vlen));
                 f = RubyString.newString(runtime, "HTTP_");
                 ByteList b = new ByteList(Http11.this.hp.parser.buffer,field,flen);
-                for(int i=0,j=b.realSize;i<j;i++) {
-                    if((b.bytes[i]&0xFF) == '-') {
-                        b.bytes[i] = (byte)'_';
+                for(int i = 0,j = b.length();i<j;i++) {
+                    if((b.get(i) & 0xFF) == '-') {
+                        b.set(i, (byte)'_');
                     } else {
-                        b.bytes[i] = (byte)Character.toUpperCase((char)b.bytes[i]);
+                        b.set(i, (byte)Character.toUpperCase((char)b.get(i)));
                     }
                 }
                 f.cat(b);
-                req.aset(f,v);
+                req.op_aset(req.getRuntime().getCurrentContext(), f,v);
             }
         };
 
@@ -137,7 +104,7 @@ public class Http11 extends RubyObject {
             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.aset(runtime.newString("REQUEST_METHOD"),val);
+                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_METHOD"),val);
             }
         };
 
@@ -146,7 +113,7 @@ public class Http11 extends RubyObject {
                 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.aset(runtime.newString("REQUEST_URI"),val);
+                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_URI"),val);
             }
         };
 
@@ -155,7 +122,7 @@ public class Http11 extends RubyObject {
                 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.aset(runtime.newString("FRAGMENT"),val);
+                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("FRAGMENT"),val);
             }
         };
 
@@ -164,7 +131,7 @@ public class Http11 extends RubyObject {
                 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.aset(runtime.newString("REQUEST_PATH"),val);
+                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_PATH"),val);
             }
         };
 
@@ -173,7 +140,7 @@ public class Http11 extends RubyObject {
                 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.aset(runtime.newString("QUERY_STRING"),val);
+                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("QUERY_STRING"),val);
             }
         };
 
@@ -181,64 +148,69 @@ public class Http11 extends RubyObject {
             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.aset(runtime.newString("HTTP_VERSION"),val);
+                req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("HTTP_VERSION"),val);
             }
         };
 
     private Http11Parser.ElementCB header_done = new Http11Parser.ElementCB() {
             public void call(Object data, int at, int length) {
                 RubyHash req = (RubyHash)data;
+                ThreadContext context = req.getRuntime().getCurrentContext();
                 IRubyObject temp,ctype,clen;
                 
-                clen = req.aref(runtime.newString("HTTP_CONTENT_LENGTH"));
+                clen = req.op_aref(context, runtime.newString("HTTP_CONTENT_LENGTH"));
                 if(!clen.isNil()) {
-                    req.aset(runtime.newString("CONTENT_LENGTH"),clen);
+                    req.op_aset(context, runtime.newString("CONTENT_LENGTH"),clen);
                 }
 
-                ctype = req.aref(runtime.newString("HTTP_CONTENT_TYPE"));
+                ctype = req.op_aref(context, runtime.newString("HTTP_CONTENT_TYPE"));
                 if(!ctype.isNil()) {
-                    req.aset(runtime.newString("CONTENT_TYPE"),ctype);
+                    req.op_aset(context, runtime.newString("CONTENT_TYPE"),ctype);
                 }
 
-                req.aset(runtime.newString("GATEWAY_INTERFACE"),runtime.newString("CGI/1.2"));
-                if(!(temp = req.aref(runtime.newString("HTTP_HOST"))).isNil()) {
+                req.op_aset(context, runtime.newString("GATEWAY_INTERFACE"),runtime.newString("CGI/1.2"));
+                if(!(temp = req.op_aref(context, runtime.newString("HTTP_HOST"))).isNil()) {
                     String s = temp.toString();
                     int colon = s.indexOf(':');
                     if(colon != -1) {
-                        req.aset(runtime.newString("SERVER_NAME"),runtime.newString(s.substring(0,colon)));
-                        req.aset(runtime.newString("SERVER_PORT"),runtime.newString(s.substring(colon+1)));
+                        req.op_aset(context, runtime.newString("SERVER_NAME"),runtime.newString(s.substring(0,colon)));
+                        req.op_aset(context, runtime.newString("SERVER_PORT"),runtime.newString(s.substring(colon+1)));
                     } else {
-                        req.aset(runtime.newString("SERVER_NAME"),temp);
-                        req.aset(runtime.newString("SERVER_PORT"),runtime.newString("80"));
+                        req.op_aset(context, runtime.newString("SERVER_NAME"),temp);
+                        req.op_aset(context, runtime.newString("SERVER_PORT"),runtime.newString("80"));
                     }
                 }
 
                 req.setInstanceVariable("@http_body", RubyString.newString(runtime, new ByteList(hp.parser.buffer, at, length)));
-                req.aset(runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
-                req.aset(runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.1.5"));
+                req.op_aset(context, runtime.newString("SERVER_PROTOCOL"),runtime.newString("HTTP/1.1"));
+                req.op_aset(context, runtime.newString("SERVER_SOFTWARE"),runtime.newString("Mongrel 1.2.0.pre2"));
             }
         };
 
+    @JRubyMethod
     public IRubyObject initialize() {
         this.hp.parser.init();
         return this;
     }
 
+    @JRubyMethod
     public IRubyObject reset() {
         this.hp.parser.init();
         return runtime.getNil();
     }
 
+    @JRubyMethod
     public IRubyObject finish() {
         this.hp.finish();
         return this.hp.is_finished() ? runtime.getTrue() : runtime.getFalse();
     }
 
+    @JRubyMethod
     public IRubyObject execute(IRubyObject req_hash, IRubyObject data, IRubyObject start) {
         int from = 0;
         from = RubyNumeric.fix2int(start);
         ByteList d = ((RubyString)data).getByteList();
-        if(from >= d.realSize) {
+        if(from >= d.length()) {
             throw new RaiseException(runtime, eHttpParserError, "Requested start is after data buffer end.", true);
         } else {
             this.hp.parser.data = req_hash;
@@ -252,14 +224,17 @@ public class Http11 extends RubyObject {
         }
     }
 
+    @JRubyMethod(name = "error?")
     public IRubyObject has_error() {
         return this.hp.has_error() ? runtime.getTrue() : runtime.getFalse();
     }
 
+    @JRubyMethod(name = "finished?")
     public IRubyObject is_finished() {
         return this.hp.is_finished() ? runtime.getTrue() : runtime.getFalse();
     }
 
+    @JRubyMethod
     public IRubyObject nread() {
         return runtime.newFixnum(this.hp.parser.nread);
     }

data/ext/http11/org/jruby/mongrel/Http11Parser.java

@@ -0,0 +1,486 @@
+
+// line 1 "ext/http11/http11_parser.java.rl"
+package org.jruby.mongrel;
+
+import org.jruby.util.ByteList;
+
+public class Http11Parser {
+
+/** Machine **/
+
+
+// line 65 "ext/http11/http11_parser.java.rl"
+
+
+/** Data **/
+
+// line 18 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+private static byte[] init__http_parser_actions_0()
+{
+	return new byte [] {
+	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
+	    6,    1,    7,    1,    8,    1,    9,    1,   11,    1,   12,    1,
+	   13,    2,    0,    8,    2,    1,    2,    2,    4,    5,    2,   10,
+	    7,    2,   12,    7,    3,    9,   10,    7
+	};
+}
+
+private static final byte _http_parser_actions[] = init__http_parser_actions_0();
+
+
+private static short[] init__http_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
+	};
+}
+
+private static final short _http_parser_key_offsets[] = init__http_parser_key_offsets_0();
+
+
+private static char[] init__http_parser_trans_keys_0()
+{
+	return new char [] {
+	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
+	   46,   48,   57,   65,   90,   42,   43,   47,   58,   45,   57,   65,
+	   90,   97,  122,   32,   35,   72,   84,   84,   80,   47,   48,   57,
+	   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
+	};
+}
+
+private static final char _http_parser_trans_keys[] = init__http_parser_trans_keys_0();
+
+
+private static byte[] init__http_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
+	};
+}
+
+private static final byte _http_parser_single_lengths[] = init__http_parser_single_lengths_0();
+
+
+private static byte[] init__http_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
+	};
+}
+
+private static final byte _http_parser_range_lengths[] = init__http_parser_range_lengths_0();
+
+
+private static short[] init__http_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
+	};
+}
+
+private static final short _http_parser_index_offsets[] = init__http_parser_index_offsets_0();
+
+
+private static byte[] init__http_parser_indicies_0()
+{
+	return new byte [] {
+	    0,    0,    0,    0,    0,    1,    2,    3,    3,    3,    3,    3,
+	    1,    4,    5,    6,    7,    5,    5,    5,    1,    8,    9,    1,
+	   10,    1,   11,    1,   12,    1,   13,    1,   14,    1,   15,    1,
+	   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,
+	    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
+	};
+}
+
+private static final byte _http_parser_indicies[] = init__http_parser_indicies_0();
+
+
+private static byte[] init__http_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
+	};
+}
+
+private static final byte _http_parser_trans_targs[] = init__http_parser_trans_targs_0();
+
+
+private static byte[] init__http_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,
+	    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();
+
+
+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 http_parser_en_main = 1;
+
+
+// line 69 "ext/http11/http11_parser.java.rl"
+
+   public static interface ElementCB {
+     public void call(Object data, int at, int length);
+   }
+
+   public static interface FieldCB {
+     public void call(Object data, int field, int flen, int value, int vlen);
+   }
+
+   public static class HttpParser {
+      int cs;
+      int body_start;
+      int content_len;
+      int nread;
+      int mark;
+      int field_start;
+      int field_len;
+      int query_start;
+
+      Object 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/http11/org/jruby/mongrel/Http11Parser.java"
+	{
+	cs = http_parser_start;
+	}
+
+// line 104 "ext/http11/http11_parser.java.rl"
+
+          body_start = 0;
+          content_len = 0;
+          mark = 0;
+          nread = 0;
+          field_len = 0;
+          field_start = 0;
+      }
+   }
+
+   public final HttpParser parser = new HttpParser();
+
+   public int execute(ByteList buffer, int off) {
+     int p, pe;
+     int cs = parser.cs;
+     int len = buffer.length();
+     assert off<=len : "offset past end of buffer";
+
+     p = off;
+     pe = len;
+     byte[] data = buffer.unsafeBytes();
+     parser.buffer = buffer;
+
+     
+// line 270 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+	{
+	int _klen;
+	int _trans = 0;
+	int _acts;
+	int _nacts;
+	int _keys;
+	int _goto_targ = 0;
+
+	_goto: while (true) {
+	switch ( _goto_targ ) {
+	case 0:
+	if ( p == pe ) {
+		_goto_targ = 4;
+		continue _goto;
+	}
+	if ( cs == 0 ) {
+		_goto_targ = 5;
+		continue _goto;
+	}
+case 1:
+	_match: do {
+	_keys = _http_parser_key_offsets[cs];
+	_trans = _http_parser_index_offsets[cs];
+	_klen = _http_parser_single_lengths[cs];
+	if ( _klen > 0 ) {
+		int _lower = _keys;
+		int _mid;
+		int _upper = _keys + _klen - 1;
+		while (true) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( data[p] < _http_parser_trans_keys[_mid] )
+				_upper = _mid - 1;
+			else if ( data[p] > _http_parser_trans_keys[_mid] )
+				_lower = _mid + 1;
+			else {
+				_trans += (_mid - _keys);
+				break _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _http_parser_range_lengths[cs];
+	if ( _klen > 0 ) {
+		int _lower = _keys;
+		int _mid;
+		int _upper = _keys + (_klen<<1) - 2;
+		while (true) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( data[p] < _http_parser_trans_keys[_mid] )
+				_upper = _mid - 2;
+			else if ( data[p] > _http_parser_trans_keys[_mid+1] )
+				_lower = _mid + 2;
+			else {
+				_trans += ((_mid - _keys)>>1);
+				break _match;
+			}
+		}
+		_trans += _klen;
+	}
+	} while (false);
+
+	_trans = _http_parser_indicies[_trans];
+	cs = _http_parser_trans_targs[_trans];
+
+	if ( _http_parser_trans_actions[_trans] != 0 ) {
+		_acts = _http_parser_trans_actions[_trans];
+		_nacts = (int) _http_parser_actions[_acts++];
+		while ( _nacts-- > 0 )
+	{
+			switch ( _http_parser_actions[_acts++] )
+			{
+	case 0:
+// line 13 "ext/http11/http11_parser.java.rl"
+	{parser.mark = p; }
+	break;
+	case 1:
+// line 15 "ext/http11/http11_parser.java.rl"
+	{ parser.field_start = p; }
+	break;
+	case 2:
+// line 16 "ext/http11/http11_parser.java.rl"
+	{ /* FIXME stub */ }
+	break;
+	case 3:
+// line 17 "ext/http11/http11_parser.java.rl"
+	{ 
+    parser.field_len = p-parser.field_start;
+  }
+	break;
+	case 4:
+// line 21 "ext/http11/http11_parser.java.rl"
+	{ parser.mark = p; }
+	break;
+	case 5:
+// line 22 "ext/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);
+    }
+  }
+	break;
+	case 6:
+// line 27 "ext/http11/http11_parser.java.rl"
+	{ 
+    if(parser.request_method != null) 
+      parser.request_method.call(parser.data, parser.mark, p-parser.mark);
+  }
+	break;
+	case 7:
+// line 31 "ext/http11/http11_parser.java.rl"
+	{ 
+    if(parser.request_uri != null)
+      parser.request_uri.call(parser.data, parser.mark, p-parser.mark);
+  }
+	break;
+	case 8:
+// line 35 "ext/http11/http11_parser.java.rl"
+	{ 
+    if(parser.fragment != null)
+      parser.fragment.call(parser.data, parser.mark, p-parser.mark);
+  }
+	break;
+	case 9:
+// line 40 "ext/http11/http11_parser.java.rl"
+	{parser.query_start = p; }
+	break;
+	case 10:
+// line 41 "ext/http11/http11_parser.java.rl"
+	{ 
+    if(parser.query_string != null)
+      parser.query_string.call(parser.data, parser.query_start, p-parser.query_start);
+  }
+	break;
+	case 11:
+// line 46 "ext/http11/http11_parser.java.rl"
+	{	
+    if(parser.http_version != null)
+      parser.http_version.call(parser.data, parser.mark, p-parser.mark);
+  }
+	break;
+	case 12:
+// line 51 "ext/http11/http11_parser.java.rl"
+	{
+    if(parser.request_path != null)
+      parser.request_path.call(parser.data, parser.mark, p-parser.mark);
+  }
+	break;
+	case 13:
+// line 56 "ext/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);
+    { p += 1; _goto_targ = 5; if (true)  continue _goto;}
+  }
+	break;
+// line 435 "ext/http11/org/jruby/mongrel/Http11Parser.java"
+			}
+		}
+	}
+
+case 2:
+	if ( cs == 0 ) {
+		_goto_targ = 5;
+		continue _goto;
+	}
+	if ( ++p != pe ) {
+		_goto_targ = 1;
+		continue _goto;
+	}
+case 4:
+case 5:
+	}
+	break; }
+	}
+
+// line 128 "ext/http11/http11_parser.java.rl"
+
+     parser.cs = cs;
+     parser.nread += (p - 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";
+
+     return parser.nread;
+   }
+
+   public int finish() {
+    if(has_error()) {
+      return -1;
+    } else if(is_finished()) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }
+
+  public boolean has_error() {
+    return parser.cs == http_parser_error;
+  }
+
+  public boolean is_finished() {
+    return parser.cs == http_parser_first_final;
+  }
+}