From: Christoph M. Becker <cmb@php.net>
Date: Tue, 12 Jul 2016 12:55:30 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0beta1~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0667d6081268ba98b9a5628e9ed3528e48283fd1;p=php

Merge branch 'PHP-7.0'

# Resolved conflicts:
#	ext/intl/idn/idn.c
---

0667d6081268ba98b9a5628e9ed3528e48283fd1
diff --cc NEWS
index 1adba64664,b87aed3d03..3fbb899a77
--- a/NEWS
+++ b/NEWS
@@@ -27,12 -23,10 +27,16 @@@ PH
    . Fixed bug #72575 (using --allow-to-run-as-root should ignore missing user).
      (gooh)
  
+ - Intl:
+   . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
+     names). (cmb)
+ 
 +- Mbstring:
 +  . Deprecated mb_ereg_replace() eval option. (Rouven Weßling, cmb)
 +
 +- MCrypt:
 +  . Deprecated ext/mcrypt. (Scott Arciszewski, cmb)
 +
  - PDO:
    . Fixed bug #52384 (Adds bound parameter value to PDOStatement::debugDumpParams).
      (bishopb)