summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-07 21:57:17 (GMT)
committerTobias Markmann <tm@ayena.de>2015-10-07 21:57:17 (GMT)
commitdf5bfad6f032b17ee0dffe85cdaadc2c20edaae2 (patch)
tree5b5166d0aeae60ab78d75528adeea8ef620cd7bd /Swiften/Elements/PubSubPublish.cpp
parent37aafcb4d693a0b4f5944a52e0c070e5aa384245 (diff)
downloadswift-df5bfad6f032b17ee0dffe85cdaadc2c20edaae2.zip
swift-df5bfad6f032b17ee0dffe85cdaadc2c20edaae2.tar.bz2
Fix hang during file-transfer preparation with missing proxy
The code used to call the onProxiesFound signal only if a proxy was found. In case of missing S5B proxy at the users server, the file-transfer preparation would hang. Now the code wants until the discovery phase is done and then calls the onProxiesFound signal with the list of discovered proxies. In case of missing S5B proxy server the signal is called with an empty list so the file-transfer flow can continue. Test-Information: Ran FileTransferTest integration test and manually tested a file-transfer on a server without S5B proxy. Change-Id: I31d3cc08fe6453b5cdfe6be286f884a920470d28
Diffstat (limited to 'Swiften/Elements/PubSubPublish.cpp')
0 files changed, 0 insertions, 0 deletions