I posted this before, but I think Justin distracted everyone by saying
that he still wanted -X funtionality. That's all fine and dandy, but the
comments are just plain wrong today, so this patch fixes them.
(Hmmm, I wonder if it's still like this in worker too...)
-aaron
Index: server/mpm/perchild/perchild.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/perchild/perchild.c,v
retrieving revision 1.75
diff -u -r1.75 perchild.c
--- server/mpm/perchild/perchild.c 2001/08/27 19:34:34 1.75
+++ server/mpm/perchild/perchild.c 2001/08/30 00:39:00
@@ -170,10 +170,12 @@
server_rec *ap_server_conf;
-/* one_process --- debugging mode variable; can be set from the command line
- * with the -X flag. If set, this gets you the child_main loop running
- * in the process which originally started up (no detach, no make_child),
- * which is a pretty nice debugging environment. (You'll get a SIGHUP
+/* The perchild MPM respects a couple of runtime flags that can aid
+ * in debugging. Setting the -DNO_DETACH flag will prevent the root process
+ * from detaching from it's controlling terminal. Additionally, setting
+ * the -DONE_PROCESS flag (which implies -DNO_DETACH) will get you the
+ * child_main loop running in the process which originally started up.
+ * This gives you a pretty nice debugging environment. (You'll get a SIGHUP
* early in standalone_main; just continue through. This is the server
* trying to kill off any child processes which it might have lying
* around --- Apache doesn't keep track of their pids, it just sends
Index: server/mpm/prefork/prefork.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/prefork/prefork.c,v
retrieving revision 1.198
diff -u -r1.198 prefork.c
--- server/mpm/prefork/prefork.c 2001/08/20 19:47:52 1.198
+++ server/mpm/prefork/prefork.c 2001/08/30 00:39:01
@@ -156,10 +156,12 @@
static fd_set listenfds;
static int listenmaxfd;
-/* one_process --- debugging mode variable; can be set from the command line
- * with the -X flag. If set, this gets you the child_main loop running
- * in the process which originally started up (no detach, no make_child),
- * which is a pretty nice debugging environment. (You'll get a SIGHUP
+/* The prefork MPM respects a couple of runtime flags that can aid
+ * in debugging. Setting the -DNO_DETACH flag will prevent the root process
+ * from detaching from it's controlling terminal. Additionally, setting
+ * the -DONE_PROCESS flag (which implies -DNO_DETACH) will get you the
+ * child_main loop running in the process which originally started up.
+ * This gives you a pretty nice debugging environment. (You'll get a SIGHUP
* early in standalone_main; just continue through. This is the server
* trying to kill off any child processes which it might have lying
* around --- Apache doesn't keep track of their pids, it just sends
Index: server/mpm/spmt_os2/spmt_os2.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.101
diff -u -r1.101 spmt_os2.c
--- server/mpm/spmt_os2/spmt_os2.c 2001/08/20 19:47:52 1.101
+++ server/mpm/spmt_os2/spmt_os2.c 2001/08/30 00:39:03
@@ -104,10 +104,10 @@
server_rec *ap_server_conf;
-/* one_process --- debugging mode variable; can be set from the command line
- * with the -X flag. If set, this gets you the child_main loop running
- * in the process which originally started up (no detach, no make_child),
- * which is a pretty nice debugging environment. (You'll get a SIGHUP
+/* The spmt_os2 MPM respects a runtime flag that can aid
+ * in debugging. Setting the -DONE_PROCESS flag will get you the
+ * child_main loop running in the process which originally started up.
+ * This gives you a pretty nice debugging environment. (You'll get a SIGHUP
* early in standalone_main; just continue through. This is the server
* trying to kill off any child processes which it might have lying
* around --- Apache doesn't keep track of their pids, it just sends
Index: server/mpm/threaded/threaded.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/mpm/threaded/threaded.c,v
retrieving revision 1.61
diff -u -r1.61 threaded.c
--- server/mpm/threaded/threaded.c 2001/08/16 13:59:14 1.61
+++ server/mpm/threaded/threaded.c 2001/08/30 00:39:04
@@ -148,10 +148,13 @@
server_rec *ap_server_conf;
-/* one_process --- debugging mode variable; can be set from the command line
- * with the -X flag. If set, this gets you the child_main loop running
- * in the process which originally started up (no detach, no make_child),
- * which is a pretty nice debugging environment. (You'll get a SIGHUP
+
+/* The threaded MPM respects a couple of runtime flags that can aid
+ * in debugging. Setting the -DNO_DETACH flag will prevent the root process
+ * from detaching from it's controlling terminal. Additionally, setting
+ * the -DONE_PROCESS flag (which implies -DNO_DETACH) will get you the
+ * child_main loop running in the process which originally started up.
+ * This gives you a pretty nice debugging environment. (You'll get a SIGHUP
* early in standalone_main; just continue through. This is the server
* trying to kill off any child processes which it might have lying
* around --- Apache doesn't keep track of their pids, it just sends
