From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 19 Mar 2010 14:51:12 +0000 (+0000)
Subject: uhttpd: explicitely use gmt times
X-Git-Tag: 0.10.0~805
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=66ffcefa5555b35fc2e71429d9be16ac6de82801;p=oweals%2Fluci.git

uhttpd: explicitely use gmt times
---

diff --git a/contrib/package/uhttpd/src/uhttpd-file.c b/contrib/package/uhttpd/src/uhttpd-file.c
index fb70b33bf..c0e353a8e 100644
--- a/contrib/package/uhttpd/src/uhttpd-file.c
+++ b/contrib/package/uhttpd/src/uhttpd-file.c
@@ -53,7 +53,7 @@ static time_t uh_file_date2unix(const char *date)
 	memset(&t, 0, sizeof(t));
 
 	if( strptime(date, "%a, %d %b %Y %H:%M:%S %Z", &t) != NULL )
-		return mktime(&t);
+		return timegm(&t);
 
 	return 0;
 }
@@ -61,9 +61,9 @@ static time_t uh_file_date2unix(const char *date)
 static char * uh_file_unix2date(time_t ts)
 {
 	static char str[128];
-	struct tm *t = localtime(&ts);
+	struct tm *t = gmtime(&ts);
 
-	strftime(str, sizeof(str), "%a, %d %b %Y %H:%M:%S %Z", t);
+	strftime(str, sizeof(str), "%a, %d %b %Y %H:%M:%S GMT", t);
 
 	return str;
 }