]> granicus.if.org Git - php/commitdiff
- Fixed bug #44924 (sendmail path wrong)
authorJani Taskinen <jani@php.net>
Tue, 26 Aug 2008 23:25:40 +0000 (23:25 +0000)
committerJani Taskinen <jani@php.net>
Tue, 26 Aug 2008 23:25:40 +0000 (23:25 +0000)
main/main.c

index 2091ae3c5e24271b60776e64cd30df770bbbbbdd..e9fd48554e45f2db81423a0b3e260c9e2291485e 100644 (file)
@@ -462,12 +462,13 @@ static PHP_INI_MH(OnChangeMailForceExtra)
  * 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