src/network/access/qnetworkcookiejar.cpp
branchGCC_SURGE
changeset 31 5daf16870df6
parent 30 5dc02b23752f
--- a/src/network/access/qnetworkcookiejar.cpp	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/network/access/qnetworkcookiejar.cpp	Thu Jul 22 16:41:55 2010 +0100
@@ -269,6 +269,7 @@
     Q_D(const QNetworkCookieJar);
     QDateTime now = QDateTime::currentDateTime();
     QList<QNetworkCookie> result;
+    bool isEncrypted = url.scheme().toLower() == QLatin1String("https");
 
     // scan our cookies for something that matches
     QList<QNetworkCookie>::ConstIterator it = d->allCookies.constBegin(),
@@ -280,6 +281,8 @@
             continue;
         if (!(*it).isSessionCookie() && (*it).expirationDate() < now)
             continue;
+        if ((*it).isSecure() && !isEncrypted)
+            continue;
 
         // insert this cookie into result, sorted by path
         QList<QNetworkCookie>::Iterator insertIt = result.begin();