summaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-12 15:33:47 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-12 15:33:47 -0400
commite8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1 (patch)
tree542f6c5e4efe8c4e4c2ff9cb1dab099d18e9791f /src/common/util.c
parentce6f2d1c4da5125cdd4a69fcc4cd45f7c3d6ca8d (diff)
parent4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 (diff)
downloadtor-e8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1.tar.gz
tor-e8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1.zip
Merge branch 'maint-0.2.7' into maint-0.2.8
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 008c682b3b..f3effe0957 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1723,6 +1723,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);
@@ -1790,6 +1791,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. */