You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/04/15 19:57:25 UTC
cvs commit: apache-1.3/src/os/win32 service.c
stoddard 00/04/15 10:57:25
Modified: src CHANGES
src/os/win32 service.c
Log:
Win32: Add dependency checking to the CreateService call to ensure
TCPIP and AFP (winsock) are started before Apache.
Submitted by: William Rowe
Reviewed by: Bill Stoddard
Revision Changes Path
1.1532 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1531
retrieving revision 1.1532
diff -u -r1.1531 -r1.1532
--- CHANGES 2000/04/04 16:51:05 1.1531
+++ CHANGES 2000/04/15 17:57:24 1.1532
@@ -1,4 +1,7 @@
Changes with Apache 1.3.13
+ *) Win32: Add dependency checking to the CreateService call to ensure
+ TCPIP and AFP (winsock) are started before Apache.
+ [William Rowe <wr...@lnd.com>]
*) FAQ changes related to tidying up historical documents on the web site.
[Joshua Slive <sl...@finance.commerce.ubc.ca>]
1.16 +10 -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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- service.c 2000/03/13 21:05:36 1.15
+++ service.c 2000/04/15 17:57:25 1.16
@@ -221,18 +221,26 @@
"OpenSCManager failed");
}
else {
+ /* Added dependencies for the following: TCPIP, AFD
+ * AFD is the winsock handler, TCPIP is self evident
+ *
+ * RPCSS is the Remote Procedure Call (RPC) Locator
+ * required for DCOM communication. I am far from
+ * convinced we should toggle this, but be warned that
+ * future apache modules or ISAPI dll's may depend on it.
+ */
schService = CreateService(
schSCManager, // SCManager database
service_name, // name of service
display_name, // name to display
SERVICE_ALL_ACCESS, // desired access
SERVICE_WIN32_OWN_PROCESS, // service type
- SERVICE_AUTO_START, // start type
+ SERVICE_AUTO_START, // start type
SERVICE_ERROR_NORMAL, // error control type
szQuotedPath, // service's binary
NULL, // no load ordering group
NULL, // no tag identifier
- NULL, // dependencies
+ "Tcpip\0Afd\0", // dependencies
NULL, // LocalSystem account
NULL); // no password