]> granicus.if.org Git - php/commit
Merge branch 'pull-request/1350' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 01:53:19 +0000 (18:53 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jun 2015 03:18:56 +0000 (20:18 -0700)
commitcd9c39d77ce22e5e377f9f23474c20374d76a10a
tree3895cb26b868617c14cc4e009281f918352adfaa
parent921544cad96de235c451b5174d0669e02c76258b
parentd263ecd8640697d6cde4b71ec722e8a2e5022dcf
Merge branch 'pull-request/1350' into PHP-5.4

* pull-request/1350:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
NEWS
ext/standard/mail.c
ext/standard/tests/mail/bug69874_2.phpt