Merge branch 'PHP-5.6'

* PHP-5.6:
  improve fix for Bug #69545
This commit is contained in:
Stanislav Malyshev 2015-05-31 17:30:41 -07:00
commit e0fb8c8b7f

View File

@ -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;
}