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...@apache.org on 2001/01/20 07:47:09 UTC
cvs commit: apache-1.3/src/os/win32 service.c
wrowe 01/01/19 22:47:09
Modified: src CHANGES
src/os/win32 service.c
Log:
The -k config patch created a glitch for the -i option (although the
-k install flavor worked, which is how I missed it.) Resolved.
Submitted by: Andrew Braund
Revision Changes Path
1.1618 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1617
retrieving revision 1.1618
diff -u -r1.1617 -r1.1618
--- CHANGES 2001/01/18 21:23:33 1.1617
+++ CHANGES 2001/01/20 06:47:07 1.1618
@@ -1,5 +1,9 @@
Changes with Apache 1.3.15
+ *) Fix a new problem introduced with the -k config syntax, that the
+ service installed with the -i flag would attempt to re-install
+ itself when starting the server. [William Rowe, Andrew Braund]
+
*) Fix the declaration of the module structure in mod_example.
PR#7095 [Gururaj Upadhye <gu...@enertec.com>]
1.39 +2 -2 apache-1.3/src/os/win32/service.c
Index: service.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/win32/service.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- service.c 2001/01/15 17:06:29 1.38
+++ service.c 2001/01/20 06:47:08 1.39
@@ -706,8 +706,8 @@
while (++argv, --argc) {
if ((**argv == '-') && strchr("kndf", argv[0][1]))
--argc, ++argv; /* Skip already handled -k -n -d -f options */
- else
- *(newelem++) = *argv, ++regargc;
+ else if ((**argv != '-') || !strchr("iu", argv[0][1]))
+ *(newelem++) = *argv, ++regargc; /* Ignoring -i -u options */
}
printf(reconfig ? "Reconfiguring the %s service\n"