From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 31 Mar 2005 19:05:11 +0000 (+0000)
Subject:   httpd and Apache are both anticipated now.
X-Git-Tag: 2.1.5~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56406010b6c01ecf3707384728ce326fd783857a;p=thirdparty%2Fapache%2Fhttpd.git

  httpd and Apache are both anticipated now.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159627 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 78579e07f3f..a35313ba78d 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -997,8 +997,9 @@ BOOL GetApacheServicesStatus()
                     {
                         lstrcpy(szBuf, szImagePath);
                         CharLower(szBuf);
-                        /* the service name could be Apache*.exe */
-                        if ((strstr(szBuf, "\\apache") != NULL)
+                        /* the service name could be httpd*.exe or Apache*.exe */
+                        if (((strstr(szBuf, "\\apache") != NULL)
+                             || (strstr(szBuf, "\\httpd") != NULL))
                                 && strstr(szBuf, ".exe") 
                                 && (strstr(szBuf, "--ntservice") != NULL 
                                        || strstr(szBuf, "-k ") != NULL))