diff options
| author | Pierre Joye <pajoye@php.net> | 2008-03-05 20:58:08 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-03-05 20:58:08 +0000 |
| commit | 38b94446a41c6d3e9e7cbf0b241cfdae75de1d13 (patch) | |
| tree | 86d85fd2460f600235d4253196e94b827bcb1712 | |
| parent | 2a4a4fbcaf6f1d2160382b8ce7568a1434e328b8 (diff) | |
| download | php-git-38b94446a41c6d3e9e7cbf0b241cfdae75de1d13.tar.gz | |
- #42505, new sendmail default path breaks on Novell (Guenter Knauf)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/main.c | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -8,6 +8,8 @@ PHP NEWS - Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia) - Fixed bug #44166 (Parameter handling flaw in PDO::getAvailableDrivers()). (Ilia) +- Fixed bug #42505 (new sendmail default breaks on Netware platform) + (Guenter Knauf) 27 Feb 2008, PHP 5.2.6RC1 - Fixed security issue detailed in CVE-2008-0599. (Rasmus) diff --git a/main/main.c b/main/main.c index 02dddbca03..685fa9d7d3 100644 --- a/main/main.c +++ b/main/main.c @@ -352,9 +352,8 @@ static PHP_INI_MH(OnChangeMailForceExtra) # 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) +/* Windows and Netware use the internal mail */ +#if defined(PHP_WIN32) || defined(NETWARE) # define DEFAULT_SENDMAIL_PATH NULL #else # define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i" |