summaryrefslogtreecommitdiff
path: root/ext/standard/mail.c
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2015-06-19 12:19:02 +0900
committerYasuo Ohgaki <yohgaki@php.net>2015-06-19 12:19:12 +0900
commitdacea3f6fb3f84c79a3412b24547eb2c636754f6 (patch)
tree7854a7167b1d71f356d8c25d5aaf14a047f2a7e8 /ext/standard/mail.c
parentcc7194dd10f9822d882d1cbd259d4208ccc82671 (diff)
downloadphp-git-dacea3f6fb3f84c79a3412b24547eb2c636754f6.tar.gz
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Diffstat (limited to 'ext/standard/mail.c')
-rw-r--r--ext/standard/mail.c2
1 files changed, 1 insertions, 1 deletions
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);
}