hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [1/2] hadoop git commit: Revert "HADOOP-12584. Disable browsing the static directory in HttpServer2. Contributed by Robert Kanter."
Date Sun, 22 Nov 2015 11:41:27 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 cbbdbe3cd -> edcd0dc0b
  refs/heads/trunk 5b714a281 -> a6f20d80d


Revert "HADOOP-12584. Disable browsing the static directory in HttpServer2. Contributed by
Robert Kanter."

This reverts commit b7e3f419bdaa4d46ffb9829dd7873b5221cab077.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a6f20d80
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a6f20d80
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a6f20d80

Branch: refs/heads/trunk
Commit: a6f20d80de3adbebacd586a534b474030ff608e9
Parents: 5b714a2
Author: Steve Loughran <stevel@apache.org>
Authored: Sun Nov 22 11:41:13 2015 +0000
Committer: Steve Loughran <stevel@apache.org>
Committed: Sun Nov 22 11:41:13 2015 +0000

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                   | 3 ---
 .../src/main/java/org/apache/hadoop/http/HttpServer2.java         | 3 ---
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6f20d80/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 48c11b4..3058799 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6f20d80/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 633180c..d593205 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<String, String> params = staticContext.getInitParams();
-    params.put("org.mortbay.jetty.servlet.Default.dirAllowed", "false");
     setContextAttributes(staticContext, conf);
     defaultContexts.put(staticContext, true);
   }


Mime
View raw message