mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
restore machine actions
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@674 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
parent
6d91530c8d
commit
594f6fe42c
3 changed files with 109 additions and 52 deletions
|
@ -15,6 +15,62 @@
|
|||
|
||||
/** Machine **/
|
||||
|
||||
%%{
|
||||
|
||||
machine http_parser;
|
||||
|
||||
action mark {MARK(mark, fpc); }
|
||||
|
||||
|
||||
action start_field { MARK(field_start, fpc); }
|
||||
action write_field {
|
||||
parser->field_len = LEN(field_start, fpc);
|
||||
}
|
||||
|
||||
action start_value { MARK(mark, fpc); }
|
||||
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));
|
||||
}
|
||||
}
|
||||
action request_method {
|
||||
if(parser->request_method != NULL)
|
||||
parser->request_method(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
action request_uri {
|
||||
if(parser->request_uri != NULL)
|
||||
parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
action fragment {
|
||||
if(parser->fragment != NULL)
|
||||
parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
|
||||
action start_query {MARK(query_start, fpc); }
|
||||
action query_string {
|
||||
if(parser->query_string != NULL)
|
||||
parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, fpc));
|
||||
}
|
||||
|
||||
action http_version {
|
||||
if(parser->http_version != NULL)
|
||||
parser->http_version(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
|
||||
action request_path {
|
||||
if(parser->request_path != NULL)
|
||||
parser->request_path(parser->data, PTR_TO(mark), LEN(mark,fpc));
|
||||
}
|
||||
|
||||
action done {
|
||||
parser->body_start = fpc - buffer + 1;
|
||||
if(parser->header_done != NULL)
|
||||
parser->header_done(parser->data, fpc + 1, pe - fpc - 1);
|
||||
fbreak;
|
||||
}
|
||||
|
||||
}%%
|
||||
|
||||
/** Data **/
|
||||
%% write data;
|
||||
|
||||
|
|
|
@ -1,57 +1,7 @@
|
|||
%%{
|
||||
|
||||
machine http_parser;
|
||||
|
||||
action mark {MARK(mark, fpc); }
|
||||
|
||||
|
||||
action start_field { MARK(field_start, fpc); }
|
||||
action write_field {
|
||||
parser->field_len = LEN(field_start, fpc);
|
||||
}
|
||||
|
||||
action start_value { MARK(mark, fpc); }
|
||||
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));
|
||||
}
|
||||
}
|
||||
action request_method {
|
||||
if(parser->request_method != NULL)
|
||||
parser->request_method(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
action request_uri {
|
||||
if(parser->request_uri != NULL)
|
||||
parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
action fragment {
|
||||
if(parser->fragment != NULL)
|
||||
parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
|
||||
action start_query {MARK(query_start, fpc); }
|
||||
action query_string {
|
||||
if(parser->query_string != NULL)
|
||||
parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, fpc));
|
||||
}
|
||||
|
||||
action http_version {
|
||||
if(parser->http_version != NULL)
|
||||
parser->http_version(parser->data, PTR_TO(mark), LEN(mark, fpc));
|
||||
}
|
||||
|
||||
action request_path {
|
||||
if(parser->request_path != NULL)
|
||||
parser->request_path(parser->data, PTR_TO(mark), LEN(mark,fpc));
|
||||
}
|
||||
|
||||
action done {
|
||||
parser->body_start = fpc - buffer + 1;
|
||||
if(parser->header_done != NULL)
|
||||
parser->header_done(parser->data, fpc + 1, pe - fpc - 1);
|
||||
fbreak;
|
||||
}
|
||||
|
||||
|
||||
#### HTTP PROTOCOL GRAMMAR
|
||||
# line endings
|
||||
CRLF = "\r\n";
|
||||
|
|
|
@ -3,9 +3,60 @@ package org.jruby.mongrel;
|
|||
import org.jruby.util.ByteList;
|
||||
|
||||
public class Http11Parser {
|
||||
|
||||
|
||||
/** Machine **/
|
||||
|
||||
%%{
|
||||
|
||||
machine http_parser;
|
||||
|
||||
action mark {parser.mark = fpc; }
|
||||
|
||||
action start_field { parser.field_start = fpc; }
|
||||
action write_field {
|
||||
parser.field_len = fpc-parser.field_start;
|
||||
}
|
||||
|
||||
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 request_method {
|
||||
if(parser.request_method != null)
|
||||
parser.request_method.call(parser.data, 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 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 http_version {
|
||||
if(parser.http_version != null)
|
||||
parser.http_version.call(parser.data, parser.mark, fpc-parser.mark);
|
||||
}
|
||||
|
||||
action request_path {
|
||||
if(parser.request_path != null)
|
||||
parser.request_path.call(parser.data, 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);
|
||||
fbreak;
|
||||
}
|
||||
|
||||
}%%
|
||||
|
||||
/** Data **/
|
||||
%% write data;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue