]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Mon, 15 Dec 2014 12:57:43 +0000 (13:57 +0100)
committerAnatol Belski <ab@php.net>
Mon, 15 Dec 2014 12:57:43 +0000 (13:57 +0100)
commitf62ad3bc578eb7a5494b7816f31dc31227483aed
treebd0302ba9597655058c1526cfed29cba1df83601
parentdba27372ec59af3f0ecc02b264b9c3a620b1a5bf
parent178363cbff9cc2366b75eb11fd61473da238f7c6
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)
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