Commit 8c54443d authored by Dylan Hardison's avatar Dylan Hardison

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

r=dkl,a=dylan
parent a8512cea
...@@ -132,6 +132,10 @@ use constant LOCALCONFIG_VARS => ( ...@@ -132,6 +132,10 @@ use constant LOCALCONFIG_VARS => (
# is larger than anybody would ever be able to brute-force. # is larger than anybody would ever be able to brute-force.
default => sub { generate_random_password(64) }, default => sub { generate_random_password(64) },
}, },
{
name => 'apache_size_limit',
default => 250000,
},
); );
......
...@@ -55,7 +55,7 @@ use Apache2::SizeLimit; ...@@ -55,7 +55,7 @@ use Apache2::SizeLimit;
# This means that every httpd child will die after processing # 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, # 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. # 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'}; my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'};
......
...@@ -305,6 +305,10 @@ and you cannot set this up any other way. YOU HAVE BEEN WARNED! ...@@ -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 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. as ##root## or as a user who is a member of the specified group.
END 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, max_allowed_packet => <<EOT,
WARNING: You need to set the max_allowed_packet parameter in your MySQL WARNING: You need to set the max_allowed_packet parameter in your MySQL
configuration to at least ##needed##. Currently it is set to ##current##. configuration to at least ##needed##. Currently it is set to ##current##.
......
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