From 7cdb619cc5932bda8fcdb91fdce73e0194cfda03 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Thu, 28 Aug 2014 17:39:50 -0700 Subject: [PATCH] HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. (cherry picked from commit 7119bd49c870cf1e6b8c091d87025b439b9468df) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/conf/ReconfigurationServlet.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index ca38400f303..5eaac3c6300 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -140,6 +140,9 @@ Release 2.6.0 - UNRELEASED HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) + HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. + (Lei Xu via wang) + OPTIMIZATIONS HADOOP-10838. Byte array native checksumming. (James Thomas via todd) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java index 3fa162b87af..eb1fb6b7d58 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java @@ -200,6 +200,7 @@ private void applyChanges(PrintWriter out, Reconfigurable reconf, protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { LOG.info("GET"); + resp.setContentType("text/html"); PrintWriter out = resp.getWriter(); Reconfigurable reconf = getReconfigurable(req); @@ -214,6 +215,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { LOG.info("POST"); + resp.setContentType("text/html"); PrintWriter out = resp.getWriter(); Reconfigurable reconf = getReconfigurable(req);