diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-06 14:51:14 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-06 14:51:14 +0100 |
| commit | d7833fd97478bb4224d95a9f7f475551d9b177e2 (patch) | |
| tree | 0e5d656191b59087a21b7740bb7a6caac071cedc /ext/standard | |
| parent | 29df9d13da7ea56c54c518f3c948f91aaf257c33 (diff) | |
| parent | 09ebeba1afdfa6dd6695781e441207cd790f0d42 (diff) | |
| download | php-git-d7833fd97478bb4224d95a9f7f475551d9b177e2.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #54298: Using empty additional_headers adding extraneous CRLF
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/mail.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/mail/bug54298.phpt | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 9e7d9a5b3b..4bac24a99b 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -333,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, headers_str && ZSTR_LEN(headers_str) ? ZSTR_VAL(headers_str) : NULL, extra_cmd ? ZSTR_VAL(extra_cmd) : NULL)) { RETVAL_TRUE; } else { RETVAL_FALSE; diff --git a/ext/standard/tests/mail/bug54298.phpt b/ext/standard/tests/mail/bug54298.phpt new file mode 100644 index 0000000000..a2ab9c83ab --- /dev/null +++ b/ext/standard/tests/mail/bug54298.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #54298 (Using empty additional_headers adding extraneous CRLF) +--INI-- +sendmail_path=tee bug54298.eml >/dev/null +mail.add_x_header = Off +--SKIPIF-- +<?php +if (PHP_OS_FAMILY === 'Windows') die("skip Won't run on Windows"); +?> +--FILE-- +<?php +var_dump(mail('someuser@example.com', 'testsubj', 'Body part', '')); +echo file_get_contents('bug54298.eml'); +?> +--EXPECT-- +bool(true) +To: someuser@example.com +Subject: testsubj + +Body part +--CLEAN-- +<?php +unlink('bug54298.eml'); +?> |