From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 26 Aug 2018 11:23:06 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.0beta3~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d6b0b503176d84c24bff6a551b68901147d7080;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #68180: iconv_mime_decode can return extra characters in a header
---

4d6b0b503176d84c24bff6a551b68901147d7080
diff --cc NEWS
index c73d79e5b9,81fe98aaee..72e9b0bbd6
--- a/NEWS
+++ b/NEWS
@@@ -1,22 -1,23 +1,24 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.10
 +?? ??? ????, PHP 7.3.0beta3
  
  - Core:
 +  . Fixed #76773 (Traits used on the parent are ignored for child classes).
 +    (daverandom)
 +  . Fixed #76767 (‘asm’ operand has impossible constraints in zend_operators.h).
 +    (ondrej)
    . Fixed bug #76754 (parent private constant in extends class memory leak).
      (Laruence)
 -  . Fixed bug #72443 (Generate enabled extension). (petk)
 -  . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode).
 -    (Massimiliano Braglia)
 +  . Fixed bug #76752 (Crash in ZEND_COALESCE_SPEC_TMP_HANDLER - assertion in
 +    _get_zval_ptr_tmp failed). (Laruence)
  
 -- Bz2:
 -  . Fixed arginfo for bzcompress. (Tyson Andre)
 -
 -- gettext:
 -  . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
 +- DOM:
 +  . Fixed bug #76285 (DOMDocument::formatOutput attribute sometimes ignored).
 +    (Andrew Nester, Laruence, Anatol)
  
  - iconv:
+   . Fixed bug #68180 (iconv_mime_decode can return extra characters in a 
+     header). (cmb)
    . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers).
      (cmb)
    . Fixed bug #60494 (iconv_mime_decode does ignore special characters). (cmb)