com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend_alloc.c
| From: | Anatol Belski | Date: | Mon, 06 Oct 2014 16:36:26 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82170@lists.php.net to get a copy of this message | ||
Commit: bd9f17846df5ca7c7f606e4392f02861523b7cd5
Author: Anatol Belski <ab@php.net> Mon, 6 Oct 2014 18:36:26 +0200
Parents: 60f0695a0982c556c826191d28c8ba3a72fd2a2b 5d7ccb758b407d1ba6bc7502b22ebb7cfcd2912c
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bd9f17846df5ca7c7f606e4392f02861523b7cd5
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
bring back the correct php_version.h
fix the empty_strings SAPI shutdown leak in TS build
Use fastcall calling convention for heap functions
fix leaking the empty_string in TS builds
remove successive assignment
Changed paths:
MM Zend/zend.c
MM Zend/zend_alloc.c
Diff: