diff options
author | Stanislav Malyshev <stas@php.net> | 2015-06-28 20:23:00 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-06-28 20:23:00 -0700 |
commit | 8f2e08239fc1f8aabc26398393303fa685e810dd (patch) | |
tree | d608ca94bc73cc9d59daa9a3144f35b195911665 /ext/mysqlnd/mysqlnd.c | |
parent | 80f9a9725c1ec4975e92889a464856c092c4bc4c (diff) | |
parent | cd9c39d77ce22e5e377f9f23474c20374d76a10a (diff) | |
download | php-git-8f2e08239fc1f8aabc26398393303fa685e810dd.tar.gz |
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()
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
0 files changed, 0 insertions, 0 deletions