AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QHttpNetworkConnectionPrivate::createAuthorization: refactor

Browse Source 
Grab a reference to the channel instead of indexing into the array
repeatedly.

Change-Id: I114d571fcfcfd3a751346b513cec728dc2fcda0a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2018-08-21 09:44:52 +02:00
parent 55feb0d08a
commit ea3a4a5003
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/access/qhttpnetworkconnection.cpp
View File

@ -584,32 +584,32 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
{ {
Q_ASSERT(socket); Q_ASSERT(socket);
int i = indexOf(socket); QHttpNetworkConnectionChannel &channel = channels[indexOf(socket)];
QAuthenticator *authenticator = &channels[i].authenticator; QAuthenticator *authenticator = &channel.authenticator;
QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(*authenticator); QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(*authenticator);
// Send "Authorization" header, but not if it's NTLM and the socket is already authenticated. // Send "Authorization" header, but not if it's NTLM and the socket is already authenticated.
if (priv && priv->method != QAuthenticatorPrivate::None) { if (priv && priv->method != QAuthenticatorPrivate::None) {
if ((priv->method != QAuthenticatorPrivate::Ntlm if ((priv->method != QAuthenticatorPrivate::Ntlm
&& request.headerField("Authorization").isEmpty()) && request.headerField("Authorization").isEmpty())
|| channels[i].lastStatus == 401) { || channel.lastStatus == 401) {
QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false), QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false),
request.url().host()); request.url().host());
request.setHeaderField("Authorization", response); request.setHeaderField("Authorization", response);
channels[i].authenticationCredentialsSent = true; channel.authenticationCredentialsSent = true;
} }
} }
#if QT_CONFIG(networkproxy) #if QT_CONFIG(networkproxy)
authenticator = &channels[i].proxyAuthenticator; authenticator = &channel.proxyAuthenticator;
priv = QAuthenticatorPrivate::getPrivate(*authenticator); priv = QAuthenticatorPrivate::getPrivate(*authenticator);
// Send "Proxy-Authorization" header, but not if it's NTLM and the socket is already authenticated. // Send "Proxy-Authorization" header, but not if it's NTLM and the socket is already authenticated.
if (priv && priv->method != QAuthenticatorPrivate::None) { if (priv && priv->method != QAuthenticatorPrivate::None) {
if (priv->method != QAuthenticatorPrivate::Ntlm || channels[i].lastStatus == 407) { if (priv->method != QAuthenticatorPrivate::Ntlm || channel.lastStatus == 407) {
QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false), QByteArray response = priv->calculateResponse(request.methodName(), request.uri(false),
networkProxy.hostName()); networkProxy.hostName());
request.setHeaderField("Proxy-Authorization", response); request.setHeaderField("Proxy-Authorization", response);
channels[i].proxyCredentialsSent = true; channel.proxyCredentialsSent = true;
} }
} }
#endif // QT_CONFIG(networkproxy) #endif // QT_CONFIG(networkproxy)