From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 9 Sep 2016 12:42:30 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8e41aa8cd2878e0a4c6daaf0f69bc89c491fb14;p=php

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

e8e41aa8cd2878e0a4c6daaf0f69bc89c491fb14
diff --cc NEWS
index 1f50aeb259,3b848264ae..8edb70d66a
--- a/NEWS
+++ b/NEWS
@@@ -9,8 -9,10 +9,10 @@@ PH
  - Filter:
    . Fixed bug #72972 (Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and
      FILTER_FLAG_NO_PRIV_RANGE). (julien)
+   . Fixed bug #73054 (default option ignored when object passed to int filter).
+     (cmb)
  
 -- GD:
 +-GD:
    . Fixed bug #67325 (imagetruecolortopalette: white is duplicated in palette).
      (cmb)