Bug 1391542 - Port bug 1388925: Add TLS flags parameter in call to nsTLSSocketProvider::AddToSocket. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Fri, 18 Aug 2017 09:03:38 +0200
changeset 28750 b4e63085ac33cf30f17b312181780f20ed850494
parent 28749 ee3ba3bf21dc36d92d3db63e67cfb87d03411c81
child 28751 519cd0ec740a38c471127046a23b53133378bd32
push id2027
push userclokep@gmail.com
push dateFri, 22 Sep 2017 15:34:57 +0000
treeherdercomm-beta@cffa2d0e5946 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1391542, 1388925
Bug 1391542 - Port bug 1388925: Add TLS flags parameter in call to nsTLSSocketProvider::AddToSocket. rs=bustage-fix
ldap/xpcom/src/nsLDAPSecurityGlue.cpp
--- a/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
+++ b/ldap/xpcom/src/nsLDAPSecurityGlue.cpp
@@ -173,17 +173,17 @@ nsLDAPSSLConnect(const char *hostlist, i
     // clear, and I suspect it may depend on the format of the name in
     // the certificate.  Need to investigate.
     //
     rv = tlsSocketProvider->AddToSocket(PR_AF_INET,
                                         sessionClosure->hostname,
                                         defport,
                                         nullptr,
                                         mozilla::OriginAttributes(),
-                                        0,
+                                        0, 0,
                                         socketInfo.soinfo_prfd,
                                         getter_AddRefs(securityInfo));
     if (NS_FAILED(rv)) {
 	NS_ERROR("nsLDAPSSLConnect(): unable to add SSL layer to socket");
         goto close_socket_and_exit_with_error;
     }
 
     // If possible we want to avoid using SSLv2, as this can confuse