diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-08 10:09:39 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-08 10:09:39 +0100 |
| commit | 471b1d54d507841b1e0a6f83ee55b6d2f5770a8c (patch) | |
| tree | 28ef3a28d0fbb849234f518d5fd993f53f901394 | |
| parent | 1bbf7013c8a8153e0fd9fb80e83234e522a48c86 (diff) | |
| parent | 3b09123de3de656d195dd31e84668edffadcaaba (diff) | |
| download | php-git-471b1d54d507841b1e0a6f83ee55b6d2f5770a8c.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | ext/ftp/ftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 4a06f3c854..c196318552 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -1857,7 +1857,7 @@ data_accepted: php_pollfd p; int i; - p.fd = ftp->fd; + p.fd = data->fd; p.events = (err == SSL_ERROR_WANT_READ) ? (POLLIN|POLLPRI) : POLLOUT; p.revents = 0; |