diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
| commit | ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5 (patch) | |
| tree | 483da9c8b66f4444bb8a410e3d599c7484ad721e /mod_perl.pl | |
| parent | daa2d6b1c40354ecce0e48e6c5ee686efe642c4b (diff) | |
| parent | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (diff) | |
| download | bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.gz bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.xz | |
Merge branch 'master' into unstable
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 3221af19f..c64352600 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -58,6 +58,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 (); @@ -81,8 +82,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); |