jani Tue Aug 26 23:26:07 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main main.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.31&r2=1.640.2.23.2.57.2.32&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.31 php-src/main/main.c:1.640.2.23.2.57.2.32 --- php-src/main/main.c:1.640.2.23.2.57.2.31 Sat Aug 23 17:55:50 2008 +++ php-src/main/main.c Tue Aug 26 23:26:07 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.31 2008/08/23 17:55:50 pajoye Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.32 2008/08/26 23:26:07 jani Exp $ */ /* {{{ includes */ @@ -354,13 +354,15 @@ # define PHP_SAFE_MODE_EXEC_DIR "" #endif -#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 */ PHP_INI_BEGIN()
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php