jani Tue Aug 26 23:22:32 2008 UTC
Modified files:
/php-src/main main.c
Log:
Sync with PHP_5_3 (what a nice mess..thanks guys for keeping the branches in
sync..NOT)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.781&r2=1.782&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.781 php-src/main/main.c:1.782
--- php-src/main/main.c:1.781 Sat Aug 23 17:53:19 2008
+++ php-src/main/main.c Tue Aug 26 23:22:31 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.781 2008/08/23 17:53:19 pajoye Exp $ */
+/* $Id: main.c,v 1.782 2008/08/26 23:22:31 jani Exp $ */
/* {{{ includes
*/
@@ -462,8 +462,9 @@
* PHP_INCLUDE_PATH
*/
-/* 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
