Bug 731589 - Move mod_perl's max_unshared size from mod_perl.pl to localconfig

r=dkl,a=dylan

diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 9d385fc141eb90d9708245f2b7eda69132379eda..fae97c189f5ae78950ec31ae99567d5c2da236bd 100644 (file)
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -132,6 +132,10 @@ use constant LOCALCONFIG_VARS => (
         # is larger than anybody would ever be able to brute-force.
         default => sub { generate_random_password(64) },
     },
+    {
+        name    => 'apache_size_limit',
+        default => 250000,
+    },
 );
 
 

diff --git a/mod_perl.pl b/mod_perl.pl
index f0de2e55314ec57638731c8d4faf23ff5c29b6d6..032266fa26b5623fa6e311de352db963ba97804a 100644 (file)
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -55,7 +55,7 @@ use Apache2::SizeLimit;
 # This means that every httpd child will die after processing
 # a CGI if it is taking up more than 45MB of RAM all by itself,
 # not counting RAM it is sharing with the other httpd processes.
-Apache2::SizeLimit->set_max_unshared_size(45_000);
+Apache2::SizeLimit->set_max_unshared_size(Bugzilla->localconfig->{apache_size_limit});
 
 my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'};
 

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 4409d9ff3cc772d49f01e87553cca48a5e4057fd..61476d69c7e0e26e542a9ea3f41cbe2df52a43a4 100644 (file)
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -305,6 +305,10 @@ and you cannot set this up any other way. YOU HAVE BEEN WARNED!
 If you set this to anything other than "", you will need to run checksetup.pl
 as ##root## or as a user who is a member of the specified group.
 END
+    localconfig_apache_size_limit => <<EOT,
+This is the max amount of unshared memory the apache process is allowed to use
+before Apache::SizeLimit kills it. This is only applicable when run under mod_perl.
+EOT
     max_allowed_packet => <<EOT,
 WARNING: You need to set the max_allowed_packet parameter in your MySQL
 configuration to at least ##needed##. Currently it is set to ##current##.