httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r536052 - /httpd/httpd/trunk/support/win32/ApacheMonitor.c
Date Tue, 08 May 2007 04:45:55 GMT
Author: mturk
Date: Mon May  7 21:45:54 2007
New Revision: 536052

URL: http://svn.apache.org/viewvc?view=rev&rev=536052
Log:
Add detection for post XP operating systems.
Think this can be safely backported to 2.2 and 2.0 branches

Modified:
    httpd/httpd/trunk/support/win32/ApacheMonitor.c

Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/win32/ApacheMonitor.c?view=diff&rev=536052&r1=536051&r2=536052
==============================================================================
--- httpd/httpd/trunk/support/win32/ApacheMonitor.c (original)
+++ httpd/httpd/trunk/support/win32/ApacheMonitor.c Mon May  7 21:45:54 2007
@@ -49,6 +49,8 @@
 #define OS_VERSION_WIN9X    1
 #define OS_VERSION_WINNT    2
 #define OS_VERSION_WIN2K    3
+#define OS_VERSION_WINXP    4
+#define OS_VERSION_VISTA    5
 /* Should be enough */
 #define MAX_APACHE_SERVICES 128
 #define MAX_APACHE_COMPUTERS 32
@@ -282,7 +284,13 @@
             *dwVersion = OS_VERSION_WINNT;
         }
         else if (osvi.dwMajorVersion == 5) {
-            *dwVersion = OS_VERSION_WIN2K;
+            if (osvi.dwMinorVersion == 1)
+                *dwVersion = OS_VERSION_WINXP;
+            else
+                *dwVersion = OS_VERSION_WIN2K;
+        }
+        else if (osvi.dwMajorVersion == 6) {
+            *dwVersion = OS_VERSION_VISTA;
         }
         else {
             return FALSE;



Mime
View raw message