[Catalyst-commits] r6286 - in trunk/Catalyst-Engine-Apache: . lib/Catalyst/Engine lib/Catalyst/Engine/Apache2

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-04-14 21:44:44 +0100 (Sat, 14 Apr 2007)
New Revision: 6286

Modified:
   trunk/Catalyst-Engine-Apache/Changes
   trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm
   trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache2/MP19.pm
Log:
Apache: Load APR::Table when running under mod_perl 1.99

Modified: trunk/Catalyst-Engine-Apache/Changes
===================================================================
--- trunk/Catalyst-Engine-Apache/Changes	2007-04-14 03:10:47 UTC (rev 6285)
+++ trunk/Catalyst-Engine-Apache/Changes	2007-04-14 20:44:44 UTC (rev 6286)
@@ -3,6 +3,7 @@
 1.10
         - Use the unparsed URI for building the path instead of Apache's
           pre-parsed URI.
+        - Load APR::Table when using mod_perl 1.99.
 
 1.09    2007-03-28 23:00:00
         - Fixed compatibility with older Catalyst versions.  5.7008+

Modified: trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm
===================================================================
--- trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm	2007-04-14 03:10:47 UTC (rev 6285)
+++ trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm	2007-04-14 20:44:44 UTC (rev 6286)
@@ -129,8 +129,9 @@
         $host .= ":$port";
     }
     
-    # We want the unescaped path.  Under mod_perl2 this is available with the
-    # unparsed_uri method.  Under mod_perl 1 we must parse it out of the request line.
+    # We want the path before Apache escapes it.  Under mod_perl2 this is available
+    # with the unparsed_uri method.  Under mod_perl 1 we must parse it out of the
+    # request line.
     my ($path, $qs);
     
     if ( MP2 ) {

Modified: trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache2/MP19.pm
===================================================================
--- trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache2/MP19.pm	2007-04-14 03:10:47 UTC (rev 6285)
+++ trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache2/MP19.pm	2007-04-14 20:44:44 UTC (rev 6286)
@@ -12,6 +12,7 @@
 use Apache::RequestUtil ();
 use Apache::Response    ();
 use Apache::URI         ();
+use APR::Table          ();
 
 sub ok_constant { Apache::OK }