[master] fix isc_time_formathttptmestamp() on win32

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

diff --git a/CHANGES b/CHANGES
index 52170194475c16c65f4ffa794179c7cc1ed3444d..85fec43eb61c34a5fbe4ebfeefdd1fb2967a2745 100644 (file)
--- 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 8aaf6bc65f1f311cc2ef8561ac907c4ac030b6e6..acbb2635e7eb310ad2cb069a4d52c6b726a95d53 100644 (file)
--- 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);