Merge r536052, r556879, r557188 from trunk:

Add detection for post XP operating systems.
Think this can be safely backported to 2.2 and 2.0 branches

ApacheMonitor valid OS is any WIN32_NT version.

Simplify OS detection. We are only interested in NT
and WIN2K+ (so we can use services.msc)
Submitted by: mturk
Reviewed by: jim

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

diff --git a/STATUS b/STATUS
index ac8d555e25b463ea4d13d115328efeaacc3b528f..a6cc74fd246344e68adb2ee229e4b462e1246e23 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -78,19 +78,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * ApacheMonitor: Fix Windows Vista detection.
-      http://svn.apache.org/viewvc?view=rev&revision=536052
-      http://svn.apache.org/viewvc?view=rev&revision=556879
-      http://svn.apache.org/viewvc?view=rev&revision=557188      
-      +1: mturk, jim (by inspection), sctemme (ditto)
-      wrowe notes post today to list, can we please test for >= VISTA
-      so this doesn't break again upon the release of longhorn server
-      or 'nextgen' windows?
-      mturk notes: Simplified OS detection so any NT version will work
-      sctemme notes: we're effectively voting on
-      svn diff -r536051:557188 \
-          http://svn.apache.org/repos/asf/httpd/httpd/trunk/support/win32/ApacheMonitor.c
-
     * mod_proxy_ajp: Add support of ProxyIOBufferSize.
       Trunk version of patch:
         http://svn.apache.org/viewvc?view=rev&rev=467014

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 1ea839aefccea12c696852f0135520adb1fb9b76..128d9cc2870ebb31ad964732d1badb0818351b8c 100644 (file)
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -49,6 +49,7 @@
 #define OS_VERSION_WIN9X    1
 #define OS_VERSION_WINNT    2
 #define OS_VERSION_WIN2K    3
+
 /* Should be enough */
 #define MAX_APACHE_SERVICES 128
 #define MAX_APACHE_COMPUTERS 32
@@ -278,15 +279,10 @@ BOOL GetSystemOSVersion(LPDWORD dwVersion)
     switch (osvi.dwPlatformId)
     {
     case VER_PLATFORM_WIN32_NT:
-        if (osvi.dwMajorVersion <= 4) {
-            *dwVersion = OS_VERSION_WINNT;
-        }
-        else if (osvi.dwMajorVersion == 5) {
+        if (osvi.dwMajorVersion >= 5)
             *dwVersion = OS_VERSION_WIN2K;
-        }
-        else {
-            return FALSE;
-        }
+        else
+            *dwVersion = OS_VERSION_WINNT;            
         break;
 
     case VER_PLATFORM_WIN32_WINDOWS: