You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/08/10 13:13:40 UTC
svn commit: r564552 - in /httpd/httpd/branches/2.2.x: STATUS
support/win32/ApacheMonitor.c
Author: jim
Date: Fri Aug 10 04:13:39 2007
New Revision: 564552
URL: http://svn.apache.org/viewvc?view=rev&rev=564552
Log:
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
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/support/win32/ApacheMonitor.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=564552&r1=564551&r2=564552
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 10 04:13:39 2007
@@ -78,19 +78,6 @@
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
Modified: httpd/httpd/branches/2.2.x/support/win32/ApacheMonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/win32/ApacheMonitor.c?view=diff&rev=564552&r1=564551&r2=564552
==============================================================================
--- httpd/httpd/branches/2.2.x/support/win32/ApacheMonitor.c (original)
+++ httpd/httpd/branches/2.2.x/support/win32/ApacheMonitor.c Fri Aug 10 04:13:39 2007
@@ -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 @@
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: