From dacea3f6fb3f84c79a3412b24547eb2c636754f6 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Fri, 19 Jun 2015 12:19:02 +0900 Subject: Fixed Bug #69874 : Can't set empty additional_headers for mail() --- ext/standard/mail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/mail.c') diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 448013a472..1c1332b55e 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -320,7 +320,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); } -- cgit v1.2.1