diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-12-20 05:09:53 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-12-20 05:09:53 +0000 |
| commit | 349e55e6cb5b2150ca1ef8e1f3acfa506ba8d399 (patch) | |
| tree | a066351a617d2d98c64d602ae5a7eb42f2f8478b | |
| parent | 5fe06d0f027661547492e0ac12cf0fecf8dd7aa0 (diff) | |
| download | tor-349e55e6cb5b2150ca1ef8e1f3acfa506ba8d399.tar.gz tor-349e55e6cb5b2150ca1ef8e1f3acfa506ba8d399.zip | |
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
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/or/directory.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 diff --git a/src/or/directory.c b/src/or/directory.c index 6bed668ea5..792a847c22 100644 --- a/src/or/directory.c +++ b/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, |