Merge changes I9639f01e,I34fbdd3f,Id85130d1 * changes: MimeTypes: Simple file extension to MIME type mapping Compress some relative links in Markdown Refactor MarkdownToHtml with Builder pattern
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java index 49c62df..2c94a27 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java
@@ -374,6 +374,7 @@ private Writer newWriter(HttpServletRequest req, HttpServletResponse res) throws IOException { OutputStream out; if (acceptsGzipEncoding(req)) { + res.addHeader(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING); res.setHeader(HttpHeaders.CONTENT_ENCODING, "gzip"); out = new GZIPOutputStream(res.getOutputStream()); } else {
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java b/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java index 8d04578..694a3c3 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/Renderer.java
@@ -164,6 +164,7 @@ res.setCharacterEncoding("UTF-8"); byte[] data = newRenderer(templateName).setData(soyData).render().getBytes(UTF_8); if (BaseServlet.acceptsGzipEncoding(req)) { + res.addHeader(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING); res.setHeader(HttpHeaders.CONTENT_ENCODING, "gzip"); data = BaseServlet.gzip(data); }
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java index 67bf2c2..822f2c4 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/doc/DocServlet.java
@@ -201,6 +201,7 @@ res.setCharacterEncoding(UTF_8.name()); setCacheHeaders(res); if (acceptsGzipEncoding(req)) { + res.addHeader(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING); res.setHeader(HttpHeaders.CONTENT_ENCODING, "gzip"); raw = gzip(raw); }