diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-03-14 23:24:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 23:24:49 +0100 |
| commit | 51ac92ea47ae2ae43675e57185984f7fd57e07f1 (patch) | |
| tree | f823e2bdf2bd6dc4f92c1a08ae3d603708bba576 /mod_perl.pl | |
| parent | 1f043d69e2b017150bf49d80f01ce20143890344 (diff) | |
| download | bugzilla-51ac92ea47ae2ae43675e57185984f7fd57e07f1.tar.gz bugzilla-51ac92ea47ae2ae43675e57185984f7fd57e07f1.tar.xz | |
Bug 1445700 - apache_size_limit should be 800_000 when Linux::Smaps is not installed.
Diffstat (limited to 'mod_perl.pl')
| -rw-r--r-- | mod_perl.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod_perl.pl b/mod_perl.pl index 09fd80850..73406be56 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -55,6 +55,7 @@ use Apache2::SizeLimit; use ModPerl::RegistryLoader (); use File::Basename (); use File::Find (); +use English qw(-no_match_vars $OSNAME); # This loads most of our modules. use Bugzilla (); @@ -78,8 +79,9 @@ Bugzilla::CGI->compile(qw(:cgi :push)); # is taking up more than $apache_size_limit of RAM all by itself, not counting RAM it is # sharing with the other httpd processes. my $limit = Bugzilla->localconfig->{apache_size_limit}; -if ($limit < 400_000) { - $limit = 400_000; +if ($OSNAME eq 'linux' && ! eval { require Linux::Smaps }) { + warn "SizeLimit requires Linux::Smaps on linux. size limit set to 800MB"; + $limit = 800_000; } Apache2::SizeLimit->set_max_unshared_size($limit); |