Skip to content

Commit d050d74

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix default sendmail path when not found during build
2 parents 1e3196a + 5174318 commit d050d74

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

build/php.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,7 @@ dnl Search for the sendmail binary.
17331733
dnl
17341734
AC_DEFUN([PHP_PROG_SENDMAIL], [
17351735
PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
1736-
AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
1736+
AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH)
17371737
PHP_SUBST(PROG_SENDMAIL)
17381738
])
17391739

main/main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,8 @@ PHP_INI_MH(OnChangeBrowscap);
715715
/* Windows use the internal mail */
716716
#if defined(PHP_WIN32)
717717
# define DEFAULT_SENDMAIL_PATH NULL
718-
#elif defined(PHP_PROG_SENDMAIL)
719-
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
720718
#else
721-
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
719+
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i"
722720
#endif
723721

724722
/* {{{ PHP_INI

0 commit comments

Comments
 (0)