Commit 719e1837 authored by Dawit Alemayehu's avatar Dawit Alemayehu
Browse files

Show correct SSL information on redirection.

BUG: 335389
FIXED-IN: 1.3.4
parent 4d9b3e74
......@@ -536,14 +536,16 @@ void WebPage::slotRequestFinished(QNetworkReply *reply)
const bool shouldResetSslInfo = (m_sslInfo.isValid() && !domainSchemeMatch(requestUrl, m_sslInfo.url()));
// Only deal with non-redirect responses...
const QVariant redirectVar = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
if (redirectVar.isValid()) {
const bool isMainFrameRequest = (frame == mainFrame());
if (isMainFrameRequest && redirectVar.isValid()) {
m_sslInfo.restoreFrom(reply->attribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::MetaData)),
reply->url(), shouldResetSslInfo);
return;
}
const int errCode = errorCodeFromReply(reply);
const bool isMainFrameRequest = (frame == mainFrame());
kDebug() << frame << "is main frame request?" << isMainFrameRequest << requestUrl;
// Handle any error...
switch (errCode) {
case 0:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment