diff options
| author | Anatol Belski <ab@php.net> | 2014-12-01 08:32:12 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-01 08:32:12 +0100 |
| commit | 49de5b7aed4bed9ebbb4bc085d240084b090ad7b (patch) | |
| tree | 0d3c858124797f91a61fbe9e22636817823edb2c /ext/mssql/php_mssql.h | |
| parent | a41412cdf03dc191c6fa1c31e56d5ff5e317abe4 (diff) | |
| parent | c370683903adf740b330755cfb01cc2da5df7cb0 (diff) | |
| download | php-git-49de5b7aed4bed9ebbb4bc085d240084b090ad7b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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
Conflicts:
main/streams/plain_wrapper.c
Diffstat (limited to 'ext/mssql/php_mssql.h')
0 files changed, 0 insertions, 0 deletions