diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-04-25 15:47:07 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-04-25 15:47:07 +0300 |
| commit | 88d6c2568d4a1ccc6fd3865e95bfb5243bf90395 (patch) | |
| tree | 88d9169f0cddd879601af8f15d2f61e1cbef6a00 | |
| parent | e8b26bb71b3465bd770f6ecff5be1d4e9a26d460 (diff) | |
| parent | a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc (diff) | |
| download | tor-88d6c2568d4a1ccc6fd3865e95bfb5243bf90395.tar.gz tor-88d6c2568d4a1ccc6fd3865e95bfb5243bf90395.zip | |
Merge branch 'maint-0.4.0' into release-0.4.0
| -rw-r--r-- | changes/bug30001 | 7 | ||||
| -rw-r--r-- | src/feature/dircache/dircache.c | 2 | ||||
| -rw-r--r-- | src/test/test_dir_handle_get.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug30001 b/changes/bug30001 new file mode 100644 index 0000000000..52e58872ef --- /dev/null +++ b/changes/bug30001 @@ -0,0 +1,7 @@ + o Minor features (testing): + - Use the approx_time() function when setting the "Expires" header + in directory replies, to make them more testable. Needed for + ticket 30001. + o Minor bug fixes (testing): + - Check the time in the "Expires" header with approx_time(). + Fixes bug 30001; bugfix on 0.4.0.4-rc. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 62eb4c86c2..eece1e6503 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length, long cache_lifetime) { char date[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); buf_t *buf = buf_new_with_capacity(1024); tor_assert(conn); diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c3a17e7309..e57bd02584 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) /* Check cache lifetime */ char expbuf[RFC1123_TIME_LEN+1]; - time_t now = time(NULL); + time_t now = approx_time(); /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */ format_rfc1123_time(expbuf, (time_t)(now + 30*60)); char *expires = NULL; |