diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-06-28 18:53:19 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-06-28 20:18:56 -0700 |
| commit | cd9c39d77ce22e5e377f9f23474c20374d76a10a (patch) | |
| tree | 3895cb26b868617c14cc4e009281f918352adfaa /ext/standard/mail.c | |
| parent | 921544cad96de235c451b5174d0669e02c76258b (diff) | |
| parent | d263ecd8640697d6cde4b71ec722e8a2e5022dcf (diff) | |
| download | php-git-cd9c39d77ce22e5e377f9f23474c20374d76a10a.tar.gz | |
Merge branch 'pull-request/1350' into PHP-5.4
* pull-request/1350:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Diffstat (limited to 'ext/standard/mail.c')
| -rw-r--r-- | ext/standard/mail.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 448013a472..75bd423f8d 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -225,7 +225,7 @@ static int php_mail_detect_multiple_crlf(char *hdr) { /* This function detects multiple/malformed multiple newlines. */ size_t len; - if (!hdr) { + if (!hdr || !strlen(hdr)) { return 0; } @@ -312,7 +312,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char php_basename(tmp, strlen(tmp), NULL, 0,&f, &f_len TSRMLS_CC); - if (headers != NULL) { + if (headers != NULL && *headers) { spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s\n%s", php_getuid(TSRMLS_C), f, headers); } else { spprintf(&hdr, 0, "X-PHP-Originating-Script: %ld:%s", php_getuid(TSRMLS_C), f); @@ -420,7 +420,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute mail delivery program '%s'", sendmail_path); #if PHP_SIGCHILD if (sig_handler) { - signal(SIGCHLD, sig_handler); + signal(SIGCHLD, sig_handler); } #endif MAIL_RET(0); |