opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Fix log files not being compressed when running in a web container
  Update replication plugin
  Fix 'is:watched' query hanging issue due to no authenticated user
  Bypass hostname verification with sendemail.sslVerify
  Clarify in documentation that username cannot be changed
  Update 2.12.4 release notes with info about known issue 4323
  Update 2.12.4 release notes

Change-Id: I971d2ac9dc145494581e7cc61c13551d5223f178
This commit is contained in:
David Pursehouse
2016-08-18 09:06:13 -04:00
committed by Hugo Arès
parent 49802a55fa 162bd67632
commit 5f8dd4f43e
5 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java
View File

@@ -57,9 +57,11 @@ public class AuthSMTPClient extends SMTPClient {
_socket_ = sslFactory(verify).createSocket(_socket_, hostname, port, true);
SSLParameters sslParams = new SSLParameters();
sslParams.setEndpointIdentificationAlgorithm("HTTPS");
((SSLSocket)_socket_).setSSLParameters(sslParams);
if (verify) {
SSLParameters sslParams = new SSLParameters();
sslParams.setEndpointIdentificationAlgorithm("HTTPS");
((SSLSocket)_socket_).setSSLParameters(sslParams);
}
// XXX: Can't call _connectAction_() because SMTP server doesn't
// give banner information again after STARTTLS, thus SMTP._connectAction_()