X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-send-email.perl;h=d2fd89907688a044ffe0d2520744e00a9b33c942;hb=53b543ab8218cede7fb9383298c00dcef663692c;hp=a047b016e34c995152a05318dd322f49cb23f57e;hpb=d4b76e15ea733002e364298a81889452b8bb2dfd;p=git.git diff --git a/git-send-email.perl b/git-send-email.perl index a047b016e..d2fd89907 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -38,7 +38,7 @@ package main; sub usage { print <... +git send-email [options] ... Options: --from Specify the "From:" line of the email to be sent. @@ -772,6 +772,10 @@ X-Mailer: git-send-email $gitversion if ($smtp->code == 220) { $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; } @@ -878,7 +882,7 @@ foreach my $t (@files) { } elsif (/^Content-type:/i) { $has_content_type = 1; - if (/charset="?[^ "]+/) { + if (/charset="?([^ "]+)/) { $body_encoding = $1; } push @xh, $_;