r17271@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.


svn:r12883

ChangeLog

@@ -26,6 +26,9 @@ Changes in version 0.1.2.19 - 2007-??-??
     - 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

src/or/directory.c

@@ -1730,6 +1730,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
                  "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,