]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e97faa 8f2e082)
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)
* PHP-5.5:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.