[or-cvs] r12883: Backport: When we decide to send a 503 in response to a requ (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-12-20 00:09:53 -0500 (Thu, 20 Dec 2007)
New Revision: 12883

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/directory.c
Log:
 r17271 at catbus:  nickm | 2007-12-20 00:05:49 -0500
 Backport: 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/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r17271] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-12-20 05:06:02 UTC (rev 12882)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-12-20 05:09:53 UTC (rev 12883)
@@ -26,6 +26,9 @@
     - Fix a couple of hard-to-trigger autoconf problems that could result
       in really weird results on platforms whose sys/types.h files define
       nonstandard integer types.
+    - 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.
 
 
 Changes in version 0.1.2.18 - 2007-10-28

Modified: tor/branches/tor-0_1_2-patches/src/or/directory.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/directory.c	2007-12-20 05:06:02 UTC (rev 12882)
+++ tor/branches/tor-0_1_2-patches/src/or/directory.c	2007-12-20 05:09:53 UTC (rev 12883)
@@ -1730,6 +1730,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;
         return 0;
       }
       write_http_response_header(conn, -1,