diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-09-11 10:41:59 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-09-11 13:13:07 -0400 |
commit | 973c18bf0e84d14d8006a9ae97fde7f7fb97e404 (patch) | |
tree | 4f8172e13883e45ecff9295737cc82e20dac3602 /src/or/directory.c | |
parent | 1c30e6abc93fa086a14d01d838066581a3657285 (diff) | |
download | tor-973c18bf0e84d14d8006a9ae97fde7f7fb97e404.tar tor-973c18bf0e84d14d8006a9ae97fde7f7fb97e404.tar.gz |
Fix assertion failure in tor_timegm.
Fixes bug 6811.
Diffstat (limited to 'src/or/directory.c')
-rw-r--r-- | src/or/directory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 29cf10cea..975f8910c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2493,7 +2493,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, if ((header = http_get_header(headers, "If-Modified-Since: "))) { struct tm tm; if (parse_http_time(header, &tm) == 0) { - if_modified_since = tor_timegm(&tm); + if (tor_timegm(&tm, &if_modified_since)<0) + if_modified_since = 0; } /* The correct behavior on a malformed If-Modified-Since header is to * act as if no If-Modified-Since header had been given. */ |