]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80f9a97 cd9c39d)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 03:23:00 +0000 (20:23 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 03:23:00 +0000 (20:23 -0700)
commit8f2e08239fc1f8aabc26398393303fa685e810dd
treed608ca94bc73cc9d59daa9a3144f35b195911665tree | snapshot
parent80f9a9725c1ec4975e92889a464856c092c4bc4ccommit | diff
parentcd9c39d77ce22e5e377f9f23474c20374d76a10acommit | diff
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()
ext/standard/mail.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.