hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [1/3] git commit: HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
Date Wed, 05 Nov 2014 00:53:54 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.5 8103c3008 -> 7ded6c54a


HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)

(cherry picked from commit 3f48493bed22f9618a9330deaaaa070734989814)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit c0b17bf10467a890982863758746ed471e43c0ae)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt


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

Branch: refs/heads/branch-2.5
Commit: 112b469c5c1bf2e4a997e52e82c1df390c1bf335
Parents: 8103c30
Author: Karthik Kambatla <kasha@apache.org>
Authored: Tue Oct 28 17:21:20 2014 -0700
Committer: Karthik Kambatla <kasha@apache.org>
Committed: Tue Nov 4 16:43:19 2014 -0800

----------------------------------------------------------------------
 .../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/112b469c/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
index eac6ee2..614b702 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
@@ -70,7 +70,7 @@
          described in the APR documentation -->
     <Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS"
+               clientAuth="false" sslEnabledProtocols="TLSv1"
                keystoreFile="${httpfs.ssl.keystore.file}"
                keystorePass="${httpfs.ssl.keystore.pass}"/>
 


Mime
View raw message