opendev/gerrit
Code Issues Proposed changes

Merge "Return 304 for not modified SmallResources"

Browse Source
This commit is contained in:
Shawn Pearce
2014-05-23 22:13:58 +00:00
committed by Gerrit Code Review
parent 560681a114 c06b6c4615
commit e35392e5f4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/SmallResource.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.httpd.plugins;
import com.google.common.net.HttpHeaders;
import com.google.gerrit.common.Nullable;
import java.io.IOException;
@@ -55,7 +56,13 @@ final class SmallResource extends Resource {
void send(HttpServletRequest req, HttpServletResponse res)
throws IOException {
if (0 < lastModified) {
res.setDateHeader("Last-Modified", lastModified);
long ifModifiedSince = req.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE);
if (ifModifiedSince > 0 && ifModifiedSince == lastModified) {
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
} else {
res.setDateHeader("Last-Modified", lastModified);
}
}
res.setContentType(contentType);
if (characterEncoding != null) {