com php-src: Merge branch 'PHP-5.6': main/streams/plain_wrapp er.c
| From: | Anatol Belski | Date: | Mon, 01 Dec 2014 07:32:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': main/streams/plain_wrapp er.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83453@lists.php.net to get a copy of this message | ||
Commit: 49de5b7aed4bed9ebbb4bc085d240084b090ad7b
Author: Anatol Belski <ab@php.net> Mon, 1 Dec 2014 08:32:12 +0100
Parents: a41412cdf03dc191c6fa1c31e56d5ff5e317abe4 c370683903adf740b330755cfb01cc2da5df7cb0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=49de5b7aed4bed9ebbb4bc085d240084b090ad7b
Log:
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
Bugs:
https://bugs.php.net/53092
Changed paths:
MM main/streams/plain_wrapper.c
Diff: