Repository: hadoop Updated Branches: refs/heads/trunk 26ebdd849 -> fdd3bc5f4
HADOOP-10746. HttpServer2 should not load JspServlet. Contributed by Haohui Mai. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fdd3bc5f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fdd3bc5f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fdd3bc5f Branch: refs/heads/trunk Commit: fdd3bc5f45da615db4fd51cc07cb7d44c211150d Parents: 26ebdd8 Author: Haohui Mai <[email protected]> Authored: Wed Aug 27 13:26:25 2014 -0700 Committer: Haohui Mai <[email protected]> Committed: Wed Aug 27 13:26:25 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../main/java/org/apache/hadoop/http/HttpServer2.java | 12 ++++++++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fdd3bc5f/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 45e38d3..b13cd79 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -323,6 +323,8 @@ Trunk (Unreleased) HADOOP-10996. Stop violence in the *_HOME (aw) + HADOOP-10748. HttpServer2 should not load JspServlet. (wheat9) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/fdd3bc5f/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java index f84ade0..8aa777b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; +import com.google.common.collect.ImmutableMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.HadoopIllegalArgumentException; @@ -415,6 +416,17 @@ public final class HttpServer2 implements FilterContainer { private static WebAppContext createWebAppContext(String name, Configuration conf, AccessControlList adminsAcl, final String appDir) { WebAppContext ctx = new WebAppContext(); + ctx.setDefaultsDescriptor(null); + ServletHolder holder = new ServletHolder(new DefaultServlet()); + Map<String, String> params = ImmutableMap. <String, String> builder() + .put("acceptRanges", "true") + .put("dirAllowed", "false") + .put("gzip", "true") + .put("useFileMappedBuffer", "true") + .build(); + holder.setInitParameters(params); + ctx.setWelcomeFiles(new String[] {"index.html"}); + ctx.addServlet(holder, "/"); ctx.setDisplayName(name); ctx.setContextPath("/"); ctx.setWar(appDir + "/" + name);
