timeouts could be logged incorrectly in win32 [rt18617]

diff --git a/CHANGES b/CHANGES
index c35b97ec1a81cb49a55c2ecfa22e701e2d6904f0..69a9381d900841d973bea13da52107e15feef019 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2438.  [bug]           Timeouts could be logged incorrectly under win32.
+                       [RT #18617]
+
 2437.  [bug]           Sockets could be closed too early, leading to
                        inconsistent states in the socket module. [RT #18298]
 

diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index 8b312d24a851daec227f281c8856e7b465e2b735..358d521532d23265e047d1317dc86a31ba30584d 100644 (file)
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.c,v 1.4.2.5.2.12 2008/09/11 06:14:46 each Exp $ */
+/* $Id: errno2result.c,v 1.4.2.5.2.13 2008/09/11 21:06:29 each Exp $ */
 
 #include <config.h>
 
@@ -79,6 +79,8 @@ isc__errno2resultx(int posixerrno, const char *file, int line) {
                return (ISC_R_NETUNREACH);
        case ERROR_PORT_UNREACHABLE:
                return (ISC_R_HOSTUNREACH);
+       case ERROR_SEM_TIMEOUT:
+               return (ISC_R_TIMEDOUT);
        case WSAECONNRESET:
        case WSAENETRESET:
        case WSAECONNABORTED: