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/streams/streams.c | |
| 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/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 53e37ebe3b..3c57b405c5 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; |