tor

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc
parent 24b68b4777225436c1f5f820e79a6a76ee973313
Author: George Kadianakis <desnacked@riseup.net>
Date:   Thu, 25 Apr 2019 15:46:45 +0300

Merge branch 'tor-github/pr/960' into maint-0.4.0

Diffstat:
A
changes/bug30001
 | 
7
+++++++
M
src/feature/dircache/dircache.c
 | 
2
+-
M
src/test/test_dir_handle_get.c
 | 
2
+-

3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/changes/bug30001 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
@@ -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
@@ -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;