Skip to content

Commit 5174318

Browse files
Ingramznikic
authored andcommitted
Fix default sendmail path when not found during build
Closes GH-5548.
1 parent f33cf52 commit 5174318

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

acinclude.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ dnl Search for the sendmail binary
20842084
dnl
20852085
AC_DEFUN([PHP_PROG_SENDMAIL], [
20862086
PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
2087-
AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
2087+
AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH)
20882088
PHP_SUBST(PROG_SENDMAIL)
20892089
])
20902090

main/main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,10 +697,8 @@ PHP_INI_MH(OnChangeBrowscap);
697697
/* Windows use the internal mail */
698698
#if defined(PHP_WIN32)
699699
# define DEFAULT_SENDMAIL_PATH NULL
700-
#elif defined(PHP_PROG_SENDMAIL)
701-
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
702700
#else
703-
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
701+
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i"
704702
#endif
705703

706704
/* {{{ PHP_INI

0 commit comments

Comments
 (0)