[tor-commits] [tor/master] Restore wget behavior when fetching compressed objects

[nickm at torproject.org]

commit 8266d193a608445b0d8675a83733870a2733e2b9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 10 11:09:52 2017 -0400

    Restore wget behavior when fetching compressed objects
    
    We do this by treating the presence of .z as meaning ZLIB_METHOD,
    even if Accept-Encoding does not include deflate.
    
    This fixes bug 22206; bug not in any released tor.
---
 src/or/directory.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 67c28e1..c1db40e 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3516,8 +3516,9 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers,
     tor_free(header);
   } else {
     compression_methods_supported = (1u << NO_METHOD);
-    if (zlib_compressed_in_url)
-      compression_methods_supported |= (1u << ZLIB_METHOD);
+  }
+  if (zlib_compressed_in_url) {
+    compression_methods_supported |= (1u << ZLIB_METHOD);
   }
 
   /* Remove all methods that we don't both support. */