Moved the loading of the Apache 2 modules out of httpd.conf and int…

…o Bric::App::ApacheStartup.
bricoleurs · Apr 24, 2008 · 01ccc16 · 01ccc16
1 parent ef497c7
commit 01ccc16
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/conf/httpd.conf b/conf/httpd.conf
@@ -75,25 +75,6 @@ Timeout              30
 # This is where Bricolage actually gets configured.
 ################################################################################
 PerlPassEnv BRICOLAGE_ROOT
-<IfDefine MODPERL2>
-  PerlModule mod_perl2
-  PerlModule APR
-  PerlModule APR::Request
-  PerlModule APR::Request::Apache2
-  PerlModule APR::Table
-  PerlModule Apache2::Access
-  PerlModule Apache2::Connection
-  PerlModule Apache2::Log
-  PerlModule Apache2::Request
-  PerlModule Apache2::RequestRec
-  PerlModule Apache2::RequestUtil
-  PerlModule Apache2::Response
-  PerlModule Apache2::RequestIO
-  PerlModule Apache2::ServerUtil
-  PerlModule Apache2::SubRequest
-  PerlModule Apache2::Upload
-</IfDefine>
-
 PerlModule Bric::App::ApacheConfig
 <IfDefine MODPERL2>
   Include /usr/local/bricolage/conf/vhosts.conf

diff --git a/lib/Bric/App/ApacheStartup.pm b/lib/Bric/App/ApacheStartup.pm
@@ -54,7 +54,23 @@ BEGIN {
         }
     }
     else {
-        if (eval{Apache2::ServerUtil->exists_config_define('BRICOLAGE_DEBUG')}) {
+        require mod_perl2;
+        require APR;
+        require APR::Request;
+        require APR::Request::Apache2;
+        require APR::Table;
+        require Apache2::Access;
+        require Apache2::Connection;
+        require Apache2::Log;
+        require Apache2::Request;
+        require Apache2::RequestRec;
+        require Apache2::RequestUtil;
+        require Apache2::Response;
+        require Apache2::RequestIO;
+        require Apache2::ServerUtil;
+        require Apache2::SubRequest;
+        require Apache2::Upload;
+        if ( eval{ Apache2::ServerUtil->exists_config_define('BRICOLAGE_DEBUG') } ) {
             require Apache::DB;
             Apache::DB->init;
             $DEBUGGING = 1;