From: Evan Hunt <each@isc.org>
Date: Tue, 2 Apr 2013 05:27:49 +0000 (-0700)
Subject: [master] fix isc_time_formathttptmestamp() on win32
X-Git-Tag: v9.10.0a1~448^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99bf6a57d9f6b55da6de9c22fb6883a4bf7d569e;p=thirdparty%2Fbind9.git

[master] fix isc_time_formathttptmestamp() on win32

3539.	[port]		win32: timestamp format didn't match other platforms.
---

diff --git a/CHANGES b/CHANGES
index 52170194475..85fec43eb61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3539.	[port]		win32: timestamp format didn't match other platforms.
+
 3538.	[test]		Running "make test" now requires loopback interfaces
 			to be set up. [RT #32452]
 
diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index 8aaf6bc65f1..acbb2635e7e 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -287,7 +287,7 @@ isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) {
 	REQUIRE(len > 0);
 	if (FileTimeToSystemTime(&t->absolute, &st)) {
 		GetDateFormat(LOCALE_USER_DEFAULT, 0, &st,
-			      "ddd',', dd-MMM-yyyy", DateBuf, 50);
+			      "ddd',' dd MMM yyyy", DateBuf, 50);
 		GetTimeFormat(LOCALE_USER_DEFAULT,
 			      TIME_NOTIMEMARKER | TIME_FORCE24HOURFORMAT,
 			      &st, "hh':'mm':'ss", TimeBuf, 50);