pajoye Wed Mar 5 21:20:14 2008 UTC Modified files: /php-src/main main.c Log: - MFB: #42505, new sendmail default path breaks on Novell (Guenter Knauf) http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.761&r2=1.762&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.761 php-src/main/main.c:1.762 --- php-src/main/main.c:1.761 Wed Mar 5 13:35:02 2008 +++ php-src/main/main.c Wed Mar 5 21:20:14 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.761 2008/03/05 13:35:02 dmitry Exp $ */ +/* $Id: main.c,v 1.762 2008/03/05 21:20:14 pajoye Exp $ */ /* {{{ includes */ @@ -460,9 +460,8 @@ * PHP_INCLUDE_PATH */ -#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE) -# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i " -#elif defined(PHP_WIN32) +/* Windows and Netware use the internal mail */ +#if defined(PHP_WIN32) || defined(NETWARE) # 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