From ff21bfca71a7a0c5e038fb29b8953fac81c2ba2c Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Tue, 24 Jan 2012 18:07:45 +0100 Subject: Bug 633061: Require Apache2::SizeLimit 0.96 for proper operation on Linux r=dkl a=mkanat --- Bugzilla/Install/Requirements.pm | 5 ++--- mod_perl.pl | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 995529d79..73e22520a 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -355,9 +355,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 31741ace0..ac6956b1b 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -51,8 +51,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'}; -- cgit v1.2.3-24-g4f1b