From: Stanislav Malyshev <stas@php.net>
Date: Mon, 29 Jun 2015 07:30:55 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.12RC1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7daf814b799393f705533c6a2db4cbab93ab12a;p=php

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()
---

d7daf814b799393f705533c6a2db4cbab93ab12a