From: Zheng SHAO <z-shao@colopl.co.jp>
Date: Mon, 19 Dec 2016 15:57:22 +0000 (+0900)
Subject: Fixed NEWS conflicts
X-Git-Tag: php-7.0.15RC1~18^2~4^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=884e2a0519b15bdd552c25c658c2ff233ff53a81;p=php

Fixed NEWS conflicts
---

884e2a0519b15bdd552c25c658c2ff233ff53a81
diff --cc NEWS
index 9649a255b7,e242961fd1..b79be92f36
--- a/NEWS
+++ b/NEWS
@@@ -32,9 -32,13 +32,16 @@@ PH
      (Bob)
    . Fixed issue getting executable lines from custom wrappers. (Bob)
  
 +- Apache2handler:
 +  . Fixed bug #61471 (POST request timeout did not handle correctly). (Zheng SHAO)
 +
+ - Reflection:
+   . Fixed bug #46103 (ReflectionObject memory leak). (Nikita)
+ 
+ - Standard:
+   . Fixed bug #73594 (dns_get_record does not populate $additional out parameter).
+     (Bruce Weirdan)
+ 
  08 Dec 2016 PHP 7.0.14
  
  - Core: