diff options
| author | Chris Wright <github@daverandom.com> | 2014-08-23 01:40:19 +0100 |
|---|---|---|
| committer | Chris Wright <daverandom@php.net> | 2014-08-27 13:25:50 +0100 |
| commit | 32be79dcfa1bc5af8682d9f512da68c5b3e2cbf3 (patch) | |
| tree | 6dfe461a2487566acd9574dca19981f5747796c8 /main | |
| parent | 52f35b984c4a1cc6e1e951a9c1d777ceb20e5606 (diff) | |
| download | php-git-32be79dcfa1bc5af8682d9f512da68c5b3e2cbf3.tar.gz | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_streams.h | 3 | ||||
| -rw-r--r-- | main/streams/streams.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index 2e4a3a2a18..89b877fdb1 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -301,6 +301,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 3fd4ab3796..fbcc1ca4e3 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -573,7 +573,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 */ @@ -741,7 +741,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) { @@ -977,7 +977,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; @@ -1052,7 +1052,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; |