From: Christoph M. Becker <cmb@php.net>
Date: Sat, 23 Jul 2016 17:31:50 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.10RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c0a18480d10966814cf5865846ce6775aabee62;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

2c0a18480d10966814cf5865846ce6775aabee62
diff --cc NEWS
index 672aefb645,6fe4d5c78b..5a01565a85
--- a/NEWS
+++ b/NEWS
@@@ -42,10 -33,9 +42,11 @@@ PH
    . Fixed bug #43828 (broken transparency of imagearc for truecolor in
      blendingmode). (cmb)
    . Fixed bug #66555 (Always false condition in ext/gd/libgd/gdkanji.c). (cmb)
+   . Fixed bug #68712 (suspicious if-else statements). (cmb)
  
  - Intl:
 +  . Fixed bug #72639 (Segfault when instantiating class that extends
 +    IntlCalendar and adds a property). (Laruence)
    . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
      names). (cmb)