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

From: Date: Thu, 16 Oct 2014 11:49:35 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82374@lists.php.net to get a copy of this message
Commit: 69fa6523e89c4731b576a46921fd30f0aad7734e Author: Anatol Belski <ab@php.net> Thu, 16 Oct 2014 13:49:35 +0200 Parents: 7f1107de9167ab1443a13491f5b70aa3f10fd323 53a8584123f359c2c32f1869d98e4dd9e0a7a6ab Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=69fa6523e89c4731b576a46921fd30f0aad7734e Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: Fix allocator for 64bit zend_long with 32bit long Use intptr_t for zend_intptr_t typedef Fix format strings in zend_alloc Drop zend_long64 in favor of int64_t Removed deprecated fields 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 Fixed bug #68215 (Behavior of foreach has changed) 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 Bugs: https://bugs.php.net/67965 https://bugs.php.net/41631 https://bugs.php.net/65171 https://bugs.php.net/68234 https://bugs.php.net/68215 Changed paths: MM Zend/zend_alloc.c Diff:

« previous php.cvs (#82374) next »