svn commit: r522508 - in /perl/modperl/trunk: Changes lib/Apache2/compat.pm

[ge...@apache.org]

Author: geoff
Date: Mon Mar 26 06:04:00 2007
New Revision: 522508

URL: http://svn.apache.org/viewvc?view=rev&rev=522508
Log:
fixed Apache2::compat Apache2::ServerUtil::server_root() resolution
issues [Joshua Hoblitt]

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

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?view=diff&rev=522508&r1=522507&r2=522508
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon Mar 26 06:04:00 2007
@@ -12,6 +12,9 @@
 
 =item 2.0.4-dev
 
+fixed Apache2::compat Apache2::ServerUtil::server_root() resolution
+issues [Joshua Hoblitt]
+
 *) SECURITY: CVE-2007-1349 (cve.mitre.org)
 fix unescaped variable interprolation in regular expression
 [Randal L. Schwartz <me...@stonehenge.com>, Fred Moyer <fr...@redhotpenguin.com>]

Modified: perl/modperl/trunk/lib/Apache2/compat.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/compat.pm?view=diff&rev=522508&r1=522507&r2=522508
==============================================================================
--- perl/modperl/trunk/lib/Apache2/compat.pm (original)
+++ perl/modperl/trunk/lib/Apache2/compat.pm Mon Mar 26 06:04:00 2007
@@ -310,7 +310,7 @@
 
 package Apache::Server;
 # XXX: is that good enough? see modperl/src/modules/perl/mod_perl.c:367
-our $CWD = Apache2::ServerUtil::server_root;
+our $CWD = Apache2::ServerUtil::server_root();
 
 our $AddPerlVersion = 1;
 
@@ -344,7 +344,7 @@
          return File::Spec->catfile(@_);
     }
     else {
-        File::Spec->catfile(Apache2::ServerUtil::server_root, @_);
+        File::Spec->catfile(Apache2::ServerUtil::server_root(), @_);
     }
 }
 
@@ -596,7 +596,7 @@
 
 sub server_root_relative {
     my $r = shift;
-    File::Spec->catfile(Apache2::ServerUtil::server_root, @_);
+    File::Spec->catfile(Apache2::ServerUtil::server_root(), @_);
 }
 
 sub clear_rgy_endav {