[or-cvs] r8766: Weasel points out that a routerdesc requested by digest can (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-10-19 19:28:38 -0400 (Thu, 19 Oct 2006)
New Revision: 8766

Modified:
   tor/trunk/
   tor/trunk/src/or/directory.c
Log:
 r9287 at Kushana:  nickm | 2006-10-19 19:28:31 -0400
 Weasel points out that a routerdesc requested by digest can never change.  Weasel is right.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9287] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2006-10-19 23:05:34 UTC (rev 8765)
+++ tor/trunk/src/or/directory.c	2006-10-19 23:28:38 UTC (rev 8766)
@@ -66,6 +66,7 @@
 #define RUNNINGROUTERS_CACHE_LIFETIME (20*60)
 #define NETWORKSTATUS_CACHE_LIFETIME (5*60)
 #define ROUTERDESC_CACHE_LIFETIME (30*60)
+#define ROUTERDESC_BY_DIGEST_CACHE_LIFETIME (48*60*60)
 #define ROBOTS_CACHE_LIFETIME (24*60*60)
 
 /********* END VARIABLES ************/
@@ -1617,7 +1618,7 @@
     } else if (!strcmpstart(url, "/tor/server/d/")) {
       request_type = deflated?"/tor/server/d.z":"/tor/server/d";
       if (smartlist_len(conn->fingerprint_stack) == 1)
-        cache_lifetime = ROUTERDESC_CACHE_LIFETIME;
+        cache_lifetime = ROUTERDESC_BY_DIGEST_CACHE_LIFETIME;
     } else {
       request_type = "/tor/server/?";
     }