Commit 865514e6 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'ticket28100_squashed'

parents f0bd6c2c 1b75de85
Loading
Loading
Loading
Loading

changes/ticket28100

0 → 100644
+3 −0
Original line number Diff line number Diff line
  o Minor features (HTTP standards compliance):
    - Don't send Content-Type: application/octet-stream for transparently
      compressed documents, which confused browsers. Closes ticket 28100.
+4 −10
Original line number Diff line number Diff line
@@ -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);
}