From fe886c6a2ab07d5db20fad555263acd69302f1b0 Mon Sep 17 00:00:00 2001 From: Dylan Hardison Date: Mon, 23 Nov 2015 09:34:20 -0500 Subject: Bug 1227031 - mod_perl workers are being terminated after 0 seconds --- mod_perl.pl | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'mod_perl.pl') diff --git a/mod_perl.pl b/mod_perl.pl index b4b4d4fc2..15230f615 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -37,6 +37,7 @@ use lib Bugzilla::Constants::bz_locations()->{'ext_libpath'}; use Apache2::Log (); use Apache2::ServerUtil; +use Apache2::SizeLimit; use ModPerl::RegistryLoader (); use File::Basename (); @@ -57,20 +58,10 @@ BEGIN { *CORE::GLOBAL::warn = \&Apache2::ServerRec::warn; } # Pre-compile the CGI.pm methods that we're going to use. Bugzilla::CGI->compile(qw(:cgi :push)); -use Apache2::SizeLimit; - # This means that every httpd child will die after processing a request if it # 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 $apache_size_limit = 250_000; -if (Bugzilla->localconfig->{apache_size_limit}) { - $apache_size_limit = Bugzilla->localconfig->{apache_size_limit}; -} -elsif (Bugzilla->params->{'urlbase'} eq 'https://bugzilla.mozilla.org/') { - $apache_size_limit = 700_000; -} - -Apache2::SizeLimit->set_max_unshared_size($apache_size_limit); +Apache2::SizeLimit->set_max_unshared_size(Bugzilla->localconfig->{apache_size_limit}); my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'}; -- cgit v1.2.3-24-g4f1b