From: Joe Watkins <krakjoe@php.net>
Date: Wed, 4 Jan 2017 13:35:01 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c9164047e7b5c1879d7d43d36622aec8e83d7aa;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312
---

6c9164047e7b5c1879d7d43d36622aec8e83d7aa
diff --cc NEWS
index 80e91c4dd1,a3d844d7cf..6e00126ce6
--- a/NEWS
+++ b/NEWS
@@@ -70,9 -60,10 +70,11 @@@ PH
    . Fixed bug #70490 (get_browser function is very slow). (Nikita)
    . Fixed bug #73265 (Loading browscap.ini at startup causes high memory usage).
      (Nikita)
 +  . Add subject to mail log. (tomsommer)
+   . Fixed bug #31875 (get_defined_functions additional param to exclude
+ 	disabled functions). (willianveiga)
  
 -- Zlib:
 +- Zlib
    . Fixed bug #73373 (deflate_add does not verify that output was not truncated).
      (Matt Bonneau)