kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Merge branch 'jruby_optz' of https://github.com/headius/puma into headius-jruby_optz

Browse source
This commit is contained in:
Nate Berkopec 2019-10-07 15:29:57 +02:00
commit 895722ddc2
No known key found for this signature in database
GPG key ID: BDD7A4B8E43906A6
4 changed files with 212 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
History.md
View file

@ -1,5 +1,6 @@
* Features
* Strip whitespace at end of HTTP headers (#2010)
* Optimize HTTP parser for JRuby (#2012)
* Bugfixes
* Your bugfix goes here (#Github Number)

58
ext/puma_http11/http11_parser.java.rl
View file

@ -1,5 +1,7 @@
package org.jruby.puma;
import org.jruby.Ruby;
import org.jruby.RubyHash;
import org.jruby.util.ByteList;
public class Http11Parser {
@ -19,44 +21,35 @@ public class Http11Parser {
}
action start_value { parser.mark = fpc; }
action write_value {
if(parser.http_field != null) {
parser.http_field.call(parser.data, parser.field_start, parser.field_len, parser.mark, fpc-parser.mark);
}
action write_value {
Http11.http_field(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, fpc-parser.mark);
}
action request_method {
if(parser.request_method != null)
parser.request_method.call(parser.data, parser.mark, fpc-parser.mark);
action request_method {
Http11.request_method(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
}
action request_uri {
if(parser.request_uri != null)
parser.request_uri.call(parser.data, parser.mark, fpc-parser.mark);
action request_uri {
Http11.request_uri(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
}
action fragment {
if(parser.fragment != null)
parser.fragment.call(parser.data, parser.mark, fpc-parser.mark);
action fragment {
Http11.fragment(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
}
action start_query {parser.query_start = fpc; }
action query_string {
if(parser.query_string != null)
parser.query_string.call(parser.data, parser.query_start, fpc-parser.query_start);
action query_string {
Http11.query_string(runtime, parser.data, parser.buffer, parser.query_start, fpc-parser.query_start);
}
action http_version {
if(parser.http_version != null)
parser.http_version.call(parser.data, parser.mark, fpc-parser.mark);
action http_version {
Http11.http_version(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
}
action request_path {
if(parser.request_path != null)
parser.request_path.call(parser.data, parser.mark, fpc-parser.mark);
Http11.request_path(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
}
action done {
parser.body_start = fpc + 1;
if(parser.header_done != null)
parser.header_done.call(parser.data, fpc + 1, pe - fpc - 1);
parser.body_start = fpc + 1;
http.header_done(runtime, parser.data, parser.buffer, fpc + 1, pe - fpc - 1);
fbreak;
}
@ -68,11 +61,11 @@ public class Http11Parser {
%% write data;
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 {
@ -85,18 +78,9 @@ public class Http11Parser {
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;
@ -113,7 +97,7 @@ public class Http11Parser {
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();

210
ext/puma_http11/org/jruby/puma/Http11.java
View file

@ -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;
@ -37,6 +37,16 @@ public class Http11 extends RubyObject {
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,131 +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 f;
IRubyObject v;
validateMaxLength(flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
validateMaxLength(vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
private static RaiseException newHTTPParserError(Ruby runtime, String msg) {
return runtime.newRaiseException(getHTTPParserError(runtime), msg);
}
ByteList buffer = Http11.this.hp.parser.buffer;
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");
}
ByteList b = new ByteList(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)));
}
}
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);
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);
}
while (vlen > 0 && Character.isWhitespace(buffer.get(value + vlen - 1))) vlen--;
b = new ByteList(buffer, value, vlen);
v = req.op_aref(req.getRuntime().getCurrentContext(), f);
if (v.isNil()) {
req.op_aset(req.getRuntime().getCurrentContext(), f, RubyString.newString(runtime, b));
} else {
RubyString vs = v.convertToString();
vs.cat(RubyString.newString(runtime, ", "));
vs.cat(b);
}
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 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);
}
};
while (vlen > 0 && Character.isWhitespace(buffer.get(value + vlen - 1))) vlen--;
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);
}
};
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);
}
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);
}
};
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);
}
}
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);
}
};
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);
}
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);
}
};
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);
}
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 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);
}
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));
}
};
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() {
@ -199,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.");
} else {
return runtime.newFixnum(this.hp.parser.nread);
return runtime.newFixnum(parser.nread);
}
}
}
@ -230,7 +218,7 @@ public class Http11 extends RubyObject {
public IRubyObject nread() {
return runtime.newFixnum(this.hp.parser.nread);
}
@JRubyMethod
public IRubyObject body() {
return body;

197
ext/puma_http11/org/jruby/puma/Http11Parser.java
View file

@ -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,12 +11,12 @@ 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"
// line 20 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
private static byte[] init__puma_parser_actions_0()
{
return new byte [] {
@ -33,8 +35,8 @@ 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, 89, 97, 107,
115, 125, 134, 142, 150, 159, 168, 177, 186, 195, 204, 213,
222, 231, 240, 249, 258, 267, 276, 285, 294, 303, 312, 313
115, 124, 132, 140, 149, 158, 167, 176, 185, 194, 203, 212,
221, 230, 239, 248, 257, 266, 275, 284, 293, 302, 303
};
}
@ -53,24 +55,23 @@ private static char[] init__puma_parser_trans_keys_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, 59, 60,
62, 63, 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
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
};
}
@ -82,8 +83,8 @@ 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, 4, 4, 2, 6,
8, 7, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0
7, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0
};
}
@ -95,8 +96,8 @@ 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, 4, 1,
1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0
1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0
};
}
@ -108,8 +109,8 @@ 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, 82, 89, 96,
104, 114, 123, 131, 139, 146, 153, 160, 167, 174, 181, 188,
195, 202, 209, 216, 223, 230, 237, 244, 251, 258, 265, 267
104, 113, 121, 129, 136, 143, 150, 157, 164, 171, 178, 185,
192, 199, 206, 213, 220, 227, 234, 241, 248, 255, 257
};
}
@ -127,21 +128,20 @@ private static byte[] init__puma_parser_indicies_0()
24, 23, 23, 23, 23, 23, 23, 23, 23, 1, 26, 27,
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, 39,
1, 1, 40, 1, 1, 37, 8, 1, 9, 1, 1, 42,
1, 1, 41, 43, 1, 45, 1, 1, 1, 1, 44, 46,
1, 48, 1, 1, 1, 1, 47, 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, 1, 1, 0
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, 1, 1, 0
};
}
@ -151,12 +151,12 @@ private static final byte _puma_parser_indicies[] = init__puma_parser_indicies_0
private static byte[] init__puma_parser_trans_targs_0()
{
return new byte [] {
2, 0, 3, 28, 4, 22, 24, 23, 5, 20, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 47, 17,
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, 26, 25, 26, 5, 27, 20, 5, 27,
20, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46
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
};
}
@ -169,9 +169,9 @@ private static byte[] init__puma_parser_trans_actions_0()
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, 15, 0, 0, 0,
37, 0, 37, 21, 21, 0, 0, 40, 17, 40, 34, 0,
34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 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
};
}
@ -179,17 +179,20 @@ private static final byte _puma_parser_trans_actions[] = init__puma_parser_trans
static final int puma_parser_start = 1;
static final int puma_parser_first_final = 47;
static final int puma_parser_first_final = 46;
static final int puma_parser_error = 0;
// line 69 "ext/puma_http11/http11_parser.java.rl"
static final int puma_parser_en_main = 1;
// 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 {
@ -202,28 +205,19 @@ static final int puma_parser_error = 0;
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 225 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
// line 218 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
{
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;
@ -236,7 +230,7 @@ static final int puma_parser_error = 0;
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();
@ -249,8 +243,8 @@ static final int puma_parser_error = 0;
byte[] data = buffer.bytes();
parser.buffer = buffer;
// line 257 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
// line 250 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
{
int _klen;
int _trans = 0;
@ -331,91 +325,82 @@ case 1:
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"
// line 24 "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);
}
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"
// line 30 "ext/puma_http11/http11_parser.java.rl"
{
if(parser.request_uri != null)
parser.request_uri.call(parser.data, parser.mark, p-parser.mark);
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"
// line 33 "ext/puma_http11/http11_parser.java.rl"
{
if(parser.fragment != null)
parser.fragment.call(parser.data, parser.mark, p-parser.mark);
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"
// line 38 "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);
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"
// line 42 "ext/puma_http11/http11_parser.java.rl"
{
if(parser.http_version != null)
parser.http_version.call(parser.data, parser.mark, p-parser.mark);
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);
http.header_done(runtime, parser.data, parser.buffer, p + 1, pe - p - 1);
{ p += 1; _goto_targ = 5; if (true) continue _goto;}
}
break;
// line 422 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
// line 406 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
}
}
}
@ -435,11 +420,11 @@ 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);
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";