diff options
author | Anatol Belski <ab@php.net> | 2014-12-01 08:30:59 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-01 08:30:59 +0100 |
commit | c370683903adf740b330755cfb01cc2da5df7cb0 (patch) | |
tree | aee7272e6c870f2f144e63c09759935bc7125de0 /sapi/phpdbg/phpdbg_help.c | |
parent | bfe7c6988fd128352c3ec6a5b95ac9c1fbb5fe06 (diff) | |
parent | c1ec815faee2f3d6102c5633fc70fbb06d418379 (diff) | |
download | php-git-c370683903adf740b330755cfb01cc2da5df7cb0.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add include for missing usleep proto
C89 compat
Added more useful warning messages
Changed based on comments and make its behaviour equal to the Windows version
Fix #53092 - dns_get_record does not return false on dns server failure
Fix php cli (-S option) inconsistent port parsing
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions