diff options
| author | Dylan Hardison <dylan@mozilla.com> | 2016-01-27 23:47:17 +0100 |
|---|---|---|
| committer | Dylan Hardison <dylan@mozilla.com> | 2016-01-27 23:47:55 +0100 |
| commit | 8c54443dd24eb15576dd5c2ebfbc6ce174276b3c (patch) | |
| tree | bef75c6b912268cba7a9730cc42ec31710cf4c4d | |
| parent | a8512cea01b427d2af0a980b856e06e307c4c185 (diff) | |
| download | bugzilla-8c54443dd24eb15576dd5c2ebfbc6ce174276b3c.tar.gz bugzilla-8c54443dd24eb15576dd5c2ebfbc6ce174276b3c.tar.xz | |
Bug 731589 - Move mod_perl's max_unshared size from mod_perl.pl to localconfig
r=dkl,a=dylan
| -rw-r--r-- | Bugzilla/Install/Localconfig.pm | 4 | ||||
| -rw-r--r-- | mod_perl.pl | 2 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index 9d385fc14..fae97c189 100644 --- 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 f0de2e553..032266fa2 100644 --- 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 4409d9ff3..61476d69c 100644 --- 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##. |