From: Stanislav Malyshev <stas@php.net>
Date: Tue, 14 Oct 2014 17:53:05 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~73^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe907b34351e7e08c6d512ec437dee8805bb2f7;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  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())
  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

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
---

abe907b34351e7e08c6d512ec437dee8805bb2f7