diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-06-10 23:19:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-06-10 23:19:21 -0700 |
| commit | f11bba492978cc83cbe731788942a312c77418c1 (patch) | |
| tree | 5ec60859cea54ff5461fa8644636bfad7b01b0bc /sapi/cli/php_cli_server.c | |
| parent | e8699d75da9d3b0cc16b9454f12928defb6e72fc (diff) | |
| parent | 317bcb96d01a1dade28f2875bdd9bbbf73a40160 (diff) | |
| download | php-git-f11bba492978cc83cbe731788942a312c77418c1.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions