Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit cd247ad

Browse files
committed
Merge 'send-email' into HEAD
2 parents 9dd0c91 + 2d6fc09 commit cd247ad

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-send-email.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ sub send_message {
11971197

11981198
if ($dry_run) {
11991199
# We don't want to send the email.
1200-
} elsif ($smtp_server =~ m#^/#) {
1200+
} elsif ($smtp_server =~ m#^/# || $smtp_server =~ m#[a-zA-Z]\:#) {
12011201
my $pid = open my $sm, '|-';
12021202
defined $pid or die $!;
12031203
if (!$pid) {
@@ -1271,7 +1271,7 @@ sub send_message {
12711271
printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject);
12721272
} else {
12731273
print (($dry_run ? "Dry-" : "")."OK. Log says:\n");
1274-
if ($smtp_server !~ m#^/#) {
1274+
if ($smtp_server !~ m#^/# && $smtp_server !~ m#[a-zA-Z]:#) {
12751275
print "Server: $smtp_server\n";
12761276
print "MAIL FROM:<$raw_from>\n";
12771277
foreach my $entry (@recipients) {

0 commit comments

Comments
 (0)