diff options
| author | Chris Wright <github@daverandom.com> | 2014-08-23 01:40:19 +0100 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 17:18:14 -0700 |
| commit | e7df9d710cfb6bbb059ab673bb5851515b2a3aa9 (patch) | |
| tree | 7894db9712608ac3a76e6600e3dd3d920b3f5f39 /main/php_streams.h | |
| parent | ca24d19a895e7b8047db7f43acb041ad288a578f (diff) | |
| download | php-git-e7df9d710cfb6bbb059ab673bb5851515b2a3aa9.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/php_streams.h')
| -rw-r--r-- | main/php_streams.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index 3fcab199f5..4da2dce98e 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 |