puma 3.12.0 → 5.3.1
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 +1413 -439
- 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 +262 -87
- 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/app/status.rb +68 -49
- data/lib/puma/binder.rb +197 -144
- data/lib/puma/cli.rb +17 -15
- data/lib/puma/client.rb +257 -226
- data/lib/puma/cluster/worker.rb +176 -0
- data/lib/puma/cluster/worker_handle.rb +90 -0
- data/lib/puma/cluster.rb +223 -212
- data/lib/puma/commonlogger.rb +4 -2
- data/lib/puma/configuration.rb +58 -51
- data/lib/puma/const.rb +41 -19
- data/lib/puma/control_cli.rb +117 -73
- data/lib/puma/detect.rb +26 -3
- data/lib/puma/dsl.rb +531 -123
- data/lib/puma/error_logger.rb +104 -0
- data/lib/puma/events.rb +57 -31
- data/lib/puma/io_buffer.rb +9 -5
- data/lib/puma/jruby_restart.rb +2 -58
- data/lib/puma/json.rb +96 -0
- data/lib/puma/launcher.rb +182 -70
- data/lib/puma/minissl/context_builder.rb +79 -0
- data/lib/puma/minissl.rb +149 -48
- data/lib/puma/null_io.rb +15 -1
- data/lib/puma/plugin/tmp_restart.rb +2 -0
- data/lib/puma/plugin.rb +8 -12
- data/lib/puma/queue_close.rb +26 -0
- data/lib/puma/rack/builder.rb +4 -5
- data/lib/puma/rack/urlmap.rb +2 -0
- data/lib/puma/rack_default.rb +2 -0
- data/lib/puma/reactor.rb +87 -316
- data/lib/puma/request.rb +456 -0
- data/lib/puma/runner.rb +33 -52
- data/lib/puma/server.rb +288 -679
- data/lib/puma/single.rb +13 -67
- data/lib/puma/state_file.rb +10 -3
- data/lib/puma/systemd.rb +46 -0
- data/lib/puma/thread_pool.rb +131 -81
- data/lib/puma/util.rb +14 -6
- data/lib/puma.rb +54 -0
- data/lib/rack/handler/puma.rb +8 -6
- data/tools/Dockerfile +16 -0
- data/tools/trickletest.rb +0 -1
- metadata +45 -29
- 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 -23
- data/lib/puma/daemon_ext.rb +0 -31
- data/lib/puma/delegation.rb +0 -11
- data/lib/puma/java_io_buffer.rb +0 -45
- data/lib/puma/rack/backports/uri/common_193.rb +0 -33
- data/lib/puma/tcp_logger.rb +0 -39
- 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
@@ -14,12 +14,14 @@
|
|
14
14
|
|
15
15
|
/*
|
16
16
|
* capitalizes all lower-case ASCII characters,
|
17
|
-
* converts dashes to underscores.
|
17
|
+
* converts dashes to underscores, and underscores to commas.
|
18
18
|
*/
|
19
19
|
static void snake_upcase_char(char *c)
|
20
20
|
{
|
21
21
|
if (*c >= 'a' && *c <= 'z')
|
22
22
|
*c &= ~0x20;
|
23
|
+
else if (*c == '_')
|
24
|
+
*c = ',';
|
23
25
|
else if (*c == '-')
|
24
26
|
*c = '_';
|
25
27
|
}
|
@@ -31,20 +33,18 @@ static void snake_upcase_char(char *c)
|
|
31
33
|
/** Machine **/
|
32
34
|
|
33
35
|
|
34
|
-
#line
|
36
|
+
#line 81 "ext/puma_http11/http11_parser.rl"
|
35
37
|
|
36
38
|
|
37
39
|
/** Data **/
|
38
40
|
|
39
|
-
#line
|
41
|
+
#line 42 "ext/puma_http11/http11_parser.c"
|
40
42
|
static const int puma_parser_start = 1;
|
41
|
-
static const int puma_parser_first_final =
|
43
|
+
static const int puma_parser_first_final = 46;
|
42
44
|
static const int puma_parser_error = 0;
|
43
45
|
|
44
|
-
static const int puma_parser_en_main = 1;
|
45
46
|
|
46
|
-
|
47
|
-
#line 83 "ext/puma_http11/http11_parser.rl"
|
47
|
+
#line 85 "ext/puma_http11/http11_parser.rl"
|
48
48
|
|
49
49
|
int puma_parser_init(puma_parser *parser) {
|
50
50
|
int cs = 0;
|
@@ -54,7 +54,7 @@ int puma_parser_init(puma_parser *parser) {
|
|
54
54
|
cs = puma_parser_start;
|
55
55
|
}
|
56
56
|
|
57
|
-
#line
|
57
|
+
#line 89 "ext/puma_http11/http11_parser.rl"
|
58
58
|
parser->cs = cs;
|
59
59
|
parser->body_start = 0;
|
60
60
|
parser->content_len = 0;
|
@@ -107,7 +107,7 @@ st0:
|
|
107
107
|
cs = 0;
|
108
108
|
goto _out;
|
109
109
|
tr0:
|
110
|
-
#line
|
110
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
111
111
|
{ MARK(mark, p); }
|
112
112
|
goto st2;
|
113
113
|
st2:
|
@@ -117,20 +117,20 @@ case 2:
|
|
117
117
|
#line 118 "ext/puma_http11/http11_parser.c"
|
118
118
|
switch( (*p) ) {
|
119
119
|
case 32: goto tr2;
|
120
|
-
case 36: goto
|
121
|
-
case 95: goto
|
120
|
+
case 36: goto st27;
|
121
|
+
case 95: goto st27;
|
122
122
|
}
|
123
123
|
if ( (*p) < 48 ) {
|
124
124
|
if ( 45 <= (*p) && (*p) <= 46 )
|
125
|
-
goto
|
125
|
+
goto st27;
|
126
126
|
} else if ( (*p) > 57 ) {
|
127
127
|
if ( 65 <= (*p) && (*p) <= 90 )
|
128
|
-
goto
|
128
|
+
goto st27;
|
129
129
|
} else
|
130
|
-
goto
|
130
|
+
goto st27;
|
131
131
|
goto st0;
|
132
132
|
tr2:
|
133
|
-
#line
|
133
|
+
#line 50 "ext/puma_http11/http11_parser.rl"
|
134
134
|
{
|
135
135
|
parser->request_method(parser, PTR_TO(mark), LEN(mark, p));
|
136
136
|
}
|
@@ -156,7 +156,7 @@ case 3:
|
|
156
156
|
goto tr5;
|
157
157
|
goto st0;
|
158
158
|
tr4:
|
159
|
-
#line
|
159
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
160
160
|
{ MARK(mark, p); }
|
161
161
|
goto st4;
|
162
162
|
st4:
|
@@ -170,53 +170,53 @@ case 4:
|
|
170
170
|
}
|
171
171
|
goto st0;
|
172
172
|
tr8:
|
173
|
-
#line
|
173
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
174
174
|
{
|
175
175
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
176
176
|
}
|
177
177
|
goto st5;
|
178
178
|
tr31:
|
179
|
-
#line
|
179
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
180
180
|
{ MARK(mark, p); }
|
181
|
-
#line
|
181
|
+
#line 56 "ext/puma_http11/http11_parser.rl"
|
182
182
|
{
|
183
183
|
parser->fragment(parser, PTR_TO(mark), LEN(mark, p));
|
184
184
|
}
|
185
185
|
goto st5;
|
186
186
|
tr33:
|
187
|
-
#line
|
187
|
+
#line 56 "ext/puma_http11/http11_parser.rl"
|
188
188
|
{
|
189
189
|
parser->fragment(parser, PTR_TO(mark), LEN(mark, p));
|
190
190
|
}
|
191
191
|
goto st5;
|
192
192
|
tr37:
|
193
|
-
#line
|
193
|
+
#line 69 "ext/puma_http11/http11_parser.rl"
|
194
194
|
{
|
195
195
|
parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
|
196
196
|
}
|
197
|
-
#line
|
197
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
198
198
|
{
|
199
199
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
200
200
|
}
|
201
201
|
goto st5;
|
202
|
-
|
203
|
-
#line
|
202
|
+
tr41:
|
203
|
+
#line 60 "ext/puma_http11/http11_parser.rl"
|
204
204
|
{ MARK(query_start, p); }
|
205
|
-
#line
|
205
|
+
#line 61 "ext/puma_http11/http11_parser.rl"
|
206
206
|
{
|
207
207
|
parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
|
208
208
|
}
|
209
|
-
#line
|
209
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
210
210
|
{
|
211
211
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
212
212
|
}
|
213
213
|
goto st5;
|
214
|
-
|
215
|
-
#line
|
214
|
+
tr44:
|
215
|
+
#line 61 "ext/puma_http11/http11_parser.rl"
|
216
216
|
{
|
217
217
|
parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
|
218
218
|
}
|
219
|
-
#line
|
219
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
220
220
|
{
|
221
221
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
222
222
|
}
|
@@ -230,7 +230,7 @@ case 5:
|
|
230
230
|
goto tr10;
|
231
231
|
goto st0;
|
232
232
|
tr10:
|
233
|
-
#line
|
233
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
234
234
|
{ MARK(mark, p); }
|
235
235
|
goto st6;
|
236
236
|
st6:
|
@@ -295,21 +295,21 @@ case 13:
|
|
295
295
|
goto st13;
|
296
296
|
goto st0;
|
297
297
|
tr18:
|
298
|
-
#line
|
298
|
+
#line 65 "ext/puma_http11/http11_parser.rl"
|
299
299
|
{
|
300
300
|
parser->http_version(parser, PTR_TO(mark), LEN(mark, p));
|
301
301
|
}
|
302
302
|
goto st14;
|
303
303
|
tr26:
|
304
|
-
#line
|
304
|
+
#line 46 "ext/puma_http11/http11_parser.rl"
|
305
305
|
{ MARK(mark, p); }
|
306
|
-
#line
|
306
|
+
#line 47 "ext/puma_http11/http11_parser.rl"
|
307
307
|
{
|
308
308
|
parser->http_field(parser, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
|
309
309
|
}
|
310
310
|
goto st14;
|
311
311
|
tr29:
|
312
|
-
#line
|
312
|
+
#line 47 "ext/puma_http11/http11_parser.rl"
|
313
313
|
{
|
314
314
|
parser->http_field(parser, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, p));
|
315
315
|
}
|
@@ -358,27 +358,27 @@ case 16:
|
|
358
358
|
goto tr22;
|
359
359
|
goto st0;
|
360
360
|
tr22:
|
361
|
-
#line
|
361
|
+
#line 73 "ext/puma_http11/http11_parser.rl"
|
362
362
|
{
|
363
363
|
parser->body_start = p - buffer + 1;
|
364
364
|
parser->header_done(parser, p + 1, pe - p - 1);
|
365
|
-
{p++; cs =
|
365
|
+
{p++; cs = 46; goto _out;}
|
366
366
|
}
|
367
|
-
goto
|
368
|
-
|
367
|
+
goto st46;
|
368
|
+
st46:
|
369
369
|
if ( ++p == pe )
|
370
|
-
goto
|
371
|
-
case
|
370
|
+
goto _test_eof46;
|
371
|
+
case 46:
|
372
372
|
#line 373 "ext/puma_http11/http11_parser.c"
|
373
373
|
goto st0;
|
374
374
|
tr21:
|
375
|
-
#line
|
375
|
+
#line 40 "ext/puma_http11/http11_parser.rl"
|
376
376
|
{ MARK(field_start, p); }
|
377
|
-
#line
|
377
|
+
#line 41 "ext/puma_http11/http11_parser.rl"
|
378
378
|
{ snake_upcase_char((char *)p); }
|
379
379
|
goto st17;
|
380
380
|
tr23:
|
381
|
-
#line
|
381
|
+
#line 41 "ext/puma_http11/http11_parser.rl"
|
382
382
|
{ snake_upcase_char((char *)p); }
|
383
383
|
goto st17;
|
384
384
|
st17:
|
@@ -411,13 +411,13 @@ case 17:
|
|
411
411
|
goto tr23;
|
412
412
|
goto st0;
|
413
413
|
tr24:
|
414
|
-
#line
|
414
|
+
#line 42 "ext/puma_http11/http11_parser.rl"
|
415
415
|
{
|
416
416
|
parser->field_len = LEN(field_start, p);
|
417
417
|
}
|
418
418
|
goto st18;
|
419
419
|
tr27:
|
420
|
-
#line
|
420
|
+
#line 46 "ext/puma_http11/http11_parser.rl"
|
421
421
|
{ MARK(mark, p); }
|
422
422
|
goto st18;
|
423
423
|
st18:
|
@@ -431,7 +431,7 @@ case 18:
|
|
431
431
|
}
|
432
432
|
goto tr25;
|
433
433
|
tr25:
|
434
|
-
#line
|
434
|
+
#line 46 "ext/puma_http11/http11_parser.rl"
|
435
435
|
{ MARK(mark, p); }
|
436
436
|
goto st19;
|
437
437
|
st19:
|
@@ -443,39 +443,39 @@ case 19:
|
|
443
443
|
goto tr29;
|
444
444
|
goto st19;
|
445
445
|
tr9:
|
446
|
-
#line
|
446
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
447
447
|
{
|
448
448
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
449
449
|
}
|
450
450
|
goto st20;
|
451
451
|
tr38:
|
452
|
-
#line
|
452
|
+
#line 69 "ext/puma_http11/http11_parser.rl"
|
453
453
|
{
|
454
454
|
parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
|
455
455
|
}
|
456
|
-
#line
|
456
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
457
457
|
{
|
458
458
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
459
459
|
}
|
460
460
|
goto st20;
|
461
|
-
|
462
|
-
#line
|
461
|
+
tr42:
|
462
|
+
#line 60 "ext/puma_http11/http11_parser.rl"
|
463
463
|
{ MARK(query_start, p); }
|
464
|
-
#line
|
464
|
+
#line 61 "ext/puma_http11/http11_parser.rl"
|
465
465
|
{
|
466
466
|
parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
|
467
467
|
}
|
468
|
-
#line
|
468
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
469
469
|
{
|
470
470
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
471
471
|
}
|
472
472
|
goto st20;
|
473
|
-
|
474
|
-
#line
|
473
|
+
tr45:
|
474
|
+
#line 61 "ext/puma_http11/http11_parser.rl"
|
475
475
|
{
|
476
476
|
parser->query_string(parser, PTR_TO(query_start), LEN(query_start, p));
|
477
477
|
}
|
478
|
-
#line
|
478
|
+
#line 53 "ext/puma_http11/http11_parser.rl"
|
479
479
|
{
|
480
480
|
parser->request_uri(parser, PTR_TO(mark), LEN(mark, p));
|
481
481
|
}
|
@@ -498,7 +498,7 @@ case 20:
|
|
498
498
|
goto st0;
|
499
499
|
goto tr30;
|
500
500
|
tr30:
|
501
|
-
#line
|
501
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
502
502
|
{ MARK(mark, p); }
|
503
503
|
goto st21;
|
504
504
|
st21:
|
@@ -519,7 +519,7 @@ case 21:
|
|
519
519
|
goto st0;
|
520
520
|
goto st21;
|
521
521
|
tr5:
|
522
|
-
#line
|
522
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
523
523
|
{ MARK(mark, p); }
|
524
524
|
goto st22;
|
525
525
|
st22:
|
@@ -544,7 +544,7 @@ case 22:
|
|
544
544
|
goto st22;
|
545
545
|
goto st0;
|
546
546
|
tr7:
|
547
|
-
#line
|
547
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
548
548
|
{ MARK(mark, p); }
|
549
549
|
goto st23;
|
550
550
|
st23:
|
@@ -564,7 +564,7 @@ case 23:
|
|
564
564
|
goto st0;
|
565
565
|
goto st23;
|
566
566
|
tr6:
|
567
|
-
#line
|
567
|
+
#line 37 "ext/puma_http11/http11_parser.rl"
|
568
568
|
{ MARK(mark, p); }
|
569
569
|
goto st24;
|
570
570
|
st24:
|
@@ -576,17 +576,16 @@ case 24:
|
|
576
576
|
case 32: goto tr37;
|
577
577
|
case 34: goto st0;
|
578
578
|
case 35: goto tr38;
|
579
|
-
case 59: goto tr39;
|
580
579
|
case 60: goto st0;
|
581
580
|
case 62: goto st0;
|
582
|
-
case 63: goto
|
581
|
+
case 63: goto tr39;
|
583
582
|
case 127: goto st0;
|
584
583
|
}
|
585
584
|
if ( 0 <= (*p) && (*p) <= 31 )
|
586
585
|
goto st0;
|
587
586
|
goto st24;
|
588
587
|
tr39:
|
589
|
-
#line
|
588
|
+
#line 69 "ext/puma_http11/http11_parser.rl"
|
590
589
|
{
|
591
590
|
parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
|
592
591
|
}
|
@@ -595,30 +594,27 @@ st25:
|
|
595
594
|
if ( ++p == pe )
|
596
595
|
goto _test_eof25;
|
597
596
|
case 25:
|
598
|
-
#line
|
597
|
+
#line 598 "ext/puma_http11/http11_parser.c"
|
599
598
|
switch( (*p) ) {
|
600
|
-
case 32: goto
|
599
|
+
case 32: goto tr41;
|
601
600
|
case 34: goto st0;
|
602
|
-
case 35: goto
|
601
|
+
case 35: goto tr42;
|
603
602
|
case 60: goto st0;
|
604
603
|
case 62: goto st0;
|
605
|
-
case 63: goto st26;
|
606
604
|
case 127: goto st0;
|
607
605
|
}
|
608
606
|
if ( 0 <= (*p) && (*p) <= 31 )
|
609
607
|
goto st0;
|
610
|
-
goto
|
608
|
+
goto tr40;
|
611
609
|
tr40:
|
612
|
-
#line
|
613
|
-
{
|
614
|
-
parser->request_path(parser, PTR_TO(mark), LEN(mark,p));
|
615
|
-
}
|
610
|
+
#line 60 "ext/puma_http11/http11_parser.rl"
|
611
|
+
{ MARK(query_start, p); }
|
616
612
|
goto st26;
|
617
613
|
st26:
|
618
614
|
if ( ++p == pe )
|
619
615
|
goto _test_eof26;
|
620
616
|
case 26:
|
621
|
-
#line
|
617
|
+
#line 618 "ext/puma_http11/http11_parser.c"
|
622
618
|
switch( (*p) ) {
|
623
619
|
case 32: goto tr44;
|
624
620
|
case 34: goto st0;
|
@@ -629,27 +625,25 @@ case 26:
|
|
629
625
|
}
|
630
626
|
if ( 0 <= (*p) && (*p) <= 31 )
|
631
627
|
goto st0;
|
632
|
-
goto
|
633
|
-
tr43:
|
634
|
-
#line 58 "ext/puma_http11/http11_parser.rl"
|
635
|
-
{ MARK(query_start, p); }
|
636
|
-
goto st27;
|
628
|
+
goto st26;
|
637
629
|
st27:
|
638
630
|
if ( ++p == pe )
|
639
631
|
goto _test_eof27;
|
640
632
|
case 27:
|
641
|
-
#line 642 "ext/puma_http11/http11_parser.c"
|
642
633
|
switch( (*p) ) {
|
643
|
-
case 32: goto
|
644
|
-
case
|
645
|
-
case
|
646
|
-
case 60: goto st0;
|
647
|
-
case 62: goto st0;
|
648
|
-
case 127: goto st0;
|
634
|
+
case 32: goto tr2;
|
635
|
+
case 36: goto st28;
|
636
|
+
case 95: goto st28;
|
649
637
|
}
|
650
|
-
if (
|
651
|
-
|
652
|
-
|
638
|
+
if ( (*p) < 48 ) {
|
639
|
+
if ( 45 <= (*p) && (*p) <= 46 )
|
640
|
+
goto st28;
|
641
|
+
} else if ( (*p) > 57 ) {
|
642
|
+
if ( 65 <= (*p) && (*p) <= 90 )
|
643
|
+
goto st28;
|
644
|
+
} else
|
645
|
+
goto st28;
|
646
|
+
goto st0;
|
653
647
|
st28:
|
654
648
|
if ( ++p == pe )
|
655
649
|
goto _test_eof28;
|
@@ -960,24 +954,6 @@ st45:
|
|
960
954
|
if ( ++p == pe )
|
961
955
|
goto _test_eof45;
|
962
956
|
case 45:
|
963
|
-
switch( (*p) ) {
|
964
|
-
case 32: goto tr2;
|
965
|
-
case 36: goto st46;
|
966
|
-
case 95: goto st46;
|
967
|
-
}
|
968
|
-
if ( (*p) < 48 ) {
|
969
|
-
if ( 45 <= (*p) && (*p) <= 46 )
|
970
|
-
goto st46;
|
971
|
-
} else if ( (*p) > 57 ) {
|
972
|
-
if ( 65 <= (*p) && (*p) <= 90 )
|
973
|
-
goto st46;
|
974
|
-
} else
|
975
|
-
goto st46;
|
976
|
-
goto st0;
|
977
|
-
st46:
|
978
|
-
if ( ++p == pe )
|
979
|
-
goto _test_eof46;
|
980
|
-
case 46:
|
981
957
|
if ( (*p) == 32 )
|
982
958
|
goto tr2;
|
983
959
|
goto st0;
|
@@ -997,7 +973,7 @@ case 46:
|
|
997
973
|
_test_eof14: cs = 14; goto _test_eof;
|
998
974
|
_test_eof15: cs = 15; goto _test_eof;
|
999
975
|
_test_eof16: cs = 16; goto _test_eof;
|
1000
|
-
|
976
|
+
_test_eof46: cs = 46; goto _test_eof;
|
1001
977
|
_test_eof17: cs = 17; goto _test_eof;
|
1002
978
|
_test_eof18: cs = 18; goto _test_eof;
|
1003
979
|
_test_eof19: cs = 19; goto _test_eof;
|
@@ -1027,13 +1003,12 @@ case 46:
|
|
1027
1003
|
_test_eof43: cs = 43; goto _test_eof;
|
1028
1004
|
_test_eof44: cs = 44; goto _test_eof;
|
1029
1005
|
_test_eof45: cs = 45; goto _test_eof;
|
1030
|
-
_test_eof46: cs = 46; goto _test_eof;
|
1031
1006
|
|
1032
1007
|
_test_eof: {}
|
1033
1008
|
_out: {}
|
1034
1009
|
}
|
1035
1010
|
|
1036
|
-
#line
|
1011
|
+
#line 117 "ext/puma_http11/http11_parser.rl"
|
1037
1012
|
|
1038
1013
|
if (!puma_parser_has_error(parser))
|
1039
1014
|
parser->cs = cs;
|
@@ -1,5 +1,7 @@
|
|
1
1
|
package org.jruby.puma;
|
2
2
|
|
3
|
+
import org.jruby.Ruby;
|
4
|
+
import org.jruby.RubyHash;
|
3
5
|
import org.jruby.util.ByteList;
|
4
6
|
|
5
7
|
public class Http11Parser {
|
@@ -19,44 +21,35 @@ public class Http11Parser {
|
|
19
21
|
}
|
20
22
|
|
21
23
|
action start_value { parser.mark = fpc; }
|
22
|
-
action write_value {
|
23
|
-
|
24
|
-
parser.http_field.call(parser.data, parser.field_start, parser.field_len, parser.mark, fpc-parser.mark);
|
25
|
-
}
|
24
|
+
action write_value {
|
25
|
+
Http11.http_field(runtime, parser.data, parser.buffer, parser.field_start, parser.field_len, parser.mark, fpc-parser.mark);
|
26
26
|
}
|
27
|
-
action request_method {
|
28
|
-
|
29
|
-
parser.request_method.call(parser.data, parser.mark, fpc-parser.mark);
|
27
|
+
action request_method {
|
28
|
+
Http11.request_method(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
|
30
29
|
}
|
31
|
-
action request_uri {
|
32
|
-
|
33
|
-
parser.request_uri.call(parser.data, parser.mark, fpc-parser.mark);
|
30
|
+
action request_uri {
|
31
|
+
Http11.request_uri(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
|
34
32
|
}
|
35
|
-
action fragment {
|
36
|
-
|
37
|
-
parser.fragment.call(parser.data, parser.mark, fpc-parser.mark);
|
33
|
+
action fragment {
|
34
|
+
Http11.fragment(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
|
38
35
|
}
|
39
36
|
|
40
37
|
action start_query {parser.query_start = fpc; }
|
41
|
-
action query_string {
|
42
|
-
|
43
|
-
parser.query_string.call(parser.data, parser.query_start, fpc-parser.query_start);
|
38
|
+
action query_string {
|
39
|
+
Http11.query_string(runtime, parser.data, parser.buffer, parser.query_start, fpc-parser.query_start);
|
44
40
|
}
|
45
41
|
|
46
|
-
action http_version {
|
47
|
-
|
48
|
-
parser.http_version.call(parser.data, parser.mark, fpc-parser.mark);
|
42
|
+
action http_version {
|
43
|
+
Http11.http_version(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
|
49
44
|
}
|
50
45
|
|
51
46
|
action request_path {
|
52
|
-
|
53
|
-
parser.request_path.call(parser.data, parser.mark, fpc-parser.mark);
|
47
|
+
Http11.request_path(runtime, parser.data, parser.buffer, parser.mark, fpc-parser.mark);
|
54
48
|
}
|
55
49
|
|
56
50
|
action done {
|
57
|
-
parser.body_start = fpc + 1;
|
58
|
-
|
59
|
-
parser.header_done.call(parser.data, fpc + 1, pe - fpc - 1);
|
51
|
+
parser.body_start = fpc + 1;
|
52
|
+
http.header_done(runtime, parser.data, parser.buffer, fpc + 1, pe - fpc - 1);
|
60
53
|
fbreak;
|
61
54
|
}
|
62
55
|
|
@@ -65,14 +58,14 @@ public class Http11Parser {
|
|
65
58
|
}%%
|
66
59
|
|
67
60
|
/** Data **/
|
68
|
-
%% write data;
|
61
|
+
%% write data noentry;
|
69
62
|
|
70
63
|
public static interface ElementCB {
|
71
|
-
public void call(
|
64
|
+
public void call(Ruby runtime, RubyHash data, ByteList buffer, int at, int length);
|
72
65
|
}
|
73
66
|
|
74
67
|
public static interface FieldCB {
|
75
|
-
public void call(
|
68
|
+
public void call(Ruby runtime, RubyHash data, ByteList buffer, int field, int flen, int value, int vlen);
|
76
69
|
}
|
77
70
|
|
78
71
|
public static class HttpParser {
|
@@ -85,18 +78,9 @@ public class Http11Parser {
|
|
85
78
|
int field_len;
|
86
79
|
int query_start;
|
87
80
|
|
88
|
-
|
81
|
+
RubyHash data;
|
89
82
|
ByteList buffer;
|
90
83
|
|
91
|
-
public FieldCB http_field;
|
92
|
-
public ElementCB request_method;
|
93
|
-
public ElementCB request_uri;
|
94
|
-
public ElementCB fragment;
|
95
|
-
public ElementCB request_path;
|
96
|
-
public ElementCB query_string;
|
97
|
-
public ElementCB http_version;
|
98
|
-
public ElementCB header_done;
|
99
|
-
|
100
84
|
public void init() {
|
101
85
|
cs = 0;
|
102
86
|
|
@@ -113,7 +97,7 @@ public class Http11Parser {
|
|
113
97
|
|
114
98
|
public final HttpParser parser = new HttpParser();
|
115
99
|
|
116
|
-
public int execute(ByteList buffer, int off) {
|
100
|
+
public int execute(Ruby runtime, Http11 http, ByteList buffer, int off) {
|
117
101
|
int p, pe;
|
118
102
|
int cs = parser.cs;
|
119
103
|
int len = buffer.length();
|
@@ -12,12 +12,14 @@
|
|
12
12
|
|
13
13
|
/*
|
14
14
|
* capitalizes all lower-case ASCII characters,
|
15
|
-
* converts dashes to underscores.
|
15
|
+
* converts dashes to underscores, and underscores to commas.
|
16
16
|
*/
|
17
17
|
static void snake_upcase_char(char *c)
|
18
18
|
{
|
19
19
|
if (*c >= 'a' && *c <= 'z')
|
20
20
|
*c &= ~0x20;
|
21
|
+
else if (*c == '_')
|
22
|
+
*c = ',';
|
21
23
|
else if (*c == '-')
|
22
24
|
*c = '_';
|
23
25
|
}
|
@@ -79,7 +81,7 @@ static void snake_upcase_char(char *c)
|
|
79
81
|
}%%
|
80
82
|
|
81
83
|
/** Data **/
|
82
|
-
%% write data;
|
84
|
+
%% write data noentry;
|
83
85
|
|
84
86
|
int puma_parser_init(puma_parser *parser) {
|
85
87
|
int cs = 0;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
%%{
|
2
|
-
|
2
|
+
|
3
3
|
machine puma_parser_common;
|
4
4
|
|
5
5
|
#### HTTP PROTOCOL GRAMMAR
|
@@ -16,7 +16,7 @@
|
|
16
16
|
unreserved = (alpha | digit | safe | extra | national);
|
17
17
|
escape = ("%" xdigit xdigit);
|
18
18
|
uchar = (unreserved | escape | "%");
|
19
|
-
pchar = (uchar | ":" | "@" | "&" | "=" | "+");
|
19
|
+
pchar = (uchar | ":" | "@" | "&" | "=" | "+" | ";");
|
20
20
|
tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
|
21
21
|
|
22
22
|
# elements
|
@@ -30,7 +30,7 @@
|
|
30
30
|
query = ( uchar | reserved )* %query_string ;
|
31
31
|
param = ( pchar | "/" )* ;
|
32
32
|
params = ( param ( ";" param )* ) ;
|
33
|
-
rel_path = ( path? %request_path
|
33
|
+
rel_path = ( path? %request_path ) ("?" %start_query query)?;
|
34
34
|
absolute_path = ( "/"+ rel_path );
|
35
35
|
|
36
36
|
Request_URI = ( "*" | absolute_uri | absolute_path ) >mark %request_uri;
|