From: Jani Taskinen <jani@php.net>
Date: Tue, 26 Aug 2008 23:19:22 +0000 (+0000)
Subject: MFH: sendmail mess cleared (PHP_PROG_SENDMAIL was not used at all, see also bug ... 
X-Git-Tag: php-5.2.7RC1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e83e18b8f87f2d7442c23291c01b4ca66a98f1d3;p=php

MFH: sendmail mess cleared (PHP_PROG_SENDMAIL was not used at all, see also bug #42946)
---

diff --git a/main/main.c b/main/main.c
index 7925626635..59bb512aa1 100644
--- a/main/main.c
+++ b/main/main.c
@@ -352,8 +352,9 @@ static PHP_INI_MH(OnChangeMailForceExtra)
 #	define PHP_SAFE_MODE_EXEC_DIR ""
 #endif
 
-/* Windows and Netware use the internal mail */
-#if defined(PHP_WIN32) || defined(NETWARE)
+#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
 #else
 #	define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"