cvs: php-src /main main.c

jani Tue Aug 26 23:25:40 2008 UTC Modified files: /php-src/main main.c Log: - Fixed bug #44924 (sendmail path wrong) http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.782&r2=1.783&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.782 php-src/main/main.c:1.783 --- php-src/main/main.c:1.782 Tue Aug 26 23:22:31 2008 +++ php-src/main/main.c Tue Aug 26 23:25:40 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.782 2008/08/26 23:22:31 jani Exp $ */ +/* $Id: main.c,v 1.783 2008/08/26 23:25:40 jani Exp $ */ /* {{{ includes */ @@ -462,12 +462,13 @@ * PHP_INCLUDE_PATH */ -#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 + /* Windows and Netware use the internal mail */ +#if defined(PHP_WIN32) || defined(NETWARE) +# define DEFAULT_SENDMAIL_PATH NULL +#elif defined(PHP_PROG_SENDMAIL) +# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i " #else -# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i" +# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i" #endif /* {{{ PHP_INI