[or-cvs] r12882: When we decide to send a 503 in response to a request for se (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-12-20 00:06:02 -0500 (Thu, 20 Dec 2007)
New Revision: 12882

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
Log:
 r17270 at catbus:  nickm | 2007-12-20 00:04:21 -0500
 When we decide to send a 503 in response to a request for server descriptors, disable spooling so that we do not then send the descriptors anyway.  Fixes bug 539.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-12-20 04:54:06 UTC (rev 12881)
+++ tor/trunk/ChangeLog	2007-12-20 05:06:02 UTC (rev 12882)
@@ -85,7 +85,11 @@
     - Fix compilation with --disable-threads set.
     - Authorities decide whether they're authoritative for a given router
       based on the router's purpose.
-    - Don't crash on name lookup when we have no current consensus.
+    - Don't crash on name lookup when we have no current consensus.  Fixes
+      bug 538; bugfix on 0.2.0.x.
+    - When we decide to send a 503 response to a request for servers, do
+      not then also send the server descriptors: this defeats the whole
+      purpose.  Fixes bug 539; bugfix on 0.1.2.x.
 
   o Minor features:
     - On USR1, when dmalloc is in use, log the top 10 memory

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-12-20 04:54:06 UTC (rev 12881)
+++ tor/trunk/src/or/directory.c	2007-12-20 05:06:02 UTC (rev 12882)
@@ -2440,6 +2440,7 @@
                  "Client asked for server descriptors, but we've been "
                  "writing too many bytes lately. Sending 503 Dir busy.");
         write_http_status_line(conn, 503, "Directory busy, try again later");
+        conn->dir_spool_src = DIR_SPOOL_NONE;
         goto done;
       }
       write_http_response_header(conn, -1, deflated, cache_lifetime);