diff options
| author | Sara Golemon <pollita@php.net> | 2014-06-11 13:51:53 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2014-06-11 13:51:53 -0700 |
| commit | e2ef56f760c6425d002454234c45c5e777d85058 (patch) | |
| tree | 7c3cd0aa48d2a0aaea677fe36134cfa824ac7a5a /sapi/cli/php_cli_server.c | |
| parent | c38ab260fe3a40cce049c835fb7833de00ab977c (diff) | |
| parent | 4f73394fdd95d3165b4391e1b0dedd57fced8c3b (diff) | |
| download | php-git-e2ef56f760c6425d002454234c45c5e777d85058.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix potential segfault in dns_get_record()
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions