diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/or/directory.c | 10 |
2 files changed, 9 insertions, 7 deletions
@@ -39,6 +39,12 @@ Changes in version 0.2.2.1-alpha - 2009-??-?? controllers. +Changes in version 0.2.1.17-?? - 2009-??-?? + o Minor bugfixes: + - Serve the DirPortFrontPage page even when we have been approaching + our quotas recently. Fixes bug 1013; bugfix on 0.2.1.8-alpha. + + Changes in version 0.2.1.16-rc - 2009-06-20 o Security fixes: - Fix an edge case where a malicious exit relay could convince a diff --git a/src/or/directory.c b/src/or/directory.c index 1b972a345b..daf2a15762 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2407,13 +2407,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, dlen = strlen(frontpage); /* Let's return a disclaimer page (users shouldn't use V1 anymore, and caches don't fetch '/', so this is safe). */ - if (global_write_bucket_low(TO_CONN(conn), dlen, 1)) { - log_info(LD_DIRSERV, - "Client asked for DirPortFrontPage content, but we've been " - "writing too many bytes lately. Sending 503 Dir busy."); - write_http_status_line(conn, 503, "Directory busy, try again later"); - goto done; - } + + /* [We don't check for write_bucket_low here, since we want to serve + * this page no matter what.] */ note_request(url, dlen); write_http_response_header_impl(conn, dlen, "text/html", "identity", NULL, DIRPORTFRONTPAGE_CACHE_LIFETIME); |