Hi Henrik,

At 01.23 17/09/2005, Henrik Nordstrom wrote:


The 2.5.STABLE11 release is now planned for Wednesday if no regression errors are found before then.

Any new (or old) problems found which also exists in 2.5.STABLE10 will not be considered to be fixed for the 2.5.STABLE11 release unless there is good reason to classify these as major or security issues. There is already too much changes.

I have just got the report of a Windows/Cygwin specific minor problem: the incoming Windows Vista (Longhorn) is not supported. I have a little patch to fix the problem, that I like to commit before STABLE11 release, if you agree.

Index: src/dns_internal.c
===================================================================
RCS file: /cvsroot/squid/squid/src/dns_internal.c,v
retrieving revision 1.15.6.8
diff -u -p -r1.15.6.8 dns_internal.c
--- src/dns_internal.c  12 May 2005 02:14:15 -0000      1.15.6.8
+++ src/dns_internal.c  20 Sep 2005 10:08:08 -0000
@@ -235,6 +235,7 @@ idnsParseWIN32Registry(void)
     case _WIN_OS_WIN2K:
     case _WIN_OS_WINXP:
     case _WIN_OS_WINNET:
+    case _WIN_OS_WINLON:
        /* get nameservers from the Windows 2000 registry */
        /* search all interfaces for DNS server addresses */
        if (RegOpenKey(HKEY_LOCAL_MACHINE,
Index: src/enums.h
===================================================================
RCS file: /cvsroot/squid/squid/src/enums.h,v
retrieving revision 1.29.2.16
diff -u -p -r1.29.2.16 enums.h
--- src/enums.h 11 Sep 2005 02:13:22 -0000      1.29.2.16
+++ src/enums.h 20 Sep 2005 10:08:09 -0000
@@ -735,7 +735,8 @@ enum {
     _WIN_OS_WINNT,
     _WIN_OS_WIN2K,
     _WIN_OS_WINXP,
-    _WIN_OS_WINNET
+    _WIN_OS_WINNET,
+    _WIN_OS_WINLON
 };

 #endif
Index: src/win32.c
===================================================================
RCS file: /cvsroot/squid/squid/src/win32.c,v
retrieving revision 1.5.6.1
diff -u -p -r1.5.6.1 win32.c
--- src/win32.c 26 Jun 2002 20:45:14 -0000      1.5.6.1
+++ src/win32.c 20 Sep 2005 10:08:09 -0000
@@ -58,9 +58,13 @@ GetOSVersion()
            return _WIN_OS_WINXP;
        }
        if ((osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion == 2)) {
-           WIN32_OS_string = xstrdup("Windows .NET");
+           WIN32_OS_string = xstrdup("Windows Server 2003");
            return _WIN_OS_WINNET;
        }
+       if ((osvi.dwMajorVersion == 6) && (osvi.dwMinorVersion == 0)) {
+           WIN32_OS_string = xstrdup("Windows code name \"Longhorn\"");
+           return _WIN_OS_WINLON;
+       }
        break;
     case VER_PLATFORM_WIN32_WINDOWS:
        if ((osvi.dwMajorVersion == 4) && (osvi.dwMinorVersion == 0)) {

Regards

Guido



-
========================================================
Guido Serassio
Acme Consulting S.r.l. - Microsoft Certified Partner
Via Lucia Savarino, 1           10098 - Rivoli (TO) - ITALY
Tel. : +39.011.9530135  Fax. : +39.011.9781115
Email: [EMAIL PROTECTED]
WWW: http://www.acmeconsulting.it/

Reply via email to