com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/x p_ssl.c main/php_streams.h main/streams/streams.c
| From: | Chris Wright | Date: | Wed, 27 Aug 2014 15:06:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/x p_ssl.c main/php_streams.h main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81206@lists.php.net to get a copy of this message | ||
Commit: db03216e62180000d7296c0498f7141ce62f66d8
Author: Chris Wright <daverandom@php.net> Wed, 27 Aug 2014 16:06:28 +0100
Parents: 4d667eeaf39853c4c7cbae9f5eaad40c704bffe8 30a73658c63a91c413305a4c4d49882fda4dab3e
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=db03216e62180000d7296c0498f7141ce62f66d8
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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: