com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/mail.c
| From: | Stanislav Malyshev | Date: | Mon, 29 Jun 2015 03:23:00 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/mail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87592@lists.php.net to get a copy of this message | ||
Commit: 8f2e08239fc1f8aabc26398393303fa685e810dd
Author: Stanislav Malyshev <stas@php.net> Sun, 28 Jun 2015 20:23:00 -0700
Parents: 80f9a9725c1ec4975e92889a464856c092c4bc4c cd9c39d77ce22e5e377f9f23474c20374d76a10a
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f2e08239fc1f8aabc26398393303fa685e810dd
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Bugs:
https://bugs..php.net/69874
Changed paths:
MM ext/standard/mail.c
Diff:
diff --cc ext/standard/mail.c
index 09e0a55,75bd423..17c09db
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@@ -225,8 -223,9 +225,8 @@@ void php_mail_log_to_file(char *filenam
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;
}