From: Robert Shearman <robertshearman@gmail.com>
Date: Wed, 9 Jul 2008 21:39:40 +0000 (+0100)
Subject: git-send-email: Fix authenticating on some servers when using TLS.
X-Git-Tag: v1.6.0-rc0~96
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d1ccf5e640bdaeddd01a86b40b4c0980c1ef642;p=git.git

git-send-email: Fix authenticating on some servers when using TLS.

Send HELO again after a successful STARTTLS command to refresh the list of
extensions. These may be different to what is returned over a clear
connection (for example the AUTH command may be accepted over a secure
connection, but not over a clear connection).

Furthermore, this behaviour is recommended by RFC 2487
(http://www.ietf.org/rfc/rfc2487.txt).

Signed-off-by: Robert Shearman <robertshearman@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-send-email.perl b/git-send-email.perl
index 3564419e8..6adb66947 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -773,6 +773,9 @@ X-Mailer: git-send-email $gitversion
 					$smtp = Net::SMTP::SSL->start_SSL($smtp)
 						or die "STARTTLS failed! ".$smtp->message;
 					$smtp_encryption = '';
+					# Send EHLO again to receive fresh
+					# supported commands
+					$smtp->hello();
 				} else {
 					die "Server does not support STARTTLS! ".$smtp->message;
 				}