From: Tomas K. <to...@us...> - 2004-11-01 10:59:31
|
Update of /cvsroot/squirrelmail/squirrelmail/class/deliver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25843 Modified Files: Deliver_SendMail.class.php Log Message: qmail-inject does not support -i option. Thanks to Ken Brush for report Index: Deliver_SendMail.class.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/class/deliver/Deliver_SendMail.class.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -w -r1.20 -r1.21 --- Deliver_SendMail.class.php 22 May 2004 13:41:16 -0000 1.20 +++ Deliver_SendMail.class.php 1 Nov 2004 10:59:22 -0000 1.21 @@ -55,7 +55,7 @@ $envelopefrom = trim($from->mailbox.'@'.$from->host); $envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom); if (strstr($sendmail_path, "qmail-inject")) { - $stream = popen (escapeshellcmd("$sendmail_path -i -f$envelopefrom"), "w"); + $stream = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w"); } else { $stream = popen (escapeshellcmd("$sendmail_path -i -t -f$envelopefrom"), "w"); } |