From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 12 Feb 2017 21:03:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=134d0b33a3bc18044c44deb1b33755e69b0c5631;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

134d0b33a3bc18044c44deb1b33755e69b0c5631
diff --cc NEWS
index 3a17968614,aed2a09e5d..6fa6d883b1
--- a/NEWS
+++ b/NEWS
@@@ -37,10 -45,10 +37,6 @@@ PH
    . Fixed bug #74022 (PHP Fast CGI crashes when reading from a pfx file).
      (Anatol)
  
--- Reflection:
--  . Fixed bug #74035 (getNumberOfRequiredParameters wrong for
--    ReflectionClass::newInstance). (Andrew Nester)
--
  - Standard:
    . Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed).
      (Anatol)