From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 17 Oct 2014 04:27:49 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
X-Git-Tag: php-5.6.3RC1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d27b3ea698dbed6b1235f01d82984567aa2b569;p=php

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src: (129 commits)
  NEWS
  cleanup NEWS
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
  NEWS
  Fixed Bug #65171 imagescale() fails
  Fixed bug #68234
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"
  PHP-5.6.3 is next
  update NEWS, 5.6.2 will be a security-only release
  Fix return code (merges are hard :( )
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  ...
---

0d27b3ea698dbed6b1235f01d82984567aa2b569