Commit a trivial patch which permits Apache 2.0's ApacheMonitor

  to browse Apache 1.3, 2.0 and now, 2.1+ installed httpd services.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@202265 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 8241ce23f91a5b40ff9719a128ef9448f941d3e8..6392a1ff34f98c26a40e5a270520b641fe15a88c 100644 (file)
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -998,7 +998,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))