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/11/02 04:54:24 UTC
cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
wrowe 00/11/01 19:54:23
Modified: src/modules/mpm/winnt mpm_winnt.c
Log:
Cause the command line version of mpm_winnt to do nothing with the
service config unless the -k run argument is provided.
Submitted by: John Sterling <st...@covalent.net>
Reviewed by: William Rowe
Revision Changes Path
1.108 +6 -2 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.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mpm_winnt.c 2000/10/23 19:04:23 1.107
+++ mpm_winnt.c 2000/11/02 03:54:23 1.108
@@ -1824,6 +1824,7 @@
int fixed_args;
char *pid;
apr_getopt_t *opt;
+ int running_as_service = 1;
osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osver);
@@ -1931,7 +1932,10 @@
/* Provide a default 'run' -k arg to simplify signal_arg tests */
if (!signal_arg)
+ {
signal_arg = "run";
+ running_as_service = 0;
+ }
if (!strcasecmp(signal_arg, "runservice"))
{
@@ -1955,7 +1959,7 @@
}
}
- if (service_named == SERVICE_UNNAMED) {
+ if (service_named == SERVICE_UNNAMED && running_as_service) {
service_named = mpm_service_set_name(process->pool,
DEFAULT_SERVICE_NAME);
}
@@ -1969,7 +1973,7 @@
exit(1);
}
}
- else
+ else if (running_as_service)
{
if (service_named == APR_SUCCESS)
{