]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 07:30:55 +0000 (00:30 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 07:30:55 +0000 (00:30 -0700)
commitd7daf814b799393f705533c6a2db4cbab93ab12a
treee99342776237f3b1e656418ee780e1985ce6c236
parent7e97faa3e834cca98c61043dc02c1af0aadb1f8c
parent8f2e08239fc1f8aabc26398393303fa685e810dd
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()