com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/x p_ssl.c main/php_streams.h main/streams/streams.c

From: Date: Wed, 27 Aug 2014 15:01:18 +0000
Subject: com php-src: Merge branch 'PHP-5.4' into PHP-5.5: 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-81205@lists.php.net to get a copy of this message
Commit: 30a73658c63a91c413305a4c4d49882fda4dab3e Author: Chris Wright <daverandom@php.net> Wed, 27 Aug 2014 16:01:18 +0100 Parents: 7fac56e0729385bbd2bb040f06a20a697d9de5fd 32be79dcfa1bc5af8682d9f512da68c5b3e2cbf3 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30a73658c63a91c413305a4c4d49882fda4dab3e Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fix stream_select() issue with OpenSSL buffer Conflicts: ext/openssl/xp_ssl.c Changed paths: MM ext/openssl/xp_ssl.c MM main/php_streams.h MM main/streams/streams.c Diff: diff --cc ext/openssl/xp_ssl.c index 5fddf73,956ffd0..79d4a09 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@@ -881,7 -871,20 +881,20 @@@ static int php_openssl_sockop_cast(php_ case PHP_STREAM_AS_FD_FOR_SELECT: if (ret) { + if (sslsock->ssl_active) { + /* OpenSSL has an internal buffer which select() cannot see. If we don't + fetch it into the stream's buffer, no activity will be reported on the + stream even though there is data waiting to be read - but we only fetch + the number of bytes OpenSSL has ready to give us since we weren't asked + for any data at this stage. This is only likely to cause issues with + non-blocking streams, but it's harmless to always do it. */ + int bytes; + while ((bytes = SSL_pending(sslsock->ssl_handle)) > 0) { + php_stream_fill_read_buffer(stream, (size_t)bytes); + } + } + - *(int *)ret = sslsock->s.socket; + *(php_socket_t *)ret = sslsock->s.socket; } return SUCCESS;

« previous php.cvs (#81205) next »