mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DKIM header length fix from Valery Patskevich [via SourceForge](https://sourceforge.net/p/phpmailer/bugs/410/) 

Don't credit PHPMailer in DKIM string - we already add an X-Mailer header
This commit is contained in:
Synchro 2013-03-20 17:58:15 +01:00
parent b62f5b69e8
commit 828c3e5827
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
class.phpmailer.php
View File

@ -2716,13 +2716,22 @@ class PHPMailer {
$DKIMtime = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
$subject_header = "Subject: $subject";
$headers = explode($this->LE, $headers_line);
$from_header = "";
$to_header = "";
$from_header = '';
$to_header = '';
$current = '';
foreach($headers as $header) {
if (strpos($header, 'From:') === 0) {
$from_header = $header;
$current = 'from_header';
} elseif (strpos($header, 'To:') === 0) {
$to_header = $header;
$current = 'to_header';
} else {
if($current && strpos($header, ' =?') === 0){
$$current .= $header;
} else {
$current = '';
}
}
}
$from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
@ -2743,7 +2752,7 @@ class PHPMailer {
"\tb=";
$toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
$signed = $this->DKIM_Sign($toSign);
return "X-PHPMAILER-DKIM: code.google.com/a/apache-extras.org/p/phpmailer/\r\n".$dkimhdrs.$signed."\r\n";
return $dkimhdrs.$signed."\r\n";
}
/**