com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_alloc.c ext/curl/interface.c

Commit: 382f95e6127d52b079d172ccd017cf306402e015 Author: Anatol Belski <ab@php.net> Wed, 15 Oct 2014 08:32:54 +0200 Parents: 766eb0103fe8f59c00ddadc5c5767093ee35b2e8 01d17228dc62ea30b7ad25835f049ccd1998b5f2 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=382f95e6127d52b079d172ccd017cf306402e015 Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (25 commits) Fix return code (merges are hard :( ) fix bad merge 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 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 Fixed bug #68128 Added API function to retrive current custom heap handlers update NEWS and UPGRADING Allow to substitute storage layer in memory manager. Upated NEWS Address issues raised by @nikic ... Bugs: https://bugs.php.net/68113 https://bugs.php.net/68089 https://bugs.php.net/68044 https://bugs.php.net/68027 https://bugs.php.net/68128 Changed paths: MM Zend/zend_alloc.c MM ext/curl/interface.c Diff: