This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d623a8dd3 HDDS-6837. Avoid duplicate headers in HTTP response (#3500)
3d623a8dd3 is described below

commit 3d623a8dd337b507558d5b8fab745f3b420d7b87
Author: Ritesh H Shukla <[email protected]>
AuthorDate: Sun Jun 12 02:50:28 2022 -0700

    HDDS-6837. Avoid duplicate headers in HTTP response (#3500)
---
 .../main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java   | 2 +-
 .../main/java/org/apache/hadoop/hdds/server/http/NoCacheFilter.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
 
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
index 9df0ec03f4..9c241ca278 100644
--- 
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
+++ 
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
@@ -1674,7 +1674,7 @@ public final class HttpServer2 implements FilterContainer 
{
       } else if (mime.startsWith("application/xml")) {
         httpResponse.setContentType("text/xml; charset=utf-8");
       }
-      headerMap.forEach((k, v) -> httpResponse.addHeader(k, v));
+      headerMap.forEach((k, v) -> httpResponse.setHeader(k, v));
       chain.doFilter(quoted, httpResponse);
     }
 
diff --git 
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/NoCacheFilter.java
 
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/NoCacheFilter.java
index 825357bbdb..a12d95c7ff 100644
--- 
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/NoCacheFilter.java
+++ 
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/NoCacheFilter.java
@@ -42,9 +42,9 @@ public class NoCacheFilter implements Filter {
     HttpServletResponse httpRes = (HttpServletResponse) res;
     httpRes.setHeader("Cache-Control", "no-cache");
     long now = System.currentTimeMillis();
-    httpRes.addDateHeader("Expires", now);
-    httpRes.addDateHeader("Date", now);
-    httpRes.addHeader("Pragma", "no-cache");
+    httpRes.setDateHeader("Expires", now);
+    httpRes.setDateHeader("Date", now);
+    httpRes.setHeader("Pragma", "no-cache");
     chain.doFilter(req, res);
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to