Browse Source

HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Arun C. Murthy 10 years ago
parent
commit
797e62defa

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml

@@ -70,7 +70,7 @@
          described in the APR documentation -->
          described in the APR documentation -->
     <Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
     <Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
                maxThreads="150" scheme="https" secure="true"
-               clientAuth="false" sslEnabledProtocols="TLSv1"
+               clientAuth="false" sslEnabledProtocols="TLSv1,SSLv2Hello"
                keystoreFile="${httpfs.ssl.keystore.file}"
                keystoreFile="${httpfs.ssl.keystore.file}"
                keystorePass="${httpfs.ssl.keystore.pass}"/>
                keystorePass="${httpfs.ssl.keystore.pass}"/>
 
 

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -621,6 +621,8 @@ Release 2.6.0 - 2014-11-15
     HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
     HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
     (brandonli)
     (brandonli)
 
 
+    HDFS-7391. Renable SSLv2Hello in HttpFS. (rkanter via acmurthy)
+
     BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
     BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
   
   
       HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)
       HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)