opendev/gerrit
Code Issues Proposed changes

Merge "[BugFix] set Last-Modified on cached Documentation resources"

Browse Source
This commit is contained in:
Edwin Kempin
2014-05-16 14:30:56 +00:00
committed by Gerrit Code Review
parent 5aaf7d1c30 61cd957b52
commit 7626bb107f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java
View File

@@ -293,7 +293,8 @@ class HttpPluginServlet extends HttpServlet
} }
if (!exists(entry) && file.endsWith("/index.html")) { if (!exists(entry) && file.endsWith("/index.html")) {
String pfx = file.substring(0, file.length() - "index.html".length()); String pfx = file.substring(0, file.length() - "index.html".length());
sendAutoIndex(jar, pfx, holder.plugin.getName(), key, res); sendAutoIndex(jar, pfx, holder.plugin.getName(), key, res,
holder.plugin.getSrcFile().lastModified());
} else if (exists(entry) && entry.getName().endsWith(".md")) { } else if (exists(entry) && entry.getName().endsWith(".md")) {
sendMarkdownAsHtml(jar, entry, holder.plugin.getName(), key, res); sendMarkdownAsHtml(jar, entry, holder.plugin.getName(), key, res);
} else if (exists(entry)) { } else if (exists(entry)) {
@@ -335,7 +336,8 @@ class HttpPluginServlet extends HttpServlet
private void sendAutoIndex(JarFile jar, private void sendAutoIndex(JarFile jar,
String prefix, String pluginName, String prefix, String pluginName,
ResourceKey cacheKey, HttpServletResponse res) throws IOException { ResourceKey cacheKey, HttpServletResponse res, long lastModifiedTime)
throws IOException {
List<JarEntry> cmds = Lists.newArrayList(); List<JarEntry> cmds = Lists.newArrayList();
List<JarEntry> servlets = Lists.newArrayList(); List<JarEntry> servlets = Lists.newArrayList();
List<JarEntry> restApis = Lists.newArrayList(); List<JarEntry> restApis = Lists.newArrayList();
@@ -411,11 +413,11 @@ class HttpPluginServlet extends HttpServlet
appendEntriesSection(jar, restApis, "REST APIs", md, prefix, "rest-api-".length()); appendEntriesSection(jar, restApis, "REST APIs", md, prefix, "rest-api-".length());
appendEntriesSection(jar, cmds, "Commands", md, prefix, "cmd-".length()); appendEntriesSection(jar, cmds, "Commands", md, prefix, "cmd-".length());
sendMarkdownAsHtml(md.toString(), pluginName, cacheKey, res); sendMarkdownAsHtml(md.toString(), pluginName, cacheKey, res, lastModifiedTime);
} }
private void sendMarkdownAsHtml(String md, String pluginName, private void sendMarkdownAsHtml(String md, String pluginName,
ResourceKey cacheKey, HttpServletResponse res) ResourceKey cacheKey, HttpServletResponse res, long lastModifiedTime)
throws UnsupportedEncodingException, IOException { throws UnsupportedEncodingException, IOException {
Map<String, String> macros = Maps.newHashMap(); Map<String, String> macros = Maps.newHashMap();
macros.put("PLUGIN", pluginName); macros.put("PLUGIN", pluginName);
@@ -446,7 +448,8 @@ class HttpPluginServlet extends HttpServlet
.markdownToDocHtml(sb.toString(), "UTF-8"); .markdownToDocHtml(sb.toString(), "UTF-8");
resourceCache.put(cacheKey, new SmallResource(html) resourceCache.put(cacheKey, new SmallResource(html)
.setContentType("text/html") .setContentType("text/html")
.setCharacterEncoding("UTF-8")); .setCharacterEncoding("UTF-8")
.setLastModified(lastModifiedTime));
res.setContentType("text/html"); res.setContentType("text/html");
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
res.setContentLength(html.length); res.setContentLength(html.length);
@@ -535,7 +538,7 @@ class HttpPluginServlet extends HttpServlet
if (0 < time) { if (0 < time) {
res.setDateHeader("Last-Modified", time); res.setDateHeader("Last-Modified", time);
} }
sendMarkdownAsHtml(txtmd, pluginName, key, res); sendMarkdownAsHtml(txtmd, pluginName, key, res, time);
} }
private void sendResource(JarFile jar, JarEntry entry, private void sendResource(JarFile jar, JarEntry entry,