diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-12 14:39:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-12 14:39:06 -0400 |
| commit | 20b01cece8cd2ceb7f8051aee04294bdba471f1a (patch) | |
| tree | 49af27aa7e343dce9e05507cee1b00c063e07a02 /src/common | |
| parent | 0b477bfd55b16d04ddd97cec09ec978e2a57ba3b (diff) | |
| parent | e57f26c135b03f5dbde77aea24551b6a9fc20889 (diff) | |
| download | tor-20b01cece8cd2ceb7f8051aee04294bdba471f1a.tar.gz tor-20b01cece8cd2ceb7f8051aee04294bdba471f1a.zip | |
Merge branch 'bug18977_024_v2' into bug18977_026_v2
Had conflicts related to other correct_tm bugs in 0.2.6. Added wday
for another case.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat.c | 4 | ||||
| -rw-r--r-- | src/common/util.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 1788e32ee3..103ce2486f 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2684,6 +2684,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; @@ -2692,6 +2693,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0; r->tm_sec = 0; @@ -2709,6 +2711,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@ -2722,6 +2725,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; diff --git a/src/common/util.c b/src/common/util.c index 442d57a2cf..a3a6ec8a56 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1758,6 +1758,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); @@ -1825,6 +1826,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. */ |