Attachment 179994 Details for Bug 214335 – New patch to use instead of the current "patch-git-send-email.perl"

[patch] New patch to use instead of the current "patch-git-send-email.perl"

patch-git-send-email.perl (text/plain), 1.93 KB, created by OlivierW on 2017-02-14 19:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: OlivierW

Created: 2017-02-14 19:21:39 UTC

Size: 1.93 KB

patch

obsolete

>--- git-send-email.perl.orig	2017-02-14 19:41:48.046739120 +0100
>+++ git-send-email.perl	2017-02-14 20:02:04.954437985 +0100
>@@ -27,6 +27,7 @@
> use File::Temp qw/ tempdir tempfile /;
> use File::Spec::Functions qw(catfile);
> use Error qw(:try);
>+use Net::SMTP 2.34;
> use Git;
> 
> Getopt::Long::Configure qw/ pass_through /;
>@@ -1337,7 +1338,6 @@
> 
> 		if ($smtp_encryption eq 'ssl') {
> 			$smtp_server_port ||= 465; # ssmtp
>-			require Net::SMTP::SSL;
> 			$smtp_domain ||= maildomain();
> 			require IO::Socket::SSL;
> 
>@@ -1347,35 +1347,22 @@
> 				$IO::Socket::SSL::DEBUG = 1;
> 			}
> 
>-			# Net::SMTP::SSL->new() does not forward any SSL options
>-			IO::Socket::SSL::set_client_defaults(
>-				ssl_verify_params());
>-			$smtp ||= Net::SMTP::SSL->new($smtp_server,
>-						      Hello => $smtp_domain,
>-						      Port => $smtp_server_port,
>-						      Debug => $debug_net_smtp);
>+			$smtp = Net::SMTP->new($smtp_server,
>+					       Hello => $smtp_domain,
>+					       Port => $smtp_server_port,
>+					       SSL => 1,
>+					       ssl_verify_params(),
>+					       Debug => $debug_net_smtp);
> 		}
> 		else {
>-			require Net::SMTP;
>-			$smtp_domain ||= maildomain();
> 			$smtp_server_port ||= 25;
>-			$smtp ||= Net::SMTP->new($smtp_server,
>+			$smtp = Net::SMTP->new($smtp_server,
> 						 Hello => $smtp_domain,
> 						 Debug => $debug_net_smtp,
> 						 Port => $smtp_server_port);
> 			if ($smtp_encryption eq 'tls' && $smtp) {
>-				require Net::SMTP::SSL;
>-				$smtp->command('STARTTLS');
>-				$smtp->response();
>-				if ($smtp->code == 220) {
>-					$smtp = Net::SMTP::SSL->start_SSL($smtp,
>-									  ssl_verify_params())
>-						or die "STARTTLS failed! ".IO::Socket::SSL::errstr();
>-					$smtp_encryption = '';
>-					# Send EHLO again to receive fresh
>-					# supported commands
>-					$smtp->hello($smtp_domain);
>-				} else {
>+				$smtp->starttls(ssl_verify_params());
>+				if ($smtp->code != 250) {
> 					die "Server does not support STARTTLS! ".$smtp->message;
> 				}
> 			}

Actions: View | Diff

Attachments on bug 214335: 178490 | 179994