diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-07 16:34:37 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-07 16:34:37 +0100 |
| commit | bd5f52fd94148b97114e400962c44c29a44694c2 (patch) | |
| tree | 6f5a97629552944dc5bba0a80fec8a3ef45e16e5 /main/streams/streams.c | |
| parent | 7497aa9c4e48635b06b7688ecd5c1a9d32b017d4 (diff) | |
| parent | f7d407678570f8e4063b70bd30f3fc19c10442ea (diff) | |
| download | php-git-bd5f52fd94148b97114e400962c44c29a44694c2.tar.gz | |
Merge branch '5.4'
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index b623ffb201..35580739cb 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1023,8 +1023,8 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re char *ret_buf, /* returned buffer */ *found_delim = NULL; size_t buffered_len, - tent_ret_len; /* tentative returned length*/ - int has_delim = delim_len > 0 && delim[0] != '\0'; + tent_ret_len; /* tentative returned length */ + int has_delim = delim_len > 0; if (maxlen == 0) { return NULL; |