diff options
author | Adam Harvey <aharvey@php.net> | 2014-06-11 21:42:26 +0000 |
---|---|---|
committer | Adam Harvey <aharvey@php.net> | 2014-06-11 21:42:26 +0000 |
commit | 16e0dcea72b11d83b3806e8800e731098ed990c9 (patch) | |
tree | 68c4e2a7d9dc3f1e43b736ffb3f51afaecfc67f0 /sapi/cli/php_cli_server.c | |
parent | ace35a3d3b38fc80f73f774826fd5d3ae14e8a28 (diff) | |
parent | 5f2a30e11197fd1bc2394ee23cf80c7ea2ea9660 (diff) | |
download | php-git-16e0dcea72b11d83b3806e8800e731098ed990c9.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS entry for "Fix potential segfault in dns_get_record()"
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions