Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976

diff --cc NEWS
index 659d7a34b9f1206c95b36daf29d5a43d7109d3ef,06857ccf016610db2b16968213b25ce7d767615b..d8c965fad4d2366fa61ba25147e4d5c209a5515b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -12,25 -7,10 +12,28 @@@ PH
    . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
      configuration options). (Anatol Belski)
    . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)
 +  . Fixed bug #69212 (Leaking VIA_HANDLER func when exception thrown in
 +    __call/... arg passing). (Nikita)
 +  . Fixed bug #69221 (Segmentation fault when using a generator in combination
 +    with an Iterator). (Nikita)
 +
 +- Enchant:
 +  . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
 +    builds). (Anatol)
  
+ - Ereg:
+   . Fixed bug #69248 (heap overflow vulnerability in regcomp.c). (Stas)
+ 
 +- Filter:
 +  . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
 +    flags are used). (Jeff Welch)
 +  . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
 +    Welch)
 +
 +- Mbstring:
 +   . Fixed bug #68846 (False detection of CJK Unified Ideographs Extension E).
 +    (Masaki Kagaya)
 +
  - SOAP:
    . Fixed bug #69085 (SoapClient's __call() type confusion through
      unserialize()). (Dmitry)