From: Jani Taskinen <jani@php.net>
Date: Tue, 26 Aug 2008 23:22:31 +0000 (+0000)
Subject: Sync with PHP_5_3 (what a nice mess..thanks guys for keeping the branches in sync... 
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~560
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b798b366c8debdcdf1071d97a428ac86a7470f18;p=php

Sync with PHP_5_3 (what a nice mess..thanks guys for keeping the branches in sync..NOT)
---

diff --git a/main/main.c b/main/main.c
index 3fa496d4e0..2091ae3c5e 100644
--- a/main/main.c
+++ b/main/main.c
@@ -462,8 +462,9 @@ static PHP_INI_MH(OnChangeMailForceExtra)
  * PHP_INCLUDE_PATH
  */
 
-/* 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"