From 1800fbe4862e5e810487bf27b0c8ef18c8ee4433 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 3 Feb 2006 12:08:31 +0000
Subject: [PATCH] don't warn when we receive a 503 from a dirserver/cache --
 this will pave the way for them being able to tell us to screw off if they're
 busy.

svn:r5898
---
 src/or/directory.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 9be6351356..8210108a92 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -891,6 +891,14 @@ connection_dir_client_reached_eof(connection_t *conn)
     }
   }
 
+  if (status_code == 503) {
+    info(LD_DIR,"Received http status code %d (\"%s\") from server "
+         "'%s:%d'. I'll try again soon.",
+         status_code, reason, conn->address, conn->port);
+    tor_free(body); tor_free(headers); tor_free(reason);
+    return -1;
+  }
+
   plausible = body_is_plausible(body, body_len, conn->purpose);
   if (compression || !plausible) {
     char *new_body = NULL;
@@ -950,12 +958,6 @@ connection_dir_client_reached_eof(connection_t *conn)
     /* fetch/process the directory to cache it. */
     info(LD_DIR,"Received directory (size %d) from server '%s:%d'",
          (int)body_len, conn->address, conn->port);
-    if (status_code == 503 || body_len == 0) {
-      info(LD_DIR,"Empty directory; status %d (\"%s\") Ignoring.",
-           status_code, reason);
-      tor_free(body); tor_free(headers); tor_free(reason);
-      return -1;
-    }
     if (status_code != 200) {
       warn(LD_DIR,"Received http status code %d (\"%s\") from server "
            "'%s:%d'. I'll try again soon.",