Changeset 1022 in subversion

Timestamp:

Feb 5, 2008 6:34:18 PM (5 years ago)

Author:

thomasb

Message:

Applied patch to prevent bad header delimiters (#1484751)

File:

• trunk/roundcubemail/program/steps/mail/sendmail.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -207 +207 @@
 $headers['Message-ID'] = $message_id;
 $headers['X-Sender'] = $from;
-$headers['Received'] = 'from '.
+$headers['Received'] =  wordwrap('from ' .
   (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
-   gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR']."]\r\n\tvia " : '').
-  gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR']."]\r\n\t with ".
-  $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); '.date('r');
+    gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].'] via ' : '') .
+  gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].'] with ' .
+  $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
+  69, rcmail_header_delm() . "\t");
 
 if (!empty($CONFIG['useragent']))