aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-12 15:33:35 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-12 15:33:35 -0400
commit4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 (patch)
treeedbb59f93ec3278d095cd57d6febfb164cd512ef /src/common/util.c
parentd40e8695f42959d180fe563d447422327535c753 (diff)
parent20b01cece8cd2ceb7f8051aee04294bdba471f1a (diff)
downloadtor-4165b1a0da893a9f67a2ba32b4fcd54a7804ce14.tar.gz
tor-4165b1a0da893a9f67a2ba32b4fcd54a7804ce14.zip
Merge branch 'bug18977_026_v2' into maint-0.2.7
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c
index b33c80fd45..86f36b8eb8 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1676,6 +1676,7 @@ parse_iso_time_(const char *cp, time_t *t, int strict)
st_tm.tm_hour = hour;
st_tm.tm_min = minute;
st_tm.tm_sec = second;
+ st_tm.tm_wday = 0; /* Should be ignored. */
if (st_tm.tm_year < 70) {
char *esc = esc_for_log(cp);
@@ -1743,6 +1744,7 @@ parse_http_time(const char *date, struct tm *tm)
tm->tm_hour = (int)tm_hour;
tm->tm_min = (int)tm_min;
tm->tm_sec = (int)tm_sec;
+ tm->tm_wday = 0; /* Leave this unset. */
month[3] = '\0';
/* Okay, now decode the month. */