diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 17:53:04 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 17:53:04 -0700 |
| commit | 88cfc6ccb6594e8bacd4adce45094dc2d4d65eac (patch) | |
| tree | 303be68f46f6c165b697252ecd483a5ef4835233 /main/php_streams.h | |
| parent | 28e42b1deda228402aa768b78e086dc785bb10b0 (diff) | |
| parent | e7df9d710cfb6bbb059ab673bb5851515b2a3aa9 (diff) | |
| download | php-git-88cfc6ccb6594e8bacd4adce45094dc2d4d65eac.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
main/streams/streams.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 3035bd560b..a21d442095 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -307,6 +307,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)) #define php_stream_write(stream, buf, count) _php_stream_write(stream, (buf), (count)) +PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size); +#define php_stream_fill_read_buffer(stream, size) _php_stream_fill_read_buffer((stream), (size)) + #ifdef ZTS PHPAPI size_t _php_stream_printf(php_stream *stream, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4); #else |