com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/x p_ssl.c
| From: | rdlowrey@php.net | Date: | Tue, 09 Sep 2014 15:27:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/x p_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81478@lists.php.net to get a copy of this message | ||
Commit: bf2f80b22356cd93748dd7551dfa0b54fb53e5b5
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 9 Sep 2014 09:27:20 -0600
Parents: b9ac5e23fb1b347b5eab250832999e291d65807a 372844918a318ad712e16f9ec636682424a65403
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf2f80b22356cd93748dd7551dfa0b54fb53e5b5
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Bugs:
https://bugs.php.net/41631
https://bugs.php.net/67965
Changed paths:
MM ext/openssl/xp_ssl.c
Diff:
diff --cc ext/openssl/xp_ssl.c
index 79d4a09,b2a939d...5736caa
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -881,20 -871,22 +881,22 @@@ 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);
- }
+ /* 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 lower of bytes OpenSSL has ready to give us or chunk_size 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. */
+ size_t pending;
+ if (stream->writepos == stream->readpos
+ && sslsock->ssl_active
+ && (pending = (size_t)SSL_pending(sslsock->ssl_handle)) > 0) {
+ php_stream_fill_read_buffer(stream, pending < stream->chunk_size
+ ? pending
+ : stream->chunk_size);
}
- *(int *)ret = sslsock->s.socket;
+ *(php_socket_t *)ret = sslsock->s.socket;
}
return SUCCESS;