[v9_9] fix win32 isc_time_set()

- also, mark XSL files as cacheable

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index ddae53be218e245f835b4160ad4996f478de6ef4..8ec08d7b1959806f4eba5ba072bebf341297b35a 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1685,11 +1685,11 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp,
 #endif /* NEWSTATS */
 #endif
 #ifdef NEWSTATS
-       isc_httpdmgr_addurl(listener->httpdmgr, "/bind9.ver3.xsl", render_xsl,
-                           server);
+       isc_httpdmgr_addurl2(listener->httpdmgr, "/bind9.ver3.xsl", ISC_TRUE,
+                            render_xsl, server);
 #else /* OLDSTATS */
-       isc_httpdmgr_addurl(listener->httpdmgr, "/bind9.xsl", render_xsl,
-                           server);
+       isc_httpdmgr_addurl2(listener->httpdmgr, "/bind9.xsl", ISC_TRUE,
+                            render_xsl, server);
 #endif /* NEWSTATS */
        *listenerp = listener;
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,

diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index d5049950bfaae3eb3f7d4ce27693672b819342c5..6c38e25a55539949f9c54d5203a7c7d13c245d0d 100644 (file)
--- 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);