We were computing the wrong Content-Length: header for directory

responses that need to be compressed on the fly, causing clients
asking for those items to always fail. Bugfix on 0.2.0.x; fixes
bug 593.

svn:r13268

diff --git a/ChangeLog b/ChangeLog
index 25f878c73d76a43dc87cb047b391da15d9c5f9a4..a9aa4692d2c808000b5a4fc1fcc4d6a942199e3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,11 @@ Changes in version 0.2.0.18-alpha - 2008-01-??
       code, which is causing log entries like "TLS error while
       renegotiating handshake". Disable it again. Resolves bug 590.
     - Fix a major memory leak when attempting to use the v2 TLS
-      handshake code.
+      handshake code. Bugfix on 0.2.0.x; fixes bug 589.
+    - We were computing the wrong Content-Length: header for directory
+      responses that need to be compressed on the fly, causing clients
+      asking for those items to always fail. Bugfix on 0.2.0.x; fixes
+      bug 593.
 
   o Major features:
     - Avoid going directly to the directory authorities even if you're a

diff --git a/src/or/directory.c b/src/or/directory.c
index fc5669062930c882ede5fc08623a2b9349e595a9..e4d127e650cc35b57b836bcae8cc54d521a8fa1d 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2387,9 +2387,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
     SMARTLIST_FOREACH(items, const char *, item, {
         size_t ln = strlen(item);
         if (deflated) {
-          body_len += ln; estimated_len += ln;
-        } else {
           estimated_len += ln/2;
+        } else {
+          body_len += ln; estimated_len += ln;
         }
       });