cvs commit: apachen/src/main http_config.h
dgaudet 97/11/28 22:01:14 Modified:src/main http_config.h Log: notes from helping Rasmus with his php problem Revision ChangesPath 1.56 +5 -0 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.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- http_config.h 1997/10/28 22:38:46 1.55 +++ http_config.h 1997/11/29 06:01:13 1.56 @@ -175,6 +175,11 @@ struct module_struct *next; +/* init() occurs after config parsing, but before any children are + * forked. + * Modules should not rely on the order in which create_server_config + * and create_dir_config are called. + */ #ifdef ULTRIX_BRAIN_DEATH void (*init) (); void *(*create_dir_config) ();
cvs commit: apachen/src/main http_config.h
dougm 97/10/28 14:38:47 Modified:src/main http_config.h Log: bump MODULE_MAGIC_NUMBER for Martin's new custom config stuff Submitted by: Doug MacEachern Revision ChangesPath 1.55 +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.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- http_config.h 1997/10/26 20:19:38 1.54 +++ http_config.h 1997/10/28 22:38:46 1.55 @@ -245,7 +245,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970912 +#define MODULE_MAGIC_NUMBER 19971026 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apachen/src/main http_config.h
coar97/09/12 12:53:15 Modified:src CHANGES src/main http_config.h Log: Add a note to CHANGES about the set_last_modified() changes, and update the MODULE_MAGIC_NUMBER (thanks, Alexei!). Revision ChangesPath 1.435 +6 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.434 retrieving revision 1.435 diff -u -r1.434 -r1.435 --- CHANGES 1997/09/12 14:50:50 1.434 +++ CHANGES 1997/09/12 19:53:10 1.435 @@ -1,5 +1,11 @@ Changes with Apache 1.3b1 + *) set_last_modified() broken into set_last_modified(), set_etag(), and + meets_conditions(). This allows conditional HTTP selection to be + handled separately from the storing of the header fields, and provides + the ability for CGIs to set their own ETags for conditional checking. + [Ken Coar, Roy Fielding] PR#895 + *) Changes to mod_log_config to allow naming of format strings. Format nicknames are defined with "LogFormat fmt nickname", and can be used with "LogFormat nickname" and "CustomLog logtarget nickname". 1.50 +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.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- http_config.h 1997/09/10 17:43:21 1.49 +++ http_config.h 1997/09/12 19:53:14 1.50 @@ -246,7 +246,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970909 +#define MODULE_MAGIC_NUMBER 19970912 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apachen/src/main http_config.h http_main.c http_main.h
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 ChangesPath
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);
cvs commit: apachen/src/main http_config.h
coar97/09/02 09:19:18 Modified:src CHANGES src/main http_config.h Log: Yerg. Note MD5 renames in CHANGES, and bump the MODULE_MAGIC_NUMBER as a consequence. Revision ChangesPath 1.426 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- CHANGES 1997/08/31 22:36:21 1.425 +++ CHANGES 1997/09/02 16:19:14 1.426 @@ -1,5 +1,9 @@ Changes with Apache 1.3a2 + *) Some of the MD5 names defined in Apache have been renamed to have + an `ap_' prefix to avoid conflicts with routines supplied by + external libraries. [Ken Coar] + *) Removal of mod_auth_msql.c from the distribution. There are many other options for databases today. Rather than offer one option, offer none at this time. mod_auth_msql and other SQL database 1.48 +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.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- http_config.h 1997/09/01 04:14:48 1.47 +++ http_config.h 1997/09/02 16:19:17 1.48 @@ -246,7 +246,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970831 +#define MODULE_MAGIC_NUMBER 19970902 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apachen/src/main http_config.h
randy 97/08/31 21:14:49 Modified:src/main http_config.h Log: Bump the MODULE_MAGIC_NUMBER to indicated aplog_error() addition. Revision ChangesPath 1.47 +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.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- http_config.h 1997/08/25 16:02:28 1.46 +++ http_config.h 1997/09/01 04:14:48 1.47 @@ -246,7 +246,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970825 +#define MODULE_MAGIC_NUMBER 19970831 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
