ftp-server.patch - sync with upstream

the patch has been applied upstream
Merge pull request #493 from lslezak/ftp-server_sync

ftp-server.patch - sync with upstream