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