com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_execute_API.c Zend/zend_objects.c Zend/ zend_vm_def.h
Zend/zend_vm_execute.h main/php _streams.h sapi/apache2handler/php_apache.h sapi/ apache2handler/php_functions.c
| From: | Anatol Belski | Date: | Mon, 15 Dec 2014 12:57:43 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_execute_API.c Zend/zend_objects.c Zend/ zend_vm_def.h Zend/zend_vm_execute.h main/php _streams.h sapi/apache2handler/php_apache.h sapi/ apache2handler/php_functions.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83712@lists.php.net to get a copy of this message | ||
Commit: f62ad3bc578eb7a5494b7816f31dc31227483aed
Author: Anatol Belski <ab@php.net> Mon, 15 Dec 2014 13:57:43 +0100
Parents: dba27372ec59af3f0ecc02b264b9c3a620b1a5bf 178363cbff9cc2366b75eb11fd61473da238f7c6
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f62ad3bc578eb7a5494b7816f31dc31227483aed
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
Changed paths:
MM Zend/zend_execute_API.c
MM Zend/zend_objects.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM main/php_streams.h
MM sapi/apache2handler/php_apache.h
MM sapi/apache2handler/php_functions.c
Diff: