tor

commit 865514e66ef6c99a53ae92b089d24a187513532d
parent f0bd6c2c9dbce3bff9ceea57f8d26e9807d7150d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  2 Nov 2018 13:19:24 -0400

Merge branch 'ticket28100_squashed'

Diffstat:
A
changes/ticket28100
 | 
3
+++
M
src/feature/dircache/dircache.c
 | 
14
++++----------

2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/changes/ticket28100 b/changes/ticket28100
@@ -0,0 +1,3 @@
+  o Minor features (HTTP standards compliance):
+    - Don't send Content-Type: application/octet-stream for transparently
+      compressed documents, which confused browsers. Closes ticket 28100.
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
@@ -166,22 +166,16 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length,
   buf_free(buf);
 }
 
-/** As write_http_response_header_impl, but sets encoding and content-typed
- * based on whether the response will be <b>compressed</b> or not. */
+/** As write_http_response_header_impl, but translates method into
+ * encoding */
 static void
 write_http_response_headers(dir_connection_t *conn, ssize_t length,
                             compress_method_t method,
                             const char *extra_headers, long cache_lifetime)
 {
-  const char *methodname = compression_method_get_name(method);
-  const char *doctype;
-  if (method == NO_METHOD)
-    doctype = "text/plain";
-  else
-    doctype = "application/octet-stream";
   write_http_response_header_impl(conn, length,
-                                  doctype,
-                                  methodname,
+                                  "text/plain",
+                                  compression_method_get_name(method),
                                   extra_headers,
                                   cache_lifetime);
 }