From 5361a919094ce14e1e349f66e02e70376ab349fd Mon Sep 17 00:00:00 2001
From: Varun Vasudev <vvasudev@apache.org>
Date: Wed, 25 May 2016 18:58:01 +0530
Subject: [PATCH] YARN-5115. Avoid setting CONTENT-DISPOSITION header in the
 container-logs web-service. Contributed by Xuan Gong.

(cherry picked from commit c52c15dd2df5050c6c3ddbe5ee708404f1920721)
---
 .../server/applicationhistoryservice/webapp/AHSWebServices.java | 2 --
 .../hadoop/yarn/server/nodemanager/webapp/NMWebServices.java    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
index deae8943eae..e422c353722 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSWebServices.java
@@ -312,8 +312,6 @@ private Response sendStreamOutputResponse(ApplicationId appId,
     ResponseBuilder response = Response.ok(stream);
     if (downloadFile) {
       response.header("Content-Type", "application/octet-stream");
-      response.header("Content-Disposition", "attachment; filename="
-          + fileName);
     }
     return response.build();
   }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java
index 57e729c025f..5c66511c5e1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMWebServices.java
@@ -255,8 +255,6 @@ public void write(OutputStream os) throws IOException,
       ResponseBuilder resp = Response.ok(stream);
       if (downloadFile) {
         resp.header("Content-Type", "application/octet-stream");
-        resp.header("Content-Disposition", "attachment; filename="
-            + logFile.getName());
       }
       return resp.build();
     } catch (IOException ex) {