]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a5d38e0 d7daf81)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 07:31:56 +0000 (00:31 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 07:31:56 +0000 (00:31 -0700)
commit265b73e6ff627c1d0ee14009fc702fce7419344d
treea0dfdb8f711b86a38e1a8ebb5bd55b7a6f112886tree | snapshot
parenta5d38e0deabe0e5b2edcb0255fc921f6be489cbdcommit | diff
parentd7daf814b799393f705533c6a2db4cbab93ab12acommit | diff
Merge branch 'PHP-5.6'

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

Conflicts:
ext/standard/mail.c
ext/standard/mail.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.