From: Stanislav Malyshev <stas@php.net>
Date: Mon, 12 May 2014 01:55:02 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~289^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2fdeba19d37080ddc27198a0879bb0254684c5b;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
---

f2fdeba19d37080ddc27198a0879bb0254684c5b
diff --cc NEWS
index 5fcedb5c48,aaf308804a..c0514fb620
--- a/NEWS
+++ b/NEWS
@@@ -1,16 -1,41 +1,21 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.5.13
 -
 -- CLI server:
 -  . Fixed bug #67079 (Missing MIME types for XML/XSL files). (Anatol)
 -
 -- COM:
 -  . Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)
 +?? ??? 2014, PHP 5.6.0 Beta 3
  
  - Core:
 -  . Fixed bug #65701 (copy() doesn't work when destination filename is created
 -    by tempnam()). (Boro Sitnikovski)
 -  . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
 -  . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
 -    zend_exceptions.c). (Bob)
 +  . Fixed bug #67169 (array_splice all elements, then []= gives wrong index).
 +    (Nikita)
 +  . Fixed bug #67198 (php://input regression). (Mike)
+   . Fixed bug #67247 (spl_fixedarray_resize integer overflow). (Stas)
+ 
 -- Curl:
 -  . Fixed bug #64247 (CURLOPT_INFILE doesn't allow reset). (Mike)
 -
 -- Date:
 -  . Fixed bug #67118 (DateTime constructor crash with invalid data). (Anatol)
 -
 -- DOM:
 -  . Fixed bug #67081 (DOMDocumentType->internalSubset returns entire DOCTYPE tag,
 -    not only the subset). (Anatol)
 -
 -- Fileinfo:
 -  . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)
 -
 -- FPM:
 -  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
 -    (Julio Pintos)
 -
+ - GD:
+   . Fixed bug #67248 (imageaffinematrixget missing check of parameters). (Stas)
+ 
 +
 +- OpenSSL:
 +  . Fixed bug #67224 (Fall back to crypto_type from context if not specified
 +    explicitly in stream_socket_enable_crypto). (Chris Wright)
 +
  - PCRE:
    . Fixed bug #67238 (Ungreedy and min/max quantifier bug, applied patch
      from the upstream). (Anatol)