QHttpThreadDelegate - remove unneeded code
Found while cleaning up SPDY remains: I've noticed that for H2 case I never check if incomingSslConfiguration is nullptr or not, but the code several lines below - does it, which looks kind of moronic. This configuration is initialized when the delegate is created, so no need to have this if-statement. Instead, assert, making this behavior a requirement. Change-Id: I90fb84337be925a3288252aa2491b4c23d6c6cbb Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
parent
137cbd1c72
commit
447ee95d5e
@ -297,6 +297,11 @@ void QHttpThreadDelegate::startRequest()
|
||||
connectionType = QHttpNetworkConnection::ConnectionTypeHTTP2Direct;
|
||||
}
|
||||
|
||||
#if QT_CONFIG(ssl)
|
||||
// See qnetworkreplyhttpimpl, delegate's initialization code.
|
||||
Q_ASSERT(!ssl || incomingSslConfiguration.data());
|
||||
#endif // QT_CONFIG(ssl)
|
||||
|
||||
const bool isH2 = httpRequest.isHTTP2Allowed() || httpRequest.isHTTP2Direct();
|
||||
if (isH2) {
|
||||
#if QT_CONFIG(ssl)
|
||||
@ -316,9 +321,6 @@ void QHttpThreadDelegate::startRequest()
|
||||
}
|
||||
|
||||
#ifndef QT_NO_SSL
|
||||
if (ssl && !incomingSslConfiguration.data())
|
||||
incomingSslConfiguration.reset(new QSslConfiguration);
|
||||
|
||||
if (!isH2 && httpRequest.isSPDYAllowed() && ssl) {
|
||||
connectionType = QHttpNetworkConnection::ConnectionTypeSPDY;
|
||||
urlCopy.setScheme(QStringLiteral("spdy")); // to differentiate SPDY requests from HTTPS requests
|
||||
|
Loading…
Reference in New Issue
Block a user