diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:30:29 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:30:29 -0700 |
| commit | 4758505b27dbfbade703d80737b9d50a9c2b9dea (patch) | |
| tree | 4bc56533098161363cd341f69f6b521eea3bfcb7 | |
| parent | 34bcd69f824a724fa5272cd0c2dc649fec8a4f13 (diff) | |
| parent | 8746163153157857fcb95b8ab33b77144d7ee7a8 (diff) | |
| download | php-git-4758505b27dbfbade703d80737b9d50a9c2b9dea.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 4e1b072246..d40e964b7f 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -1663,8 +1663,6 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC) for (ptr = data->buf; rcvd; rcvd--, ptr++) { if (*ptr == '\n' && lastch == '\r') { lines++; - } else { - size++; } lastch = *ptr; } |