[or-cvs] r11095: Make if-modified-since work on consensuses (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-13 17:19:54 -0400 (Mon, 13 Aug 2007)
New Revision: 11095

Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r14546 at catbus:  nickm | 2007-08-13 17:19:01 -0400
 Make if-modified-since work on consensuses



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14546] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-08-13 21:01:02 UTC (rev 11094)
+++ tor/trunk/src/or/dirserv.c	2007-08-13 21:19:54 UTC (rev 11095)
@@ -2723,6 +2723,8 @@
     cached_dir_t *d;
     if (router_digest_is_me(digest) && the_v2_networkstatus)
       d = the_v2_networkstatus;
+    else if (tor_digest_is_zero(digest) && cached_v3_networkstatus)
+      d = cached_v3_networkstatus;
     else
       d = digestmap_get(cached_v2_networkstatus, digest);
     if (d && d->published <= cutoff) {