File tree 1 file changed +11
-1
lines changed 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -204,6 +204,16 @@ sub runfile {
204
204
my $rc = 0;
205
205
my $conf_fn ;
206
206
207
+ # watch for segfaults
208
+ if ($t and !$t -> {match_log }) {
209
+ $t -> {match_log } = {};
210
+ }
211
+ if ($t and $t -> {match_log } and !$t -> {match_log }{-error}) {
212
+ $t -> {match_log }{-error} = [];
213
+ }
214
+ push $t -> {match_log }{-error}, qr / (core dump)/ ;
215
+ push $t -> {match_log }{-error}, 1;
216
+
207
217
# Startup nginx with optionally included conf.
208
218
if (exists $t {conf } and defined $t {conf }) {
209
219
$conf_fn = sprintf " %s /%s_%s_ %06d.conf" ,
@@ -498,7 +508,6 @@ sub match_log {
498
508
# dbg("Match \"$re\" in $name \"$$rbuf\" ($n)");
499
509
if ($$rbuf =~ m /$re / m ) {
500
510
$rc = $& ;
501
- # print "bonga\n";
502
511
last ;
503
512
}
504
513
# TODO: Use select()/poll()
@@ -695,6 +704,7 @@ sub nginx_reset_fd {
695
704
return undef ;
696
705
}
697
706
707
+
698
708
# Any extras listed in "match_log"
699
709
if ($t and exists $t -> {match_log }) {
700
710
for my $k (keys %{ $t -> {match_log } || {} }) {
You can’t perform that action at this time.
0 commit comments