diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-04 10:51:04 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-04 10:51:04 -0700 |
| commit | fb6f5d2e2d44e205cdde7320a7674e43fdd7980b (patch) | |
| tree | e34ba3b595e226fa7db1cafbf114fec95368dec3 /sapi/cli/php_cli_server.c | |
| parent | 366491c1ce6f65e5fffc95392cc4cffa0078a577 (diff) | |
| parent | 90f0a77cadbee86493421791fb84fed1991ae1ee (diff) | |
| download | php-git-fb6f5d2e2d44e205cdde7320a7674e43fdd7980b.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:
Fix bug #65667: ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions