Merge pull request PHPMailer#656 from MikkelPaulson/fix-regex-issues

Fixed issues with regular expressions
jhitesma · Mar 15, 2016 · e8717f4 · e8717f4
2 parents f0b2877 + 355d957
commit e8717f4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -713,7 +713,7 @@ protected function edebug($str)
             case 'echo':
             default:
                 //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+                $str = preg_replace('/\r\n?/ms', "\n", $str);
                 echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
                     "\n",
                     "\n                   \t                  ",
@@ -3297,7 +3297,7 @@ public function msgHTML($message, $basedir = '', $advanced = false)
                             $message
                         );
                     }
-                } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[A-z]+://#', $url)) {
+                } elseif (substr($url, 0, 4) !== 'cid:' && !preg_match('#^[a-z][a-z0-9+.-]*://#i', $url)) {
                     // Do not change urls for absolute images (thanks to corvuscorax)
                     // Do not change urls that are already inline images
                     $filename = basename($url);
@@ -3681,7 +3681,7 @@ public function DKIM_HeaderC($signHeader)
         foreach ($lines as $key => $line) {
             list($heading, $value) = explode(':', $line, 2);
             $heading = strtolower($heading);
-            $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces
+            $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
             $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
         }
         $signHeader = implode("\r\n", $lines);