Commit 74fb5b94 authored by Max Kanat-Alexander's avatar Max Kanat-Alexander

Bug 621597: Make mod_perl.pl do the INC configuration itself, instead of

requiring it to be in httpd.conf. r=dkl, a=mkanat
parent 9271e452
...@@ -1132,7 +1132,7 @@ max_allowed_packet=4M ...@@ -1132,7 +1132,7 @@ max_allowed_packet=4M
</warning> </warning>
<programlisting> <programlisting>
PerlSwitches -I/var/www/html/bugzilla -I/var/www/html/bugzilla/lib -w -T PerlSwitches -w -T
PerlConfigRequire /var/www/html/bugzilla/mod_perl.pl PerlConfigRequire /var/www/html/bugzilla/mod_perl.pl
</programlisting> </programlisting>
</step> </step>
......
...@@ -18,6 +18,13 @@ ...@@ -18,6 +18,13 @@
package Bugzilla::ModPerl; package Bugzilla::ModPerl;
use strict; use strict;
# This sets up our libpath without having to specify it in the mod_perl
# configuration.
use File::Basename;
use lib dirname(__FILE__);
use Bugzilla::Constants ();
use lib Bugzilla::Constants::bz_locations()->{'ext_libpath'};
# If you have an Apache2::Status handler in your Apache configuration, # If you have an Apache2::Status handler in your Apache configuration,
# you need to load Apache2::Status *here*, so that any later-loaded modules # you need to load Apache2::Status *here*, so that any later-loaded modules
# can report information to Apache2::Status. # can report information to Apache2::Status.
...@@ -36,7 +43,6 @@ use Bugzilla (); ...@@ -36,7 +43,6 @@ use Bugzilla ();
# Loading Bugzilla.pm doesn't load this, though, and we want it preloaded. # Loading Bugzilla.pm doesn't load this, though, and we want it preloaded.
use Bugzilla::BugMail (); use Bugzilla::BugMail ();
use Bugzilla::CGI (); use Bugzilla::CGI ();
use Bugzilla::Constants ();
use Bugzilla::Extension (); use Bugzilla::Extension ();
use Bugzilla::Install::Requirements (); use Bugzilla::Install::Requirements ();
use Bugzilla::Util (); use Bugzilla::Util ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment