diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:29:53 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-31 17:29:53 -0700 |
| commit | 8746163153157857fcb95b8ab33b77144d7ee7a8 (patch) | |
| tree | 71610772374530deb4ffb474b97638f6cabdf8e9 /ext/ftp | |
| parent | f029a2856b40dfb9093b85414c3e7419c43516f4 (diff) | |
| parent | 0765623d6991b62ffcd93ddb6be8a5203a2fa7e2 (diff) | |
| download | php-git-8746163153157857fcb95b8ab33b77144d7ee7a8.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
improve fix for Bug #69545
Diffstat (limited to 'ext/ftp')
| -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; } |