From: Jani Taskinen <jani@php.net>
Date: Tue, 26 Aug 2008 23:25:40 +0000 (+0000)
Subject: - Fixed bug #44924 (sendmail path wrong)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=778f5295bacc297a76d58b80be28190e74e2e1a6;p=php

- Fixed bug #44924 (sendmail path wrong)
---

diff --git a/main/main.c b/main/main.c
index 2091ae3c5e..e9fd48554e 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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