diff options
| author | Adam Harvey <aharvey@php.net> | 2014-06-11 21:43:39 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-06-11 21:43:39 +0000 |
| commit | af26a28ac0d217b2d30409373dd54e070566b173 (patch) | |
| tree | a5e3539b465a3fad571fdd3ad70aa07bd41b7810 /sapi/cli/php_cli_server.c | |
| parent | 1ba338624b16e887576cc28ad30fabf47a16f8cf (diff) | |
| parent | 16e0dcea72b11d83b3806e8800e731098ed990c9 (diff) | |
| download | php-git-af26a28ac0d217b2d30409373dd54e070566b173.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
5.5.15 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions