From 3f48493bed22f9618a9330deaaaa070734989814 Mon Sep 17 00:00:00 2001
From: Karthik Kambatla <kasha@apache.org>
Date: Tue, 28 Oct 2014 17:21:20 -0700
Subject: [PATCH] HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)

---
 .../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml           | 2 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 eac6ee270ce..614b70295ac 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}"/>
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 0eb7a149696..cae2b02796c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1310,6 +1310,8 @@ Release 2.6.0 - UNRELEASED
     HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API
     on POSIX and Windows. (Xiaoyu Yao via cnauroth)
 
+    HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES