Author: jing9
Date: Wed Feb 5 22:58:42 2014
New Revision: 1564980
URL: http://svn.apache.org/r1564980
Log:
HDFS-5873. Merge change r1564977 from branch-2.
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java?rev=1564980&r1=1564979&r2=1564980&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
Wed Feb 5 22:58:42 2014
@@ -34,13 +34,14 @@ public class HttpConfig {
HTTPS_ONLY,
HTTP_AND_HTTPS;
+ private static final Policy[] VALUES = values();
public static Policy fromString(String value) {
- if (HTTPS_ONLY.name().equalsIgnoreCase(value)) {
- return HTTPS_ONLY;
- } else if (HTTP_AND_HTTPS.name().equalsIgnoreCase(value)) {
- return HTTP_AND_HTTPS;
+ for (Policy p : VALUES) {
+ if (p.name().equalsIgnoreCase(value)) {
+ return p;
+ }
}
- return HTTP_ONLY;
+ return null;
}
public boolean isHttpEnabled() {
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm?rev=1564980&r1=1564979&r2=1564980&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
Wed Feb 5 22:58:42 2014
@@ -352,7 +352,8 @@ Configuration for <<<conf/core-site.xml>
| | | This value is deprecated. Use dfs.http.policy |
*-------------------------+-------------------------+------------------------+
| <<<dfs.http.policy>>> | <HTTP_ONLY> or <HTTPS_ONLY> or <HTTP_AND_HTTPS> | |
-| | | HTTPS_ONLY turns off http access |
+| | | HTTPS_ONLY turns off http access. This option takes precedence over |
+| | | the deprecated configuration dfs.https.enable and hadoop.ssl.enabled. |
*-------------------------+-------------------------+------------------------+
| <<<dfs.namenode.https-address>>> | <nn_host_fqdn:50470> | |
*-------------------------+-------------------------+------------------------+
