Mailing List Archive

Author: stevehay
Date: Tue Sep 24 08:07:32 2019
New Revision: 1867432

URL: http://svn.apache.org/viewvc?rev=1867432&view=rev
Log:
Fix t/compat/request.t failures

With better error handling in override_mp2_api(), we can see why we get an Internal Server Error from this script:

error overriding Apache2::RequestRec::filename : Bareword "WIN32" not allowed while "strict subs" in use at (eval 178) line 15.

And the fix is trivial.

Thanks to Adam Prime for making me look into this!

Modified:
perl/modperl/trunk/lib/Apache2/compat.pm

Modified: perl/modperl/trunk/lib/Apache2/compat.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/compat.pm?rev=1867432&r1=1867431&r2=1867432&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/compat.pm (original)
+++ perl/modperl/trunk/lib/Apache2/compat.pm Tue Sep 24 08:07:32 2019
@@ -64,6 +64,8 @@ use File::Spec ();

use APR::Const -compile => qw(FINFO_NORM FINFO_PROT);

+use constant WIN32 => ($^O eq "MSWin32");
+
BEGIN {
$INC{'Apache.pm'} = __FILE__;

@@ -256,6 +258,9 @@ sub override_mp2_api {
next;
}
$overridden_mp2_api{$sub} = eval $overridable_mp2_api{$sub};
+ if ($@) {
+ die "error overriding $sub : $@";
+ }
unless (exists $overridden_mp2_api{$sub} &&
ref($overridden_mp2_api{$sub}) eq 'CODE') {
die "overriding $sub didn't return a CODE ref";