From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 6 Jan 2020 13:51:14 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7833fd97478bb4224d95a9f7f475551d9b177e2;p=php

Merge branch 'PHP-7.4'

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

d7833fd97478bb4224d95a9f7f475551d9b177e2
diff --cc ext/standard/mail.c
index 9e7d9a5b3b,b27923aca1..4bac24a99b
--- a/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;