@@ -26,8 +26,6 @@ select STDOUT; $| = 1;
26
26
my $t = Test::Nginx-> new()-> has(qw/ http http_v2 proxy rewrite limit_req/ )
27
27
-> plan(7);
28
28
29
- $t -> todo_alerts() unless $t -> has_version(' 1.9.14' );
30
-
31
29
$t -> write_file_expand(' nginx.conf' , <<'EOF' );
32
30
33
31
%%TEST_GLOBALS%%
@@ -81,9 +79,6 @@ my ($frame) = grep { $_->{type} eq "HEADERS" } @$frames;
81
79
is(read_body_file($frame -> {headers }-> {' x-body-file' }), ' TEST' ,
82
80
' request body - limit req' );
83
81
84
- TODO: {
85
- local $TODO = ' not yet' unless $t -> has_version(' 1.9.15' );
86
-
87
82
$s = Test::Nginx::HTTP2-> new();
88
83
$sid = $s -> new_stream({ path => ' /proxy_limit_req/' , body_more => 1 });
89
84
select undef , undef , undef , 1.1;
@@ -94,8 +89,6 @@ $frames = $s->read(all => [{ sid => $sid, fin => 1 }]);
94
89
is(read_body_file($frame -> {headers }-> {' x-body-file' }), ' TEST' ,
95
90
' request body - limit req - limited' );
96
91
97
- }
98
-
99
92
# request body delayed in limit_req - with an empty DATA frame
100
93
# "zero size buf in output" alerts seen
101
94
@@ -114,7 +107,6 @@ $sid = $s->new_stream();
114
107
my ($maxwin ) = sort {$a <=> $b } $s -> {streams }{$sid }, $s -> {conn_window };
115
108
116
109
SKIP: {
117
- skip ' leaves coredump' , 1 unless $t -> has_version(' 1.9.7' );
118
110
skip ' not enough window' , 1 if $maxwin < 5;
119
111
120
112
$s = Test::Nginx::HTTP2-> new();
@@ -136,10 +128,6 @@ $s = Test::Nginx::HTTP2->new();
136
128
SKIP: {
137
129
skip ' not enough window' , 1 if $maxwin < 4;
138
130
139
- TODO: {
140
- todo_skip ' use-after-free' , 1 unless $ENV {TEST_NGINX_UNSAFE }
141
- or $t -> has_version(' 1.9.12' );
142
-
143
131
$sid = $s -> new_stream({ path => ' /limit_req' , body => ' TEST' , split => [61],
144
132
split_delay => 1.1 });
145
133
$frames = $s -> read (all => [{ sid => $sid , fin => 1 }]);
@@ -149,8 +137,6 @@ is($frame->{headers}->{':status'}, '200', 'discard body - limit req - limited');
149
137
150
138
}
151
139
152
- }
153
-
154
140
$sid = $s -> new_stream({ path => ' /' });
155
141
$frames = $s -> read (all => [{ sid => $sid , fin => 1 }]);
156
142
@@ -163,10 +149,6 @@ is($frame->{headers}->{':status'}, '200', 'discard body - limit req - next');
163
149
SKIP: {
164
150
skip ' not enough window' , 1 if $maxwin < 4;
165
151
166
- TODO: {
167
- todo_skip ' use-after-free' , 1 unless $ENV {TEST_NGINX_UNSAFE }
168
- or $t -> has_version(' 1.9.12' );
169
-
170
152
$s = Test::Nginx::HTTP2-> new();
171
153
$sid = $s -> new_stream({ path => ' /limit_req' , body => ' TEST' , split => [61],
172
154
abort => 1 });
@@ -178,8 +160,6 @@ pass('discard body - limit req - eof');
178
160
179
161
}
180
162
181
- }
182
-
183
163
# ##############################################################################
184
164
185
165
sub read_body_file {
0 commit comments