summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkreplyimpl.cpp
diff options
context:
space:
mode:
authorMårten Nordheim <morten242@gmail.com>2020-06-12 12:07:54 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2020-06-15 12:29:19 +0200
commita0bfa4e1f8e223927cbb285bb17d1a00a5c2d4b6 (patch)
tree70485146b53954db668c093050cc5a829d56f2b1 /src/network/access/qnetworkreplyimpl.cpp
parent6be9830d865be32f224e15d13ddefd9c7e176553 (diff)
QNAM: Remove network connectivity pre-check
The connectivity pre-check has been around for a long time, and it has caused various issues in that time. Certain scenarios, like using certain VPN configurations, might confuse the OS into thinking you don't have and network connectivity at all and abort the connection. Especially noticeable/frustrating when the connection was going to a host inside the local network. The negative impact of this change would at worst be that we might try to connect and it will wait some amount of time before the OS tells us the connection failed in situations where it would previously have been aborted before it started. But the false-negatives are not really an OK sacrifice in that case. Fixes: QTBUG-84907 Change-Id: I37fc69051e39df3c1a1fecb56ef54521a4d3d0c3 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access/qnetworkreplyimpl.cpp')
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index bc6bc53610..ecffc7131e 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -910,31 +910,6 @@ bool QNetworkReplyImpl::event(QEvent *e)
return QObject::event(e);
}
-QDisabledNetworkReply::QDisabledNetworkReply(QObject *parent,
- const QNetworkRequest &req,
- QNetworkAccessManager::Operation op)
-: QNetworkReply(parent)
-{
- setRequest(req);
- setUrl(req.url());
- setOperation(op);
- setFinished(true);
-
- qRegisterMetaType<QNetworkReply::NetworkError>();
-
- QString msg = QCoreApplication::translate("QNetworkAccessManager",
- "Network access is disabled.");
- setError(UnknownNetworkError, msg);
-
- QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
- Q_ARG(QNetworkReply::NetworkError, UnknownNetworkError));
- QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
-}
-
-QDisabledNetworkReply::~QDisabledNetworkReply()
-{
-}
-
QT_END_NAMESPACE
#include "moc_qnetworkreplyimpl_p.cpp"