Repository: zeppelin Updated Branches: refs/heads/master afd324e02 -> 1ec869f38
[ZEPPELIN-3080] Removing duplicate Date header ### What is this PR for? Removing the duplicate Date header that is also in the wrong format according to the RFC, currently every request contains the following headers (using `curl -I`) ``` HTTP/1.1 200 OK Date: Monday, November 27, 2017 3:20:42 PM UTC Access-Control-Allow-Credentials: true Access-Control-Allow-Headers: authorization,Content-Type Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, HEAD, DELETE X-FRAME-OPTIONS: SAMEORIGIN X-XSS-Protection: 1 Content-Type: application/octet-stream Date: Mon, 27 Nov 2017 15:20:42 GMT Content-Length: 59 Server: Jetty(9.2.15.v20160210) ``` ### What type of PR is it? Bug Fix ### What is the Jira issue? [ZEPPELIN-3080](https://issues.apache.org/jira/browse/ZEPPELIN-3080) ### Questions: * Does the licenses files need update? Nope * Is there breaking changes for older versions? Nope * Does this needs documentation? Nope Author: Sjoerd Mulder <[email protected]> Closes #3052 from sjoerdmulder/patch-2 and squashes the following commits: f734c1801 [Sjoerd Mulder] Update CorsFilter.java 1ebd1ad71 [Sjoerd Mulder] Removing duplicate Date header Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1ec869f3 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1ec869f3 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1ec869f3 Branch: refs/heads/master Commit: 1ec869f38deb79a9a7f8b10fb0ba2e00b4ac3abf Parents: afd324e Author: Sjoerd Mulder <[email protected]> Authored: Wed Jul 4 12:28:33 2018 +0200 Committer: Jongyoul Lee <[email protected]> Committed: Mon Jul 9 08:09:02 2018 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/server/CorsFilter.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1ec869f3/zeppelin-server/src/main/java/org/apache/zeppelin/server/CorsFilter.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/CorsFilter.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/CorsFilter.java index cfc2efe..efbd8c5 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/CorsFilter.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/CorsFilter.java @@ -21,9 +21,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.URISyntaxException; -import java.text.DateFormat; -import java.util.Date; -import java.util.Locale; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -75,9 +72,7 @@ public class CorsFilter implements Filter { response.setHeader("Access-Control-Allow-Credentials", "true"); response.setHeader("Access-Control-Allow-Headers", "authorization,Content-Type"); response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, HEAD, DELETE"); - DateFormat fullDateFormatEN = - DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, new Locale("EN", "en")); - response.setHeader("Date", fullDateFormatEN.format(new Date())); + ZeppelinConfiguration zeppelinConfiguration = ZeppelinConfiguration.create(); response.setHeader("X-FRAME-OPTIONS", zeppelinConfiguration.getXFrameOptions()); if (zeppelinConfiguration.useSsl()) {
