diff options
| author | Chris Wright <daverandom@php.net> | 2014-08-27 16:06:28 +0100 |
|---|---|---|
| committer | Chris Wright <daverandom@php.net> | 2014-08-27 16:06:28 +0100 |
| commit | db03216e62180000d7296c0498f7141ce62f66d8 (patch) | |
| tree | 3ebc30774bc816a1fa7de8b5aec1d7411ab917f6 /main/streams/streams.c | |
| parent | 4d667eeaf39853c4c7cbae9f5eaad40c704bffe8 (diff) | |
| parent | 30a73658c63a91c413305a4c4d49882fda4dab3e (diff) | |
| download | php-git-db03216e62180000d7296c0498f7141ce62f66d8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 67a151014d..d0d4fffa0a 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; |