diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:30:41 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:30:41 -0700 |
| commit | e0fb8c8b7f7cf85583ea38ab63a7776f29f1443b (patch) | |
| tree | 74fd415bebaec2427e337bf1732fd0f0df159cc4 | |
| parent | 07241bbd70cce10518781705fdd9cc18b4692f0b (diff) | |
| parent | 4758505b27dbfbade703d80737b9d50a9c2b9dea (diff) | |
| download | php-git-e0fb8c8b7f7cf85583ea38ab63a7776f29f1443b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
improve fix for Bug #69545
| -rw-r--r-- | ext/ftp/ftp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 12828c676b..bb41b1a621 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -1837,8 +1837,6 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path) for (ptr = data->buf; rcvd; rcvd--, ptr++) { if (*ptr == '\n' && lastch == '\r') { lines++; - } else { - size++; } lastch = *ptr; } |