Skip to content

Commit 8f81877

Browse files
committed
Use the features of the latest CGI::Info
1 parent de8508f commit 8f81877

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

cgi-bin/page.fcgi

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,6 @@ sub doit
294294
# Check and increment request count
295295
my $request_count = $rate_limit_cache->get($client_ip) || 0;
296296

297-
my $warnings = '';
298-
if(my $w = $info->warnings()) {
299-
my @warnings = map { $_->{'warning'} } @{$w};
300-
$warnings = join(';', @warnings);
301-
}
302-
303297
if(!-r $vwflog) {
304298
# First run - put in the heading row
305299
open(my $log, '>', $vwflog);
@@ -330,8 +324,8 @@ sub doit
330324
'"', $lingua->language(), '",',
331325
'429,',
332326
'"",',
333-
'"', $info->as_string(), '",',
334-
'"', $warnings, '",',
327+
'"', $info->as_string(raw => 1), '",',
328+
'"', $info->warnings_as_string(), '",',
335329
'""',
336330
"\n";
337331
close($fout);
@@ -378,8 +372,8 @@ sub doit
378372
'"', $lingua->language(), '",',
379373
'403,',
380374
'"",',
381-
'"', $info->as_string(), '",',
382-
'"', $warnings, '",',
375+
'"', $info->as_string(raw => 1), '",',
376+
'"', $info->warnings_as_string(), '",',
383377
'"', $reason, '"',
384378
"\n";
385379
close($fout);
@@ -514,8 +508,8 @@ sub doit
514508
'"', $lingua->language(), '",',
515509
$info->status(), ',',
516510
'"', ($log->template() ? $log->template() : ''), '",',
517-
'"', $info->as_string(), '",',
518-
'"', $warnings, '",',
511+
'"', $info->as_string(raw => 1), '",',
512+
'"', $info->warnings_as_string(), '",',
519513
'"', $error ? $error : '', '"',
520514
"\n";
521515
close($fout);
@@ -532,8 +526,8 @@ sub doit
532526
'"', $lingua->language(), '",',
533527
$info->status(), ',',
534528
'"",',
535-
'"', $info->as_string(), '",',
536-
'"', $warnings, '",',
529+
'"', $info->as_string(raw => 1), '",',
530+
'"', $info->warnings_as_string(), '",',
537531
'"', $error ? $error : '', '"',
538532
"\n";
539533
close($fout);
@@ -588,8 +582,8 @@ sub doit
588582
'"', $lingua->language(), '",',
589583
$info->status(), ',',
590584
'"",',
591-
'"', $info->as_string(), '",',
592-
'"', $warnings, '",',
585+
'"', $info->as_string(raw => 1), '",',
586+
'"', $info->warnings_as_string(), '",',
593587
'"', $error ? $error : '', '"',
594588
"\n";
595589
close($fout);

0 commit comments

Comments
 (0)