refactor disconnectFromFtp to remove cached entries when necessary
authorMatt Broadstone <mbroadstone@devonit.com>
Mon, 18 Aug 2014 21:02:52 +0000 (17:02 -0400)
committerMatt Broadstone <mbroadst@gmail.com>
Mon, 18 Aug 2014 21:48:44 +0000 (23:48 +0200)
commitc830cfab4f9b264c26c0111fe923562b82f72fed
tree6c41a9eca622f831a98d50b299ebe484cf87a1d3
parent469dcfff3e39249b0a5eb98242fbe5f917587246
refactor disconnectFromFtp to remove cached entries when necessary

In cases where a cached ftp connection fails to connect, or a file
transfer has failed, we should removed the cached connection. Since qnam
has an idea of a single internal QFtp per full operation, when file
transfers failed previously the cached connection would be reused for
subsequent connections and thus fail.

[ChangeLog][QtNetwork][QNetworkAccessManager] QNetworkAccessManager now
properly handles FTP transfer failures by removing failed cached ftp
connections.

Task-number: QTBUG-40797
(cherry picked and adapted from qtbase/45cbbe56bc13216b83215ea148590eccf81f420a)
Change-Id: Ie9eec5ec54af16a8d19e34d04bdd993cc7bbd0f5
Reviewed-by: Richard J. Moore <rich@kde.org>
src/network/access/qnetworkaccessftpbackend.cpp
src/network/access/qnetworkaccessftpbackend_p.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp