Skip to content

Commit

Permalink
Bug 731589 - Move mod_perl's max_unshared size from mod_perl.pl to lo…
Browse files Browse the repository at this point in the history
…calconfig

r=dkl,a=dylan
  • Loading branch information
Dylan Hardison committed Jan 27, 2016
1 parent a8512ce commit 8c54443
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Bugzilla/Install/Localconfig.pm
Expand Up @@ -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,
},
);


Expand Down
2 changes: 1 addition & 1 deletion mod_perl.pl
Expand Up @@ -55,7 +55,7 @@ package Bugzilla::ModPerl;
# 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'};

Expand Down
4 changes: 4 additions & 0 deletions template/en/default/setup/strings.txt.pl
Expand Up @@ -305,6 +305,10 @@ END
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##.
Expand Down

0 comments on commit 8c54443

Please sign in to comment.