jani Tue Aug 26 23:19:22 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
Log:
MFH: sendmail mess cleared (PHP_PROG_SENDMAIL was not used at all, see also
bug #42946)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.63&r2=1.640.2.23.2.64&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.63 php-src/main/main.c:1.640.2.23.2.64
--- php-src/main/main.c:1.640.2.23.2.63 Wed Jun 25 12:18:21 2008
+++ php-src/main/main.c Tue Aug 26 23:19:22 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.63 2008/06/25 12:18:21 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.64 2008/08/26 23:19:22 jani Exp $ */
/* {{{ includes
*/
@@ -352,8 +352,9 @@
# define PHP_SAFE_MODE_EXEC_DIR ""
#endif
-/* Windows and Netware use the internal mail */
-#if defined(PHP_WIN32) || defined(NETWARE)
+#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
+# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
+#elif defined(PHP_WIN32)
# define DEFAULT_SENDMAIL_PATH NULL
#else
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
