diff options
Diffstat (limited to 'src/network/access/qhttpprotocolhandler.cpp')
-rw-r--r-- | src/network/access/qhttpprotocolhandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp index 36102909df..28eab03890 100644 --- a/src/network/access/qhttpprotocolhandler.cpp +++ b/src/network/access/qhttpprotocolhandler.cpp @@ -93,7 +93,8 @@ void QHttpProtocolHandler::_q_receiveReply() } else { replyPrivate->autoDecompress = false; } - if (m_reply->statusCode() == 100) { + const int statusCode = m_reply->statusCode(); + if (statusCode == 100 || (102 <= statusCode && statusCode <= 199)) { replyPrivate->clearHttpLayerInformation(); replyPrivate->state = QHttpNetworkReplyPrivate::ReadingStatusState; break; // ignore @@ -238,8 +239,7 @@ bool QHttpProtocolHandler::sendRequest() // _q_connected or _q_encrypted return false; } - QString scheme = m_channel->request.url().scheme(); - if (scheme == "preconnect-http"_L1 || scheme == "preconnect-https"_L1) { + if (m_channel->request.isPreConnect()) { m_channel->state = QHttpNetworkConnectionChannel::IdleState; m_reply->d_func()->state = QHttpNetworkReplyPrivate::AllDoneState; m_channel->allDone(); @@ -298,7 +298,7 @@ bool QHttpProtocolHandler::sendRequest() sendRequest(); //recurse } else { // no data to send: just send the HTTP headers - m_socket->write(qExchange(m_header, {})); + m_socket->write(std::exchange(m_header, {})); QMetaObject::invokeMethod(m_reply, "requestSent", Qt::QueuedConnection); m_channel->state = QHttpNetworkConnectionChannel::WaitingState; // now wait for response sendRequest(); //recurse @@ -314,7 +314,7 @@ bool QHttpProtocolHandler::sendRequest() // the upload device might have no data to send, but we still have to send the headers, // do it now. if (!m_header.isEmpty()) - m_socket->write(qExchange(m_header, {})); + m_socket->write(std::exchange(m_header, {})); if (uploadByteDevice) emit m_reply->dataSendProgress(m_channel->written, m_channel->bytesTotal); m_channel->state = QHttpNetworkConnectionChannel::WaitingState; // now wait for response @@ -371,7 +371,7 @@ bool QHttpProtocolHandler::sendRequest() // assemble header and data and send them together const qint64 headerSize = m_header.size(); m_header.append(readPointer, currentReadSize); - currentWriteSize = m_socket->write(qExchange(m_header, {})); + currentWriteSize = m_socket->write(std::exchange(m_header, {})); if (currentWriteSize != -1) currentWriteSize -= headerSize; QMetaObject::invokeMethod(m_reply, "requestSent", Qt::QueuedConnection); |