File 0003-Show-correct-SSL-information-on-redirectio... of Package kwebkitpart

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Show-correct-SSL-information-on-redirection.patch of Package kwebkitpart

From 719e1837089fea66b07885a47ebebcbedc5c89ea Mon Sep 17 00:00:00 2001
From: Dawit Alemayehu <adawit@kde.org>
Date: Tue, 27 May 2014 08:25:58 -0400
Subject: [PATCH 5/5] Show correct SSL information on redirection. BUG: 335389
 FIXED-IN: 1.3.4

---
 src/webpage.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 68ebd85..df1c41c 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -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:
-- 
1.9.3

Places

File 0003-Show-correct-SSL-information-on-redirection.patch of Package kwebkitpart

Places