diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-07 16:34:17 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-07 16:34:17 +0100 |
| commit | f7d407678570f8e4063b70bd30f3fc19c10442ea (patch) | |
| tree | 323784651013e8a2dbc3e62ee41990c93d0fc788 /main | |
| parent | 014ed76943071d674cdc308f28b74be18e1caf0c (diff) | |
| parent | 0f180a63ebb2d65bbe49b68d2430639b20443e9a (diff) | |
| download | php-git-f7d407678570f8e4063b70bd30f3fc19c10442ea.tar.gz | |
Merge branch '5.3' into 5.4
Diffstat (limited to 'main')
| -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 89fa3640f3..31473d6b66 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1028,8 +1028,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; |