com php-src: Fix stream_select() issue with OpenSSL buffer: NEWS ext/openssl/xp_ssl.c main/php_str eams.h main/streams/streams.c
| From: | Daniel Lowrey | Date: | Fri, 06 Mar 2015 00:18:14 +0000 |
| Subject: | com php-src: Fix stream_select() issue with OpenSSL buffer: NEWS ext/openssl/xp_ssl.c main/php_str eams.h main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85280@lists.php.net to get a copy of this message | ||
Commit: e7df9d710cfb6bbb059ab673bb5851515b2a3aa9
Author: Chris Wright <github@daverandom.com> Sat, 23 Aug 2014 01:40:19 +0100
Committer: Daniel Lowrey <rdlowrey@php.net> Thu, 5 Mar 2015 17:18:14 -0700
Parents: ca24d19a895e7b8047db7f43acb041ad288a578f
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7df9d710cfb6bbb059ab673bb5851515b2a3aa9
Log:
Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
Bugs:
https://bugs.php.net/65137
Changed paths:
M NEWS
M ext/openssl/xp_ssl.c
M main/php_streams.h
M main/streams/streams.c
Diff:
diff --git a/NEWS b/NEWS
index 0f3893c..290e342 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Apr 2015, PHP 5.6.8
+- OpenSSL
+ . Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
+ in stream_select() contexts) (Chris Wright)
+
19 Mar 2015, PHP 5.6.7
- Core:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index d04b3161..ccc5af7 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2276,7 +2276,20 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret
TS
case PHP_STREAM_AS_FD_FOR_SELECT:
if (ret) {
- *(php_socket_t *)ret = sslsock->s.socket;
+ 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;
}
return SUCCESS;
diff --git a/main/php_streams.h b/main/php_streams.h
index 3fcab19..4da2dce 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -297,6 +297,9 @@ PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t coun
#define php_stream_write_string(stream, str) _php_stream_write(stream, str, strlen(str) TSRMLS_CC)
#define php_stream_write(stream, buf, count) _php_stream_write(stream, (buf), (count) TSRMLS_CC)
+PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC);
+#define php_stream_fill_read_buffer(stream, size) _php_stream_fill_read_buffer((stream), (size)
TSRMLS_CC)
+
#ifdef ZTS
PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...)
PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
#else
diff --git a/main/streams/streams.c b/main/streams/streams.c
index e2e9e49..90fc505 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -568,7 +568,7 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d
remov
/* {{{ generic stream operations */
-static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC)
+PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC)
{
/* allocate/fill the buffer */
@@ -736,7 +736,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
break;
}
} else {
- php_stream_fill_read_buffer(stream, size TSRMLS_CC);
+ php_stream_fill_read_buffer(stream, size);
toread = stream->writepos - stream->readpos;
if (toread > size) {
@@ -972,7 +972,7 @@ PHPAPI char *_php_stream_get_line(php_stream *stream, char *buf, size_t maxlen,
}
}
- php_stream_fill_read_buffer(stream, toread TSRMLS_CC);
+ php_stream_fill_read_buffer(stream, toread);
if (stream->writepos - stream->readpos == 0) {
break;
@@ -1047,7 +1047,7 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t
*re
to_read_now = MIN(maxlen - buffered_len, stream->chunk_size);
- php_stream_fill_read_buffer(stream, buffered_len + to_read_now TSRMLS_CC);
+ php_stream_fill_read_buffer(stream, buffered_len + to_read_now);
just_read = STREAM_BUFFERED_AMOUNT(stream) - buffered_len;