kore

commit ca05fb74d18795923e0337e33e4bdb8f5b740e13
parent 6028a3edc31f6fb21abdef1ec2a97a483bec035c
Author: Joris Vink <joris@coders.se>
Date:   Tue, 15 Oct 2013 15:06:19 +0200

Properly calculate GMT time in kore_date_to_time()

Diffstat:
src/utils.c
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/utils.c b/src/utils.c
@@ -163,11 +163,11 @@ kore_date_to_time(char *http_date)
 {
 	time_t			t;
 	int			err, i;
-	struct tm		tm, *gtm;
+	struct tm		tm, *ltm;
 	char			*args[7], *tbuf[5], *sdup;
 
 	time(&t);
-	gtm = gmtime(&t);
+	ltm = localtime(&t);
 	sdup = kore_strdup(http_date);
 
 	t = KORE_RESULT_ERROR;
@@ -177,8 +177,10 @@ kore_date_to_time(char *http_date)
 		goto out;
 	}
 
-	tm.tm_year = kore_strtonum(args[3], 10, 2013, 2068, &err) - 1900;
-	if (err == KORE_RESULT_ERROR || tm.tm_year < gtm->tm_year) {
+	memset(&tm, 0, sizeof(tm));
+
+	tm.tm_year = kore_strtonum(args[3], 10, 1900, 2068, &err) - 1900;
+	if (err == KORE_RESULT_ERROR || tm.tm_year < ltm->tm_year) {
 		kore_debug("misformed year in http-date: '%s'", http_date);
 		goto out;
 	}
@@ -206,13 +208,13 @@ kore_date_to_time(char *http_date)
 		goto out;
 	}
 
-	tm.tm_hour = kore_strtonum(tbuf[0], 10, 1, 23, &err);
+	tm.tm_hour = kore_strtonum(tbuf[0], 10, 0, 23, &err);
 	if (err == KORE_RESULT_ERROR) {
 		kore_debug("misformed hour in http-date: '%s'", http_date);
 		goto out;
 	}
 
-	tm.tm_min = kore_strtonum(tbuf[1], 10, 1, 59, &err);
+	tm.tm_min = kore_strtonum(tbuf[1], 10, 0, 59, &err);
 	if (err == KORE_RESULT_ERROR) {
 		kore_debug("misformed minutes in http-date: '%s'", http_date);
 		goto out;
@@ -224,7 +226,8 @@ kore_date_to_time(char *http_date)
 		goto out;
 	}
 
-	t = mktime(&tm);
+	tm.tm_isdst = ltm->tm_isdst;
+	t = mktime(&tm) + ltm->tm_gmtoff;
 	if (t == -1) {
 		t = 0;
 		kore_debug("mktime() on '%s' failed", http_date);