diff options
| author | Chris Wright <daverandom@php.net> | 2014-08-27 16:01:18 +0100 |
|---|---|---|
| committer | Chris Wright <daverandom@php.net> | 2014-08-27 16:01:18 +0100 |
| commit | 30a73658c63a91c413305a4c4d49882fda4dab3e (patch) | |
| tree | c469bb31d9c2a2729a4397b02ed0740170538c6f /main/php_streams.h | |
| parent | 7fac56e0729385bbd2bb040f06a20a697d9de5fd (diff) | |
| parent | 32be79dcfa1bc5af8682d9f512da68c5b3e2cbf3 (diff) | |
| download | php-git-30a73658c63a91c413305a4c4d49882fda4dab3e.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
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 6bb43c3f23..d08c2295be 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 |