diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2015-06-19 12:19:02 +0900 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-07-09 11:25:13 +0200 |
| commit | 145c6167619b7a2102843d4363337b55bc9916ff (patch) | |
| tree | 13e6a770bd095ffed6050b047dea2eb1e0408c0d | |
| parent | a2edce226533db4cf2c8bf636ba51cc313e35ff6 (diff) | |
| download | php-git-145c6167619b7a2102843d4363337b55bc9916ff.tar.gz | |
Fixed Bug #69874 : Can't set empty additional_headers for mail()
| -rw-r--r-- | ext/standard/mail.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/mail/bug69874.phpt | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 09e0a5546b..6803f4d80c 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -329,7 +329,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char efree(f); } - if (hdr && php_mail_detect_multiple_crlf(hdr)) { + if (hdr && strlen(hdr) && php_mail_detect_multiple_crlf(hdr)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Multiple or malformed newlines found in additional_header"); MAIL_RET(0); } diff --git a/ext/standard/tests/mail/bug69874.phpt b/ext/standard/tests/mail/bug69874.phpt new file mode 100644 index 0000000000..a952a73bdc --- /dev/null +++ b/ext/standard/tests/mail/bug69874.phpt @@ -0,0 +1,42 @@ +--TEST-- +Bug #69874: Null addtional_headers does not send mail +--INI-- +sendmail_path=tee mailBasic.out >/dev/null +mail.add_x_header = Off +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) == "WIN") + die("skip Won't run on Windows"); +?> +--FILE-- +<?php +/* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) + * Description: Send an email message + * Source code: ext/standard/mail.c + * Alias to functions: + */ + +echo "*** Testing mail() : send email without additional headers ***\n"; + +// Initialise all required variables +$to = 'user@company.com'; +$subject = 'Test Subject'; +$message = 'A Message'; + +$outFile = "mailBasic.out"; +@unlink($outFile); + +var_dump( mail($to, $subject, $message) ); +echo file_get_contents($outFile); +unlink($outFile); + +?> +===DONE=== +--EXPECTF-- +*** Testing mail() : send email without additional headers *** +bool(true) +To: user@company.com +Subject: Test Subject + +A Message +===DONE=== |