diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-04 10:50:53 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-04 10:50:53 -0700 |
| commit | 6a823071f9b321ca8580d082c99829b1caffa8a3 (patch) | |
| tree | f882771e8ca08d6dde7789bbd0ff76721c255ac3 /sapi/cli/php_cli_server.c | |
| parent | 76d2d474be6845367fd4cf0ec23c833722c087db (diff) | |
| parent | 96cc419924c38874f9e2f2e5ccf3cd0430d90f43 (diff) | |
| download | php-git-6a823071f9b321ca8580d082c99829b1caffa8a3.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' 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