From a6f20d80de3adbebacd586a534b474030ff608e9 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Sun, 22 Nov 2015 11:41:13 +0000 Subject: [PATCH] Revert "HADOOP-12584. Disable browsing the static directory in HttpServer2. Contributed by Robert Kanter." This reverts commit b7e3f419bdaa4d46ffb9829dd7873b5221cab077. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 --- .../src/main/java/org/apache/hadoop/http/HttpServer2.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 48c11b4c91..3058799d46 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1429,9 +1429,6 @@ Release 2.8.0 - UNRELEASED HADOOP-11901. BytesWritable fails to support 2G chunks due to integer overflow. (Reynold Xin via wheat9) - HADOOP-12584. Disable browsing the static directory in HttpServer2. - (Robert Kanter via wheat9) - Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES 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 633180c834..d59320554e 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 @@ -530,9 +530,6 @@ public final class HttpServer2 implements FilterContainer { staticContext.setResourceBase(appDir + "/static"); staticContext.addServlet(DefaultServlet.class, "/*"); staticContext.setDisplayName("static"); - @SuppressWarnings("unchecked") - Map params = staticContext.getInitParams(); - params.put("org.mortbay.jetty.servlet.Default.dirAllowed", "false"); setContextAttributes(staticContext, conf); defaultContexts.put(staticContext, true); }