diff options
| author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-12-28 23:47:33 +0100 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-12-28 23:47:33 +0100 |
| commit | 74fb5b946e08a966bc24ed7855ff4eae364a31a3 (patch) | |
| tree | 9f7021139a0f8853d46121ba35c85806262618a8 | |
| parent | 9271e452372312c81e176fa9a67d8e631783b516 (diff) | |
| download | bugzilla-74fb5b946e08a966bc24ed7855ff4eae364a31a3.tar.gz bugzilla-74fb5b946e08a966bc24ed7855ff4eae364a31a3.tar.xz | |
Bug 621597: Make mod_perl.pl do the INC configuration itself, instead of
requiring it to be in httpd.conf.
r=dkl, a=mkanat
| -rw-r--r-- | docs/en/xml/installation.xml | 2 | ||||
| -rw-r--r-- | mod_perl.pl | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index cf4584a70..79ad19fbc 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1132,7 +1132,7 @@ max_allowed_packet=4M </warning> <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 </programlisting> </step> diff --git a/mod_perl.pl b/mod_perl.pl index abd018103..3551abdaf 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -18,6 +18,13 @@ package Bugzilla::ModPerl; 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, # you need to load Apache2::Status *here*, so that any later-loaded modules # can report information to Apache2::Status. @@ -36,7 +43,6 @@ use Bugzilla (); # Loading Bugzilla.pm doesn't load this, though, and we want it preloaded. use Bugzilla::BugMail (); use Bugzilla::CGI (); -use Bugzilla::Constants (); use Bugzilla::Extension (); use Bugzilla::Install::Requirements (); use Bugzilla::Util (); |