Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  improve fix for Bug #69545
This commit is contained in:
Stanislav Malyshev 2015-05-31 17:29:53 -07:00
commit 8746163153

View File

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