You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/10/03 00:33:00 UTC
cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
wrowe 00/10/02 15:32:59
Modified: src/modules/mpm/winnt mpm_winnt.c
Log:
Choices. Choose -X, -DONE_PROCESS or set ONE_PROCESS=token for the
diagnostic behavior.
Revision Changes Path
1.101 +9 -4 apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
Index: mpm_winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- mpm_winnt.c 2000/08/23 00:01:56 1.100
+++ mpm_winnt.c 2000/10/02 22:32:57 1.101
@@ -1834,8 +1834,6 @@
char *pid;
apr_getopt_t *opt;
- one_process = !!getenv("ONE_PROCESS");
-
osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osver);
@@ -1926,8 +1924,10 @@
/* TODO: warn of depreciated syntax, "use -k uninstall instead" */
signal_arg = "uninstall";
break;
+ case 'X':
+ one_process = -1;
+ break;
default:
- optbuf[1] = (char) opt;
new_arg = (char**) apr_push_array(mpm_new_argv);
*new_arg = apr_pstrdup(process->pool, optbuf);
if (optarg) {
@@ -2024,6 +2024,12 @@
*/
apr_status_t rv;
+ if (getenv("ONE_PROCESS"))
+ one_process = -1;
+
+ if (ap_exists_config_define("ONE_PROCESS"))
+ one_process = -1;
+
if (!strcasecmp(signal_arg, "runservice")
&& (osver.dwPlatformId == VER_PLATFORM_WIN32_NT)
&& (service_to_start_success != APR_SUCCESS)) {
@@ -2218,7 +2224,6 @@
static void winnt_hooks(void)
{
- one_process = 0;
ap_hook_pre_config(winnt_pre_config, NULL, NULL, AP_HOOK_MIDDLE);
ap_hook_post_config(winnt_post_config, NULL, NULL, 0);
}