cvs: php4 / php.ini-dist php.ini-optimized /main main.c
| From: | Hartmut Holzgraefe | Date: | Fri, 04 Aug 2000 22:42:11 +0000 |
| Subject: | cvs: php4 / php.ini-dist php.ini-optimized /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1042@lists.php.net to get a copy of this message | ||
hholzgra Fri Aug 4 15:42:11 2000 EDT
Modified files:
/php4 php.ini-dist php.ini-optimized
/php4/main main.c
Log:
changed default sendmail flags from '-t' to '-t -i' (bugid#5374)
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.41 php4/php.ini-dist:1.42
--- php4/php.ini-dist:1.41 Mon Jul 24 10:58:38 2000
+++ php4/php.ini-dist Fri Aug 4 15:42:10 2000
@@ -268,7 +268,7 @@
[mail function]
SMTP = localhost ;for win32 only
sendmail_from = me@localhost.com ;for win32 only
-;sendmail_path = ;for unix only, may supply arguments as well (default is sendmail -t)
+;sendmail_path = ;for unix only, may supply arguments as well (default is 'sendmail -t
-i')
[Debugger]
debugger.host = localhost
Index: php4/php.ini-optimized
diff -u php4/php.ini-optimized:1.10 php4/php.ini-optimized:1.11
--- php4/php.ini-optimized:1.10 Mon Jul 24 10:58:38 2000
+++ php4/php.ini-optimized Fri Aug 4 15:42:10 2000
@@ -255,7 +255,7 @@
[mail function]
SMTP = localhost ;for win32 only
sendmail_from = me@localhost.com ;for win32 only
-;sendmail_path = ;for unix only, may supply arguments as well (default is sendmail -t)
+;sendmail_path = ;for unix only, may supply arguments as well (default is 'sendmail -t
-i')
[Debugger]
debugger.host = localhost
Index: php4/main/main.c
diff -u php4/main/main.c:1.287 php4/main/main.c:1.288
--- php4/main/main.c:1.287 Tue Aug 1 00:57:19 2000
+++ php4/main/main.c Fri Aug 4 15:42:11 2000
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.287 2000/08/01 07:57:19 hholzgra Exp $ */
+/* $Id: main.c,v 1.288 2000/08/04 22:42:11 hholzgra Exp $ */
#include <stdio.h>
@@ -191,7 +191,7 @@
#endif
#ifdef PHP_PROG_SENDMAIL
-# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t"
+# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
#else
# define DEFAULT_SENDMAIL_PATH NULL
#endif