diff options
author | Christopher Jones <sixd@php.net> | 2013-08-29 05:40:27 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-08-29 05:40:27 -0700 |
commit | a4ff610e1c140b555d3cb2a7646e8ddfcb6420a7 (patch) | |
tree | 72ce6b5390381921d8acc40aa14b72ce65401c15 /sapi/cli/php_cli_server.c | |
parent | 3697584e05f7a176e3b95e7cb1d8c02a0547f1ac (diff) | |
parent | 5015c4af6c1d2af992e0525f10e93b01043730e1 (diff) | |
download | php-git-a4ff610e1c140b555d3cb2a7646e8ddfcb6420a7.tar.gz |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed compatibility with php-5.2
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Avoid compiler warning
Fix bug #65579 (Using traits with get_class_methods causes segfault).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions