com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c main/php_streams.h main/streams/streams.c
| From: | Chris Wright | Date: | Wed, 27 Aug 2014 15:35:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c main/php_streams.h main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81207@lists.php.net to get a copy of this message | ||
Commit: 0a1df748957f6cfddebeee70f0b4ea1778a34871
Author: Chris Wright <daverandom@php.net> Wed, 27 Aug 2014 16:35:28 +0100
Parents: 8ec40397cdedabcfedc09c8a43d8c4693875baed db03216e62180000d7296c0498f7141ce62f66d8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0a1df748957f6cfddebeee70f0b4ea1778a34871
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
Changed paths:
MM ext/openssl/xp_ssl.c
MM main/php_streams.h
MM main/streams/streams.c
Diff: