dougm 97/09/10 10:43:26
Modified: src CHANGES
src/main http_config.h http_main.c http_main.h
Log:
add child_terminate() function
Submitted by: Doug MacEachern
Reviewed by: Alexei Kosut, Jim Jagielski, Rob Hartill
Revision Changes Path
1.432 +5 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- CHANGES 1997/09/09 18:36:53 1.431
+++ CHANGES 1997/09/10 17:43:17 1.432
@@ -1,5 +1,10 @@
Changes with Apache 1.3b1
+ *) API: New function child_terminate() triggers the child process to
+ exit, while allowing the child finish what it needs to for the
+ current request first.
+ [Doug MacEachern, Alexei Kosut]
+
*) Windows now defaults to using full status reports with mod_status.
[Alexei Kosut, PR #1094]
1.49 +1 -1 apachen/src/main/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_config.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- http_config.h 1997/09/02 16:19:17 1.48
+++ http_config.h 1997/09/10 17:43:21 1.49
@@ -246,7 +246,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19970902
+#define MODULE_MAGIC_NUMBER 19970909
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
1.216 +6 -0 apachen/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- http_main.c 1997/09/03 21:50:54 1.215
+++ http_main.c 1997/09/10 17:43:22 1.216
@@ -2591,6 +2591,12 @@
static int requests_this_child;
static fd_set main_fds;
+API_EXPORT(void) child_terminate (request_rec *r)
+{
+ r->connection->keepalive = 0;
+ requests_this_child = max_requests_per_child = 1;
+}
+
void child_main(int child_num_arg)
{
NET_SIZE_T clen;
1.17 +1 -0 apachen/src/main/http_main.h
Index: http_main.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- http_main.h 1997/07/21 05:53:46 1.16
+++ http_main.h 1997/09/10 17:43:23 1.17
@@ -91,6 +91,7 @@
API_EXPORT(void) kill_timeout (request_rec *);
API_EXPORT(void) reset_timeout (request_rec *);
+API_EXPORT(void) child_terminate (request_rec *r);
API_EXPORT(void) sync_scoreboard_image (void);
int update_child_status (int child_num, int status, request_rec *r);
void time_process_request (int child_num, int status);
