Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #54298: Using empty additional_headers adding extraneous CRLF

diff --cc ext/standard/mail.c
index 9e7d9a5b3bd9f29a31945e05a9191c36eb32b460,b27923aca1954b3d24a587526e6c007b427f3c95..4bac24a99b49eda3c14e1b2e54b24ac873ec512c
--- 1/ext/standard/mail.c
--- 2/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@@ -333,7 -368,7 +333,7 @@@ PHP_FUNCTION(mail
                extra_cmd = php_escape_shell_cmd(ZSTR_VAL(extra_cmd));
        }
  
-       if (php_mail(to_r, subject_r, message, headers_str ? ZSTR_VAL(headers_str) : NULL, extra_cmd ? ZSTR_VAL(extra_cmd) : NULL)) {
 -      if (php_mail(to_r, subject_r, message, str_headers && ZSTR_LEN(str_headers) ? ZSTR_VAL(str_headers) : NULL, extra_cmd ? ZSTR_VAL(extra_cmd) : NULL)) {
++      if (php_mail(to_r, subject_r, message, headers_str && ZSTR_LEN(headers_str) ? ZSTR_VAL(headers_str) : NULL, extra_cmd ? ZSTR_VAL(extra_cmd) : NULL)) {
                RETVAL_TRUE;
        } else {
                RETVAL_FALSE;