puma 3.12.1 → 5.3.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puma might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/History.md +1414 -448
- data/LICENSE +23 -20
- data/README.md +131 -60
- data/bin/puma-wild +3 -9
- data/docs/architecture.md +24 -19
- data/docs/compile_options.md +19 -0
- data/docs/deployment.md +38 -13
- data/docs/fork_worker.md +33 -0
- data/docs/jungle/README.md +9 -0
- data/{tools → docs}/jungle/rc.d/README.md +1 -1
- data/{tools → docs}/jungle/rc.d/puma +2 -2
- data/{tools → docs}/jungle/rc.d/puma.conf +0 -0
- data/docs/kubernetes.md +66 -0
- data/docs/nginx.md +1 -1
- data/docs/plugins.md +20 -10
- data/docs/rails_dev_mode.md +29 -0
- data/docs/restart.md +47 -22
- data/docs/signals.md +7 -6
- data/docs/stats.md +142 -0
- data/docs/systemd.md +48 -70
- data/ext/puma_http11/PumaHttp11Service.java +2 -2
- data/ext/puma_http11/ext_help.h +1 -1
- data/ext/puma_http11/extconf.rb +27 -0
- data/ext/puma_http11/http11_parser.c +84 -109
- data/ext/puma_http11/http11_parser.h +1 -1
- data/ext/puma_http11/http11_parser.java.rl +22 -38
- data/ext/puma_http11/http11_parser.rl +4 -2
- data/ext/puma_http11/http11_parser_common.rl +3 -3
- data/ext/puma_http11/mini_ssl.c +254 -91
- data/ext/puma_http11/no_ssl/PumaHttp11Service.java +15 -0
- data/ext/puma_http11/org/jruby/puma/Http11.java +108 -116
- data/ext/puma_http11/org/jruby/puma/Http11Parser.java +89 -106
- data/ext/puma_http11/org/jruby/puma/MiniSSL.java +92 -22
- data/ext/puma_http11/puma_http11.c +34 -50
- data/lib/puma.rb +54 -0
- data/lib/puma/app/status.rb +68 -49
- data/lib/puma/binder.rb +191 -139
- data/lib/puma/cli.rb +15 -15
- data/lib/puma/client.rb +257 -228
- data/lib/puma/cluster.rb +221 -212
- data/lib/puma/cluster/worker.rb +183 -0
- data/lib/puma/cluster/worker_handle.rb +90 -0
- data/lib/puma/commonlogger.rb +2 -2
- data/lib/puma/configuration.rb +58 -51
- data/lib/puma/const.rb +39 -19
- data/lib/puma/control_cli.rb +109 -67
- data/lib/puma/detect.rb +24 -3
- data/lib/puma/dsl.rb +519 -121
- data/lib/puma/error_logger.rb +104 -0
- data/lib/puma/events.rb +55 -31
- data/lib/puma/io_buffer.rb +7 -5
- data/lib/puma/jruby_restart.rb +0 -58
- data/lib/puma/json.rb +96 -0
- data/lib/puma/launcher.rb +178 -68
- data/lib/puma/minissl.rb +147 -48
- data/lib/puma/minissl/context_builder.rb +79 -0
- data/lib/puma/null_io.rb +13 -1
- data/lib/puma/plugin.rb +6 -12
- data/lib/puma/plugin/tmp_restart.rb +2 -0
- data/lib/puma/queue_close.rb +26 -0
- data/lib/puma/rack/builder.rb +2 -4
- data/lib/puma/rack/urlmap.rb +2 -0
- data/lib/puma/rack_default.rb +2 -0
- data/lib/puma/reactor.rb +85 -316
- data/lib/puma/request.rb +467 -0
- data/lib/puma/runner.rb +31 -52
- data/lib/puma/server.rb +282 -680
- data/lib/puma/single.rb +11 -67
- data/lib/puma/state_file.rb +8 -3
- data/lib/puma/systemd.rb +46 -0
- data/lib/puma/thread_pool.rb +129 -81
- data/lib/puma/util.rb +13 -6
- data/lib/rack/handler/puma.rb +5 -6
- data/tools/Dockerfile +16 -0
- data/tools/trickletest.rb +0 -1
- metadata +42 -26
- data/ext/puma_http11/io_buffer.c +0 -155
- data/lib/puma/accept_nonblock.rb +0 -23
- data/lib/puma/compat.rb +0 -14
- data/lib/puma/convenient.rb +0 -25
- data/lib/puma/daemon_ext.rb +0 -33
- data/lib/puma/delegation.rb +0 -13
- data/lib/puma/java_io_buffer.rb +0 -47
- data/lib/puma/rack/backports/uri/common_193.rb +0 -33
- data/lib/puma/tcp_logger.rb +0 -41
- data/tools/jungle/README.md +0 -19
- data/tools/jungle/init.d/README.md +0 -61
- data/tools/jungle/init.d/puma +0 -421
- data/tools/jungle/init.d/run-puma +0 -18
- data/tools/jungle/upstart/README.md +0 -61
- data/tools/jungle/upstart/puma-manager.conf +0 -31
- data/tools/jungle/upstart/puma.conf +0 -69
@@ -0,0 +1,15 @@
|
|
1
|
+
package puma;
|
2
|
+
|
3
|
+
import java.io.IOException;
|
4
|
+
|
5
|
+
import org.jruby.Ruby;
|
6
|
+
import org.jruby.runtime.load.BasicLibraryService;
|
7
|
+
|
8
|
+
import org.jruby.puma.Http11;
|
9
|
+
|
10
|
+
public class PumaHttp11Service implements BasicLibraryService {
|
11
|
+
public boolean basicLoad(final Ruby runtime) throws IOException {
|
12
|
+
Http11.createHttp11(runtime);
|
13
|
+
return true;
|
14
|
+
}
|
15
|
+
}
|
@@ -11,7 +11,6 @@ import org.jruby.RubyString;
|
|
11
11
|
import org.jruby.anno.JRubyMethod;
|
12
12
|
|
13
13
|
import org.jruby.runtime.ObjectAllocator;
|
14
|
-
import org.jruby.runtime.ThreadContext;
|
15
14
|
import org.jruby.runtime.builtin.IRubyObject;
|
16
15
|
|
17
16
|
import org.jruby.exceptions.RaiseException;
|
@@ -20,6 +19,7 @@ import org.jruby.util.ByteList;
|
|
20
19
|
|
21
20
|
/**
|
22
21
|
* @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
|
22
|
+
* @author <a href="mailto:headius@headius.com">Charles Oliver Nutter</a>
|
23
23
|
*/
|
24
24
|
public class Http11 extends RubyObject {
|
25
25
|
public final static int MAX_FIELD_NAME_LENGTH = 256;
|
@@ -30,13 +30,23 @@ public class Http11 extends RubyObject {
|
|
30
30
|
public final static String MAX_REQUEST_URI_LENGTH_ERR = "HTTP element REQUEST_URI is longer than the 12288 allowed length.";
|
31
31
|
public final static int MAX_FRAGMENT_LENGTH = 1024;
|
32
32
|
public final static String MAX_FRAGMENT_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 1024 allowed length.";
|
33
|
-
public final static int MAX_REQUEST_PATH_LENGTH =
|
34
|
-
public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the
|
33
|
+
public final static int MAX_REQUEST_PATH_LENGTH = 8192;
|
34
|
+
public final static String MAX_REQUEST_PATH_LENGTH_ERR = "HTTP element REQUEST_PATH is longer than the 8192 allowed length.";
|
35
35
|
public final static int MAX_QUERY_STRING_LENGTH = 1024 * 10;
|
36
36
|
public final static String MAX_QUERY_STRING_LENGTH_ERR = "HTTP element QUERY_STRING is longer than the 10240 allowed length.";
|
37
37
|
public final static int MAX_HEADER_LENGTH = 1024 * (80 + 32);
|
38
38
|
public final static String MAX_HEADER_LENGTH_ERR = "HTTP element HEADER is longer than the 114688 allowed length.";
|
39
39
|
|
40
|
+
public static final ByteList CONTENT_TYPE_BYTELIST = new ByteList(ByteList.plain("CONTENT_TYPE"));
|
41
|
+
public static final ByteList CONTENT_LENGTH_BYTELIST = new ByteList(ByteList.plain("CONTENT_LENGTH"));
|
42
|
+
public static final ByteList HTTP_PREFIX_BYTELIST = new ByteList(ByteList.plain("HTTP_"));
|
43
|
+
public static final ByteList COMMA_SPACE_BYTELIST = new ByteList(ByteList.plain(", "));
|
44
|
+
public static final ByteList REQUEST_METHOD_BYTELIST = new ByteList(ByteList.plain("REQUEST_METHOD"));
|
45
|
+
public static final ByteList REQUEST_URI_BYTELIST = new ByteList(ByteList.plain("REQUEST_URI"));
|
46
|
+
public static final ByteList FRAGMENT_BYTELIST = new ByteList(ByteList.plain("FRAGMENT"));
|
47
|
+
public static final ByteList REQUEST_PATH_BYTELIST = new ByteList(ByteList.plain("REQUEST_PATH"));
|
48
|
+
public static final ByteList QUERY_STRING_BYTELIST = new ByteList(ByteList.plain("QUERY_STRING"));
|
49
|
+
public static final ByteList HTTP_VERSION_BYTELIST = new ByteList(ByteList.plain("HTTP_VERSION"));
|
40
50
|
|
41
51
|
private static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
|
42
52
|
public IRubyObject allocate(Ruby runtime, RubyClass klass) {
|
@@ -53,127 +63,104 @@ public class Http11 extends RubyObject {
|
|
53
63
|
}
|
54
64
|
|
55
65
|
private Ruby runtime;
|
56
|
-
private RubyClass eHttpParserError;
|
57
66
|
private Http11Parser hp;
|
58
67
|
private RubyString body;
|
59
68
|
|
60
69
|
public Http11(Ruby runtime, RubyClass clazz) {
|
61
70
|
super(runtime,clazz);
|
62
71
|
this.runtime = runtime;
|
63
|
-
this.eHttpParserError = (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError");
|
64
72
|
this.hp = new Http11Parser();
|
65
|
-
this.hp.parser.http_field = http_field;
|
66
|
-
this.hp.parser.request_method = request_method;
|
67
|
-
this.hp.parser.request_uri = request_uri;
|
68
|
-
this.hp.parser.fragment = fragment;
|
69
|
-
this.hp.parser.request_path = request_path;
|
70
|
-
this.hp.parser.query_string = query_string;
|
71
|
-
this.hp.parser.http_version = http_version;
|
72
|
-
this.hp.parser.header_done = header_done;
|
73
73
|
this.hp.parser.init();
|
74
74
|
}
|
75
75
|
|
76
|
-
public void validateMaxLength(int len, int max, String msg) {
|
76
|
+
public static void validateMaxLength(Ruby runtime, int len, int max, String msg) {
|
77
77
|
if(len>max) {
|
78
|
-
throw
|
78
|
+
throw newHTTPParserError(runtime, msg);
|
79
79
|
}
|
80
80
|
}
|
81
81
|
|
82
|
-
private
|
83
|
-
|
84
|
-
|
85
|
-
RubyString f;
|
86
|
-
IRubyObject v;
|
87
|
-
validateMaxLength(flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
|
88
|
-
validateMaxLength(vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
|
89
|
-
|
90
|
-
ByteList b = new ByteList(Http11.this.hp.parser.buffer,field,flen);
|
91
|
-
for(int i = 0,j = b.length();i<j;i++) {
|
92
|
-
if((b.get(i) & 0xFF) == '-') {
|
93
|
-
b.set(i, (byte)'_');
|
94
|
-
} else {
|
95
|
-
b.set(i, (byte)Character.toUpperCase((char)b.get(i)));
|
96
|
-
}
|
97
|
-
}
|
98
|
-
|
99
|
-
String as = b.toString();
|
100
|
-
|
101
|
-
if(as.equals("CONTENT_LENGTH") || as.equals("CONTENT_TYPE")) {
|
102
|
-
f = RubyString.newString(runtime, b);
|
103
|
-
} else {
|
104
|
-
f = RubyString.newString(runtime, "HTTP_");
|
105
|
-
f.cat(b);
|
106
|
-
}
|
107
|
-
|
108
|
-
b = new ByteList(Http11.this.hp.parser.buffer, value, vlen);
|
109
|
-
v = req.op_aref(req.getRuntime().getCurrentContext(), f);
|
110
|
-
if (v.isNil()) {
|
111
|
-
req.op_aset(req.getRuntime().getCurrentContext(), f, RubyString.newString(runtime, b));
|
112
|
-
} else {
|
113
|
-
RubyString vs = v.convertToString();
|
114
|
-
vs.cat(RubyString.newString(runtime, ", "));
|
115
|
-
vs.cat(b);
|
116
|
-
}
|
117
|
-
}
|
118
|
-
};
|
82
|
+
private static RaiseException newHTTPParserError(Ruby runtime, String msg) {
|
83
|
+
return runtime.newRaiseException(getHTTPParserError(runtime), msg);
|
84
|
+
}
|
119
85
|
|
120
|
-
private
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_METHOD"),val);
|
125
|
-
}
|
126
|
-
};
|
127
|
-
|
128
|
-
private Http11Parser.ElementCB request_uri = new Http11Parser.ElementCB() {
|
129
|
-
public void call(Object data, int at, int length) {
|
130
|
-
RubyHash req = (RubyHash)data;
|
131
|
-
validateMaxLength(length, MAX_REQUEST_URI_LENGTH, MAX_REQUEST_URI_LENGTH_ERR);
|
132
|
-
RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
|
133
|
-
req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_URI"),val);
|
134
|
-
}
|
135
|
-
};
|
136
|
-
|
137
|
-
private Http11Parser.ElementCB fragment = new Http11Parser.ElementCB() {
|
138
|
-
public void call(Object data, int at, int length) {
|
139
|
-
RubyHash req = (RubyHash)data;
|
140
|
-
validateMaxLength(length, MAX_FRAGMENT_LENGTH, MAX_FRAGMENT_LENGTH_ERR);
|
141
|
-
RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
|
142
|
-
req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("FRAGMENT"),val);
|
143
|
-
}
|
144
|
-
};
|
145
|
-
|
146
|
-
private Http11Parser.ElementCB request_path = new Http11Parser.ElementCB() {
|
147
|
-
public void call(Object data, int at, int length) {
|
148
|
-
RubyHash req = (RubyHash)data;
|
149
|
-
validateMaxLength(length, MAX_REQUEST_PATH_LENGTH, MAX_REQUEST_PATH_LENGTH_ERR);
|
150
|
-
RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
|
151
|
-
req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("REQUEST_PATH"),val);
|
152
|
-
}
|
153
|
-
};
|
154
|
-
|
155
|
-
private Http11Parser.ElementCB query_string = new Http11Parser.ElementCB() {
|
156
|
-
public void call(Object data, int at, int length) {
|
157
|
-
RubyHash req = (RubyHash)data;
|
158
|
-
validateMaxLength(length, MAX_QUERY_STRING_LENGTH, MAX_QUERY_STRING_LENGTH_ERR);
|
159
|
-
RubyString val = RubyString.newString(runtime,new ByteList(hp.parser.buffer,at,length));
|
160
|
-
req.op_aset(req.getRuntime().getCurrentContext(), runtime.newString("QUERY_STRING"),val);
|
161
|
-
}
|
162
|
-
};
|
86
|
+
private static RubyClass getHTTPParserError(Ruby runtime) {
|
87
|
+
// Cheaper to look this up lazily than cache eagerly and consume a field, since it's rarely encountered
|
88
|
+
return (RubyClass)runtime.getModule("Puma").getConstant("HttpParserError");
|
89
|
+
}
|
163
90
|
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
91
|
+
public static void http_field(Ruby runtime, RubyHash req, ByteList buffer, int field, int flen, int value, int vlen) {
|
92
|
+
RubyString f;
|
93
|
+
IRubyObject v;
|
94
|
+
validateMaxLength(runtime, flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
|
95
|
+
validateMaxLength(runtime, vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
|
96
|
+
|
97
|
+
ByteList b = new ByteList(buffer,field,flen);
|
98
|
+
for(int i = 0,j = b.length();i<j;i++) {
|
99
|
+
int bite = b.get(i) & 0xFF;
|
100
|
+
if(bite == '-') {
|
101
|
+
b.set(i, (byte)'_');
|
102
|
+
} else {
|
103
|
+
b.set(i, (byte)Character.toUpperCase(bite));
|
169
104
|
}
|
170
|
-
}
|
105
|
+
}
|
171
106
|
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
}
|
107
|
+
while (vlen > 0 && Character.isWhitespace(buffer.get(value + vlen - 1))) vlen--;
|
108
|
+
|
109
|
+
if (b.equals(CONTENT_LENGTH_BYTELIST) || b.equals(CONTENT_TYPE_BYTELIST)) {
|
110
|
+
f = RubyString.newString(runtime, b);
|
111
|
+
} else {
|
112
|
+
f = RubyString.newStringShared(runtime, HTTP_PREFIX_BYTELIST);
|
113
|
+
f.cat(b);
|
114
|
+
}
|
115
|
+
|
116
|
+
b = new ByteList(buffer, value, vlen);
|
117
|
+
v = req.fastARef(f);
|
118
|
+
if (v == null || v.isNil()) {
|
119
|
+
req.fastASet(f, RubyString.newString(runtime, b));
|
120
|
+
} else {
|
121
|
+
RubyString vs = v.convertToString();
|
122
|
+
vs.cat(COMMA_SPACE_BYTELIST);
|
123
|
+
vs.cat(b);
|
124
|
+
}
|
125
|
+
}
|
126
|
+
|
127
|
+
public static void request_method(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
128
|
+
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
|
129
|
+
req.fastASet(RubyString.newStringShared(runtime, REQUEST_METHOD_BYTELIST),val);
|
130
|
+
}
|
131
|
+
|
132
|
+
public static void request_uri(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
133
|
+
validateMaxLength(runtime, length, MAX_REQUEST_URI_LENGTH, MAX_REQUEST_URI_LENGTH_ERR);
|
134
|
+
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
|
135
|
+
req.fastASet(RubyString.newStringShared(runtime, REQUEST_URI_BYTELIST),val);
|
136
|
+
}
|
137
|
+
|
138
|
+
public static void fragment(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
139
|
+
validateMaxLength(runtime, length, MAX_FRAGMENT_LENGTH, MAX_FRAGMENT_LENGTH_ERR);
|
140
|
+
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
|
141
|
+
req.fastASet(RubyString.newStringShared(runtime, FRAGMENT_BYTELIST),val);
|
142
|
+
}
|
143
|
+
|
144
|
+
public static void request_path(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
145
|
+
validateMaxLength(runtime, length, MAX_REQUEST_PATH_LENGTH, MAX_REQUEST_PATH_LENGTH_ERR);
|
146
|
+
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
|
147
|
+
req.fastASet(RubyString.newStringShared(runtime, REQUEST_PATH_BYTELIST),val);
|
148
|
+
}
|
149
|
+
|
150
|
+
public static void query_string(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
151
|
+
validateMaxLength(runtime, length, MAX_QUERY_STRING_LENGTH, MAX_QUERY_STRING_LENGTH_ERR);
|
152
|
+
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
|
153
|
+
req.fastASet(RubyString.newStringShared(runtime, QUERY_STRING_BYTELIST),val);
|
154
|
+
}
|
155
|
+
|
156
|
+
public static void http_version(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
157
|
+
RubyString val = RubyString.newString(runtime,new ByteList(buffer,at,length));
|
158
|
+
req.fastASet(RubyString.newStringShared(runtime, HTTP_VERSION_BYTELIST),val);
|
159
|
+
}
|
160
|
+
|
161
|
+
public void header_done(Ruby runtime, RubyHash req, ByteList buffer, int at, int length) {
|
162
|
+
body = RubyString.newStringShared(runtime, new ByteList(buffer, at, length));
|
163
|
+
}
|
177
164
|
|
178
165
|
@JRubyMethod
|
179
166
|
public IRubyObject initialize() {
|
@@ -195,19 +182,24 @@ public class Http11 extends RubyObject {
|
|
195
182
|
|
196
183
|
@JRubyMethod
|
197
184
|
public IRubyObject execute(IRubyObject req_hash, IRubyObject data, IRubyObject start) {
|
198
|
-
int from =
|
199
|
-
from = RubyNumeric.fix2int(start);
|
185
|
+
int from = RubyNumeric.fix2int(start);
|
200
186
|
ByteList d = ((RubyString)data).getByteList();
|
201
187
|
if(from >= d.length()) {
|
202
|
-
throw
|
188
|
+
throw newHTTPParserError(runtime, "Requested start is after data buffer end.");
|
203
189
|
} else {
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
190
|
+
Http11Parser hp = this.hp;
|
191
|
+
Http11Parser.HttpParser parser = hp.parser;
|
192
|
+
|
193
|
+
parser.data = (RubyHash) req_hash;
|
194
|
+
|
195
|
+
hp.execute(runtime, this, d,from);
|
196
|
+
|
197
|
+
validateMaxLength(runtime, parser.nread,MAX_HEADER_LENGTH, MAX_HEADER_LENGTH_ERR);
|
198
|
+
|
199
|
+
if(hp.has_error()) {
|
200
|
+
throw newHTTPParserError(runtime, "Invalid HTTP format, parsing fails. Are you trying to open an SSL connection to a non-SSL Puma?");
|
209
201
|
} else {
|
210
|
-
return runtime.newFixnum(
|
202
|
+
return runtime.newFixnum(parser.nread);
|
211
203
|
}
|
212
204
|
}
|
213
205
|
}
|
@@ -226,7 +218,7 @@ public class Http11 extends RubyObject {
|
|
226
218
|
public IRubyObject nread() {
|
227
219
|
return runtime.newFixnum(this.hp.parser.nread);
|
228
220
|
}
|
229
|
-
|
221
|
+
|
230
222
|
@JRubyMethod
|
231
223
|
public IRubyObject body() {
|
232
224
|
return body;
|
@@ -2,6 +2,8 @@
|
|
2
2
|
// line 1 "ext/puma_http11/http11_parser.java.rl"
|
3
3
|
package org.jruby.puma;
|
4
4
|
|
5
|
+
import org.jruby.Ruby;
|
6
|
+
import org.jruby.RubyHash;
|
5
7
|
import org.jruby.util.ByteList;
|
6
8
|
|
7
9
|
public class Http11Parser {
|
@@ -9,12 +11,12 @@ public class Http11Parser {
|
|
9
11
|
/** Machine **/
|
10
12
|
|
11
13
|
|
12
|
-
// line
|
14
|
+
// line 58 "ext/puma_http11/http11_parser.java.rl"
|
13
15
|
|
14
16
|
|
15
17
|
/** Data **/
|
16
18
|
|
17
|
-
// line
|
19
|
+
// line 20 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
|
18
20
|
private static byte[] init__puma_parser_actions_0()
|
19
21
|
{
|
20
22
|
return new byte [] {
|
@@ -33,8 +35,8 @@ private static short[] init__puma_parser_key_offsets_0()
|
|
33
35
|
return new short [] {
|
34
36
|
0, 0, 8, 17, 27, 29, 30, 31, 32, 33, 34, 36,
|
35
37
|
39, 41, 44, 45, 61, 62, 78, 80, 81, 89, 97, 107,
|
36
|
-
115,
|
37
|
-
|
38
|
+
115, 124, 132, 140, 149, 158, 167, 176, 185, 194, 203, 212,
|
39
|
+
221, 230, 239, 248, 257, 266, 275, 284, 293, 302, 303
|
38
40
|
};
|
39
41
|
}
|
40
42
|
|
@@ -53,24 +55,23 @@ private static char[] init__puma_parser_trans_keys_0()
|
|
53
55
|
48, 57, 65, 90, 94, 122, 13, 32, 13, 32, 60, 62,
|
54
56
|
127, 0, 31, 34, 35, 32, 60, 62, 127, 0, 31, 34,
|
55
57
|
35, 43, 58, 45, 46, 48, 57, 65, 90, 97, 122, 32,
|
56
|
-
34, 35, 60, 62, 127, 0, 31, 32, 34, 35,
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
32, 0
|
58
|
+
34, 35, 60, 62, 127, 0, 31, 32, 34, 35, 60, 62,
|
59
|
+
63, 127, 0, 31, 32, 34, 35, 60, 62, 127, 0, 31,
|
60
|
+
32, 34, 35, 60, 62, 127, 0, 31, 32, 36, 95, 45,
|
61
|
+
46, 48, 57, 65, 90, 32, 36, 95, 45, 46, 48, 57,
|
62
|
+
65, 90, 32, 36, 95, 45, 46, 48, 57, 65, 90, 32,
|
63
|
+
36, 95, 45, 46, 48, 57, 65, 90, 32, 36, 95, 45,
|
64
|
+
46, 48, 57, 65, 90, 32, 36, 95, 45, 46, 48, 57,
|
65
|
+
65, 90, 32, 36, 95, 45, 46, 48, 57, 65, 90, 32,
|
66
|
+
36, 95, 45, 46, 48, 57, 65, 90, 32, 36, 95, 45,
|
67
|
+
46, 48, 57, 65, 90, 32, 36, 95, 45, 46, 48, 57,
|
68
|
+
65, 90, 32, 36, 95, 45, 46, 48, 57, 65, 90, 32,
|
69
|
+
36, 95, 45, 46, 48, 57, 65, 90, 32, 36, 95, 45,
|
70
|
+
46, 48, 57, 65, 90, 32, 36, 95, 45, 46, 48, 57,
|
71
|
+
65, 90, 32, 36, 95, 45, 46, 48, 57, 65, 90, 32,
|
72
|
+
36, 95, 45, 46, 48, 57, 65, 90, 32, 36, 95, 45,
|
73
|
+
46, 48, 57, 65, 90, 32, 36, 95, 45, 46, 48, 57,
|
74
|
+
65, 90, 32, 0
|
74
75
|
};
|
75
76
|
}
|
76
77
|
|
@@ -82,8 +83,8 @@ private static byte[] init__puma_parser_single_lengths_0()
|
|
82
83
|
return new byte [] {
|
83
84
|
0, 2, 3, 4, 2, 1, 1, 1, 1, 1, 0, 1,
|
84
85
|
0, 1, 1, 4, 1, 4, 2, 1, 4, 4, 2, 6,
|
85
|
-
|
86
|
-
3, 3, 3, 3, 3, 3, 3, 3, 3,
|
86
|
+
7, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
87
|
+
3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 0
|
87
88
|
};
|
88
89
|
}
|
89
90
|
|
@@ -95,8 +96,8 @@ private static byte[] init__puma_parser_range_lengths_0()
|
|
95
96
|
return new byte [] {
|
96
97
|
0, 3, 3, 3, 0, 0, 0, 0, 0, 0, 1, 1,
|
97
98
|
1, 1, 0, 6, 0, 6, 0, 0, 2, 2, 4, 1,
|
98
|
-
1, 1, 1,
|
99
|
-
3, 3, 3, 3, 3, 3, 3, 3, 3,
|
99
|
+
1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
100
|
+
3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0
|
100
101
|
};
|
101
102
|
}
|
102
103
|
|
@@ -108,8 +109,8 @@ private static short[] init__puma_parser_index_offsets_0()
|
|
108
109
|
return new short [] {
|
109
110
|
0, 0, 6, 13, 21, 24, 26, 28, 30, 32, 34, 36,
|
110
111
|
39, 41, 44, 46, 57, 59, 70, 73, 75, 82, 89, 96,
|
111
|
-
104,
|
112
|
-
|
112
|
+
104, 113, 121, 129, 136, 143, 150, 157, 164, 171, 178, 185,
|
113
|
+
192, 199, 206, 213, 220, 227, 234, 241, 248, 255, 257
|
113
114
|
};
|
114
115
|
}
|
115
116
|
|
@@ -127,21 +128,20 @@ private static byte[] init__puma_parser_indicies_0()
|
|
127
128
|
24, 23, 23, 23, 23, 23, 23, 23, 23, 1, 26, 27,
|
128
129
|
25, 29, 28, 30, 1, 1, 1, 1, 1, 31, 32, 1,
|
129
130
|
1, 1, 1, 1, 33, 34, 35, 34, 34, 34, 34, 1,
|
130
|
-
8, 1, 9, 1, 1, 1, 1, 35, 36, 1, 38,
|
131
|
-
1,
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
1, 2, 1, 1, 0
|
131
|
+
8, 1, 9, 1, 1, 1, 1, 35, 36, 1, 38, 1,
|
132
|
+
1, 39, 1, 1, 37, 40, 1, 42, 1, 1, 1, 1,
|
133
|
+
41, 43, 1, 45, 1, 1, 1, 1, 44, 2, 46, 46,
|
134
|
+
46, 46, 46, 1, 2, 47, 47, 47, 47, 47, 1, 2,
|
135
|
+
48, 48, 48, 48, 48, 1, 2, 49, 49, 49, 49, 49,
|
136
|
+
1, 2, 50, 50, 50, 50, 50, 1, 2, 51, 51, 51,
|
137
|
+
51, 51, 1, 2, 52, 52, 52, 52, 52, 1, 2, 53,
|
138
|
+
53, 53, 53, 53, 1, 2, 54, 54, 54, 54, 54, 1,
|
139
|
+
2, 55, 55, 55, 55, 55, 1, 2, 56, 56, 56, 56,
|
140
|
+
56, 1, 2, 57, 57, 57, 57, 57, 1, 2, 58, 58,
|
141
|
+
58, 58, 58, 1, 2, 59, 59, 59, 59, 59, 1, 2,
|
142
|
+
60, 60, 60, 60, 60, 1, 2, 61, 61, 61, 61, 61,
|
143
|
+
1, 2, 62, 62, 62, 62, 62, 1, 2, 63, 63, 63,
|
144
|
+
63, 63, 1, 2, 1, 1, 0
|
145
145
|
};
|
146
146
|
}
|
147
147
|
|
@@ -151,12 +151,12 @@ private static final byte _puma_parser_indicies[] = init__puma_parser_indicies_0
|
|
151
151
|
private static byte[] init__puma_parser_trans_targs_0()
|
152
152
|
{
|
153
153
|
return new byte [] {
|
154
|
-
2, 0, 3,
|
155
|
-
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
|
154
|
+
2, 0, 3, 27, 4, 22, 24, 23, 5, 20, 6, 7,
|
155
|
+
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 46, 17,
|
156
156
|
18, 19, 14, 18, 19, 14, 5, 21, 5, 21, 22, 23,
|
157
|
-
5, 24, 20, 25, 26,
|
158
|
-
|
159
|
-
|
157
|
+
5, 24, 20, 25, 5, 26, 20, 5, 26, 20, 28, 29,
|
158
|
+
30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
159
|
+
42, 43, 44, 45
|
160
160
|
};
|
161
161
|
}
|
162
162
|
|
@@ -169,9 +169,9 @@ private static byte[] init__puma_parser_trans_actions_0()
|
|
169
169
|
1, 0, 11, 0, 1, 1, 1, 1, 13, 13, 1, 0,
|
170
170
|
0, 0, 0, 0, 0, 0, 19, 0, 0, 28, 23, 3,
|
171
171
|
5, 7, 31, 7, 0, 9, 25, 1, 15, 0, 0, 0,
|
172
|
-
37, 0, 37, 21,
|
173
|
-
|
174
|
-
0, 0, 0, 0
|
172
|
+
37, 0, 37, 21, 40, 17, 40, 34, 0, 34, 0, 0,
|
173
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
174
|
+
0, 0, 0, 0
|
175
175
|
};
|
176
176
|
}
|
177
177
|
|
@@ -179,17 +179,18 @@ private static final byte _puma_parser_trans_actions[] = init__puma_parser_trans
|
|
179
179
|
|
180
180
|
|
181
181
|
static final int puma_parser_start = 1;
|
182
|
-
static final int puma_parser_first_final =
|
182
|
+
static final int puma_parser_first_final = 46;
|
183
183
|
static final int puma_parser_error = 0;
|
184
184
|
|
185
|
-
|
185
|
+
|
186
|
+
// line 62 "ext/puma_http11/http11_parser.java.rl"
|
186
187
|
|
187
188
|
public static interface ElementCB {
|
188
|
-
public void call(
|
189
|
+
public void call(Ruby runtime, RubyHash data, ByteList buffer, int at, int length);
|
189
190
|
}
|
190
191
|
|
191
192
|
public static interface FieldCB {
|
192
|
-
public void call(
|
193
|
+
public void call(Ruby runtime, RubyHash data, ByteList buffer, int field, int flen, int value, int vlen);
|
193
194
|
}
|
194
195
|
|
195
196
|
public static class HttpParser {
|
@@ -202,28 +203,19 @@ static final int puma_parser_error = 0;
|
|
202
203
|
int field_len;
|
203
204
|
int query_start;
|
204
205
|
|
205
|
-
|
206
|
+
RubyHash data;
|
206
207
|
ByteList buffer;
|
207
208
|
|
208
|
-
public FieldCB http_field;
|
209
|
-
public ElementCB request_method;
|
210
|
-
public ElementCB request_uri;
|
211
|
-
public ElementCB fragment;
|
212
|
-
public ElementCB request_path;
|
213
|
-
public ElementCB query_string;
|
214
|
-
public ElementCB http_version;
|
215
|
-
public ElementCB header_done;
|
216
|
-
|
217
209
|
public void init() {
|
218
210
|
cs = 0;
|
219
211
|
|
220
|
-
|
221
|
-
// line
|
212
|
+
|
213
|
+
// line 214 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
|
222
214
|
{
|
223
215
|
cs = puma_parser_start;
|
224
216
|
}
|
225
217
|
|
226
|
-
// line
|
218
|
+
// line 88 "ext/puma_http11/http11_parser.java.rl"
|
227
219
|
|
228
220
|
body_start = 0;
|
229
221
|
content_len = 0;
|
@@ -236,7 +228,7 @@ static final int puma_parser_error = 0;
|
|
236
228
|
|
237
229
|
public final HttpParser parser = new HttpParser();
|
238
230
|
|
239
|
-
public int execute(ByteList buffer, int off) {
|
231
|
+
public int execute(Ruby runtime, Http11 http, ByteList buffer, int off) {
|
240
232
|
int p, pe;
|
241
233
|
int cs = parser.cs;
|
242
234
|
int len = buffer.length();
|
@@ -249,8 +241,8 @@ static final int puma_parser_error = 0;
|
|
249
241
|
byte[] data = buffer.bytes();
|
250
242
|
parser.buffer = buffer;
|
251
243
|
|
252
|
-
|
253
|
-
// line
|
244
|
+
|
245
|
+
// line 246 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
|
254
246
|
{
|
255
247
|
int _klen;
|
256
248
|
int _trans = 0;
|
@@ -331,91 +323,82 @@ case 1:
|
|
331
323
|
switch ( _puma_parser_actions[_acts++] )
|
332
324
|
{
|
333
325
|
case 0:
|
334
|
-
// line
|
326
|
+
// line 15 "ext/puma_http11/http11_parser.java.rl"
|
335
327
|
{parser.mark = p; }
|
336
328
|
break;
|
337
329
|
case 1:
|
338
|
-
// line
|
330
|
+
// line 17 "ext/puma_http11/http11_parser.java.rl"
|
339
331
|
{ parser.field_start = p; }
|
340
332
|
break;
|
341
333
|
case 2:
|
342
|
-
// line
|
334
|
+
// line 18 "ext/puma_http11/http11_parser.java.rl"
|
343
335
|
{ /* FIXME stub */ }
|
344
336
|
break;
|
345
337
|
case 3:
|
346
|
-
// line
|
347
|
-
{
|
338
|
+
// line 19 "ext/puma_http11/http11_parser.java.rl"
|
339
|
+
{
|
348
340
|
parser.field_len = p-parser.field_start;
|
349
341
|
}
|
350
342
|
break;
|
351
343
|
case 4:
|
352
|
-
// line
|
344
|
+
// line 23 "ext/puma_http11/http11_parser.java.rl"
|
353
345
|
{ parser.mark = p; }
|
354
346
|
break;
|
355
347
|
case 5:
|
356
|
-
// line
|
348
|
+
// line 24 "ext/puma_http11/http11_parser.java.rl"
|
357
349
|
{
|
358
|
-
|
359
|
-
parser.http_field.call(parser.data, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
|
360
|
-
}
|
350
|
+
Http11.http_field(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
|
361
351
|
}
|
362
352
|
break;
|
363
353
|
case 6:
|
364
354
|
// line 27 "ext/puma_http11/http11_parser.java.rl"
|
365
355
|
{
|
366
|
-
|
367
|
-
parser.request_method.call(parser.data, parser.mark, p-parser.mark);
|
356
|
+
Http11.request_method(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
|
368
357
|
}
|
369
358
|
break;
|
370
359
|
case 7:
|
371
|
-
// line
|
360
|
+
// line 30 "ext/puma_http11/http11_parser.java.rl"
|
372
361
|
{
|
373
|
-
|
374
|
-
parser.request_uri.call(parser.data, parser.mark, p-parser.mark);
|
362
|
+
Http11.request_uri(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
|
375
363
|
}
|
376
364
|
break;
|
377
365
|
case 8:
|
378
|
-
// line
|
366
|
+
// line 33 "ext/puma_http11/http11_parser.java.rl"
|
379
367
|
{
|
380
|
-
|
381
|
-
parser.fragment.call(parser.data, parser.mark, p-parser.mark);
|
368
|
+
Http11.fragment(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
|
382
369
|
}
|
383
370
|
break;
|
384
371
|
case 9:
|
385
|
-
// line
|
372
|
+
// line 37 "ext/puma_http11/http11_parser.java.rl"
|
386
373
|
{parser.query_start = p; }
|
387
374
|
break;
|
388
375
|
case 10:
|
389
|
-
// line
|
376
|
+
// line 38 "ext/puma_http11/http11_parser.java.rl"
|
390
377
|
{
|
391
|
-
|
392
|
-
parser.query_string.call(parser.data, parser.query_start, p-parser.query_start);
|
378
|
+
Http11.query_string(runtime, parser.data, parser.buffer, parser.query_start, p-parser.query_start);
|
393
379
|
}
|
394
380
|
break;
|
395
381
|
case 11:
|
396
|
-
// line
|
382
|
+
// line 42 "ext/puma_http11/http11_parser.java.rl"
|
397
383
|
{
|
398
|
-
|
399
|
-
parser.http_version.call(parser.data, parser.mark, p-parser.mark);
|
384
|
+
Http11.http_version(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
|
400
385
|
}
|
401
386
|
break;
|
402
387
|
case 12:
|
403
|
-
// line
|
388
|
+
// line 46 "ext/puma_http11/http11_parser.java.rl"
|
404
389
|
{
|
405
|
-
|
406
|
-
parser.request_path.call(parser.data, parser.mark, p-parser.mark);
|
390
|
+
Http11.request_path(runtime, parser.data, parser.buffer, parser.mark, p-parser.mark);
|
407
391
|
}
|
408
392
|
break;
|
409
393
|
case 13:
|
410
|
-
// line
|
411
|
-
{
|
394
|
+
// line 50 "ext/puma_http11/http11_parser.java.rl"
|
395
|
+
{
|
412
396
|
parser.body_start = p + 1;
|
413
|
-
|
414
|
-
parser.header_done.call(parser.data, p + 1, pe - p - 1);
|
397
|
+
http.header_done(runtime, parser.data, parser.buffer, p + 1, pe - p - 1);
|
415
398
|
{ p += 1; _goto_targ = 5; if (true) continue _goto;}
|
416
399
|
}
|
417
400
|
break;
|
418
|
-
// line
|
401
|
+
// line 402 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
|
419
402
|
}
|
420
403
|
}
|
421
404
|
}
|
@@ -435,11 +418,11 @@ case 5:
|
|
435
418
|
break; }
|
436
419
|
}
|
437
420
|
|
438
|
-
// line
|
421
|
+
// line 114 "ext/puma_http11/http11_parser.java.rl"
|
439
422
|
|
440
423
|
parser.cs = cs;
|
441
424
|
parser.nread += (p - off);
|
442
|
-
|
425
|
+
|
443
426
|
assert p <= pe : "buffer overflow after parsing execute";
|
444
427
|
assert parser.nread <= len : "nread longer than length";
|
445
428
|
assert parser.body_start <= len : "body starts after buffer end";
|