You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1999/08/04 01:50:59 UTC
cvs commit: modperl/lib/Apache SizeLimit.pm
dougm 99/08/03 16:50:59
Modified: . Changes ToDo
lib/Apache SizeLimit.pm
Log:
Apache::SizeLimit now uses $r->child_terminate instead of Apache::exit(-2)
Revision Changes Path
1.329 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- Changes 1999/08/03 23:25:11 1.328
+++ Changes 1999/08/03 23:50:57 1.329
@@ -8,6 +8,9 @@
=item 1.21_01-dev
+Apache::SizeLimit now uses $r->child_terminate instead of Apache::exit(-2)
+[Jon Peterson <jo...@snowdrift.org>]
+
get rid of various 5.005_60 warnings
add Status{Terse,Deparse,OptionsAll} options to Apache::Status
1.192 +0 -3 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /home/cvs/modperl/ToDo,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- ToDo 1999/07/27 00:33:51 1.191
+++ ToDo 1999/08/03 23:50:57 1.192
@@ -3,9 +3,6 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
-- Apache::SizeLimit should use $r->child_terminate instead of exit(-2)
- Jon Peterson <jo...@snowdrift.org>
-
- allow PerlSetVar to work w/o a request_rec
- pre-load OPT_EXECCGI
1.6 +2 -1 modperl/lib/Apache/SizeLimit.pm
Index: SizeLimit.pm
===================================================================
RCS file: /home/cvs/modperl/lib/Apache/SizeLimit.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SizeLimit.pm 1999/04/16 05:21:12 1.5
+++ SizeLimit.pm 1999/08/03 23:50:59 1.6
@@ -171,6 +171,7 @@
}
sub exit_if_too_big {
+ my $r = shift;
return if ($REQUEST_COUNT++ < $CHECK_EVERY_N_REQUESTS);
$REQUEST_COUNT = 1;
if (defined($MAX_PROCESS_SIZE)) {
@@ -179,7 +180,7 @@
# I have no idea if this will work on anything but UNIX
if (getppid > 1) { # this is a child httpd
&error_log("httpd process too big, exiting at SIZE=$size KB");
- Apache::exit(-2);
+ $r->child_terminate;
} else { # this is the main httpd
&error_log("main process too big, SIZE=$size KB");
}