com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/streams/ xp_socket.c
| From: | Michael Wallner | Date: | Wed, 02 Apr 2014 09:10:59 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/streams/ xp_socket.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76678@lists.php.net to get a copy of this message | ||
Commit: af147ac9b7619fa56a3e6607d4109ef9c127a914
Author: Michael Wallner <mike@php.net> Wed, 2 Apr 2014 11:10:59 +0200
Parents: 8e238148f95c23ff2fc160a6bd01b8268a3191c3 91a9d24aa30507e6c7d8937db2de24394f0ce121
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af147ac9b7619fa56a3e6607d4109ef9c127a914
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64330
Bugs:
https://bugs.php.net/64330
Changed paths:
MM main/streams/xp_socket.c
Diff: