Merge pull request #9 from ikikko/master

JENKINS-17684 Remove Content-Type header when 304 not modified.
jenkinsci · May 30, 2013 · 7e57b9d · 7e57b9d
2 parents b844d0d + bbaf8fa
commit 7e57b9d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/src/java/winstone/WinstoneResponse.java b/src/java/winstone/WinstoneResponse.java
@@ -240,7 +240,7 @@ public void validateHeaders() {
 
         forceHeader(KEEP_ALIVE_HEADER, !closeAfterRequest() ? KEEP_ALIVE_OPEN : KEEP_ALIVE_CLOSE);
         String contentType = getHeader(CONTENT_TYPE_HEADER);
-        if (this.statusCode != SC_MOVED_TEMPORARILY) {
+        if (this.statusCode != SC_MOVED_TEMPORARILY && this.statusCode != SC_NOT_MODIFIED) {
             if (contentType == null) {
                 // Bypass normal encoding
                 forceHeader(CONTENT_TYPE_HEADER, "text/html;charset=" + getCharacterEncoding());

diff --git a/src/test/winstone/WinstoneResponseTest.java b/src/test/winstone/WinstoneResponseTest.java
@@ -1,10 +1,12 @@
 package winstone;
 
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
 public class WinstoneResponseTest {
 
@@ -19,4 +21,36 @@ public class WinstoneResponseTest {
         assertTrue("expires date format", cookieAsString.matches(".*Expires=\\w{3}, \\d{1,2}-\\w{3}-\\d{4} \\d{1,2}:\\d{1,2}:\\d{1,2} GMT.*"));
     }
 
+	@Test
+	public void testValidateHeadersWhenOk() throws Exception {
+		WinstoneResponse response = setupResponse(HttpServletResponse.SC_OK);
+
+		response.validateHeaders();
+		String contentType = response.getHeader(WinstoneResponse.CONTENT_TYPE_HEADER);
+
+		assertThat(contentType, containsString("text/html"));
+	}
+
+	@Test
+	public void testValidateHeadersWhenNotModified() throws Exception {
+		WinstoneResponse response = setupResponse(HttpServletResponse.SC_NOT_MODIFIED);
+
+		response.validateHeaders();
+		String contentType = response.getHeader(WinstoneResponse.CONTENT_TYPE_HEADER);
+
+		assertThat(contentType, is(nullValue()));
+	}
+
+	private WinstoneResponse setupResponse(int statusCode) {
+		WinstoneRequest request = new WinstoneRequest();
+		WinstoneResponse response = new WinstoneResponse();
+
+		response.setOutputStream(new WinstoneOutputStream(null, false));
+		response.setRequest(request);
+		response.setProtocol("HTTP/1.1");
+		response.setStatus(statusCode);
+
+		return response;
+	}
+
 }