From: Evan Hunt <each@isc.org>
Date: Sun, 12 Jan 2014 06:01:40 +0000 (-0800)
Subject: [master] fix win32 isc_time_set()
X-Git-Tag: v9.10.0a2~109
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=dc1cfff92a77c5b47e5665a3c2f0153d79074f47;p=thirdparty%2Fbind9.git

[master] fix win32 isc_time_set()
---

diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index d5049950bfa..6c38e25a555 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -91,8 +91,8 @@ isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) {
 
 	SystemTimeToFileTime(&epoch, &temp);
 
-	i1.LowPart = t->absolute.dwLowDateTime;
-	i1.HighPart = t->absolute.dwHighDateTime;
+	i1.LowPart = temp.dwLowDateTime;
+	i1.HighPart = temp.dwHighDateTime;
 
 	i1.QuadPart += (unsigned __int64)nanoseconds/100;
 	i1.QuadPart += (unsigned __int64)seconds*10000000;
@@ -352,7 +352,7 @@ isc_time_parsehttptimestamp(char *buf, isc_time_t *t) {
 
 	REQUIRE(buf != NULL);
 	REQUIRE(t != NULL);
-	p = strptime(buf, "%a, %d %b %Y %H:%M:%S %Z", &t_tm);
+	p = strptime(buf, "%a, %d %b %Y %H:%M:%S", &t_tm);
 	if (p == NULL)
 		return (ISC_R_UNEXPECTED);
 	when = timetfromtm(&t_tm);