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