diff options
| author | Indrek Ardel <indrek@ardel.eu> | 2020-05-09 03:08:14 +0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-11 10:45:23 +0200 |
| commit | 517431892b292b039784c64decfb161f4a0664e9 (patch) | |
| tree | 37b7120c473128a3e4763f49f3f043b36edab612 | |
| parent | f33cf52faf733f5a6441a533f83e9b1cf2018245 (diff) | |
| download | php-git-517431892b292b039784c64decfb161f4a0664e9.tar.gz | |
Fix default sendmail path when not found during build
Closes GH-5548.
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | main/main.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index bf4c88d3a3..a12fb862f7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2084,7 +2084,7 @@ dnl Search for the sendmail binary dnl AC_DEFUN([PHP_PROG_SENDMAIL], [ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib - AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) + AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH) PHP_SUBST(PROG_SENDMAIL) ]) diff --git a/main/main.c b/main/main.c index 30629117d9..f20a786743 100644 --- a/main/main.c +++ b/main/main.c @@ -697,10 +697,8 @@ PHP_INI_MH(OnChangeBrowscap); /* Windows use the internal mail */ #if defined(PHP_WIN32) # define DEFAULT_SENDMAIL_PATH NULL -#elif defined(PHP_PROG_SENDMAIL) -# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i " #else -# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i" +# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i" #endif /* {{{ PHP_INI |