diff options
| author | Arnaud Le Blanc <lbarnaud@php.net> | 2008-11-04 17:05:55 +0000 |
|---|---|---|
| committer | Arnaud Le Blanc <lbarnaud@php.net> | 2008-11-04 17:05:55 +0000 |
| commit | d441b5db5bbd030475465230cc815c08348ce7cf (patch) | |
| tree | b3424dad6170c4b627c583c7ba6ce4ec87e30bc1 /main/streams/streams.c | |
| parent | 981d2ee6d0aae5ce92094ed50734fce97571aeef (diff) | |
| download | php-git-d441b5db5bbd030475465230cc815c08348ce7cf.tar.gz | |
MFH: Fixed stream_get_line() to behave as documented on non-blocking
streams
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index e392611351..530a8d8e14 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -890,6 +890,9 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re } if (!e) { + if (seek_len < maxlen && !stream->eof) { + return NULL; + } toread = maxlen; } else { toread = e - (char *) stream->readbuf - stream->readpos; |