diff options
| author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2012-01-24 18:09:59 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2012-01-24 18:09:59 +0100 |
| commit | 7d8c9ccfb3c5983968ff5ae1b38471be18a49501 (patch) | |
| tree | 2e780d4831e47a30ad1a7aa2c7722af4cf6c4a28 | |
| parent | e226fcca85ec11a7f1004c31070721bfabc67625 (diff) | |
| download | bugzilla-7d8c9ccfb3c5983968ff5ae1b38471be18a49501.tar.gz bugzilla-7d8c9ccfb3c5983968ff5ae1b38471be18a49501.tar.xz | |
Bug 633061: Require Apache2::SizeLimit 0.96 for proper operation on Linux
r=dkl a=mkanat
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 5 | ||||
| -rw-r--r-- | mod_perl.pl | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index ef4bf3d22..1e7fc97c6 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -358,9 +358,8 @@ sub OPTIONAL_MODULES { { package => 'Apache-SizeLimit', module => 'Apache2::SizeLimit', - # 0.93 fixes problems on Linux and Windows, and changes the - # syntax used by SizeLimit. - version => '0.93', + # 0.96 properly determines process size on Linux. + version => '0.96', feature => ['mod_perl'], }, ); diff --git a/mod_perl.pl b/mod_perl.pl index 2f4016952..f3dae34c1 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -59,8 +59,9 @@ Bugzilla::CGI->compile(qw(:cgi :push)); use Apache2::SizeLimit; # This means that every httpd child will die after processing -# a CGI if it is taking up more than 70MB of RAM all by itself. -Apache2::SizeLimit->set_max_unshared_size(70_000); +# 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); my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'}; |