diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 3 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 70368d5e50..b6b37db242 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -610,6 +610,9 @@ bool QHttpNetworkConnectionChannel::ensureConnection() // here and there. socket->setReadBufferSize(64*1024); #else + // Need to dequeue the request so that we can emit the error. + if (!reply) + connection->d_func()->dequeueRequest(socket); connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolUnknownError); #endif } else { diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 7be9d278f7..a5a73e6e95 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -974,7 +974,11 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera #ifndef QT_NO_HTTP // Since Qt 5 we use the new QNetworkReplyHttpImpl - if (scheme == QLatin1String("http") || scheme == QLatin1String("https") ) { + if (scheme == QLatin1String("http") +#ifndef QT_NO_SSL + || scheme == QLatin1String("https") +#endif + ) { QNetworkReplyHttpImpl *reply = new QNetworkReplyHttpImpl(this, request, op, outgoingData); #ifndef QT_NO_BEARERMANAGEMENT connect(this, SIGNAL(networkSessionConnected()), |