From kde-commits  Mon Feb 28 23:14:50 2005
From: Waldo Bastian <bastian () kde ! org>
Date: Mon, 28 Feb 2005 23:14:50 +0000
To: kde-commits
Subject: KDE_3_4_BRANCH: kdelibs/kioslave/http/kcookiejar
Message-Id: <20050228231450.4B81116F7D () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110963250321950

CVS commit by waba: 

Use correct domain to store cookie policy
CCBUG: 100465


  M +3 -10     kcookiejar.cpp   1.121.2.1
  M +3 -2      kcookieserver.cpp   1.57.2.1


--- kdelibs/kioslave/http/kcookiejar/kcookieserver.cpp  #1.57:1.57.2.1
@@ -560,5 +560,6 @@ KCookieServer::setDomainAdvice(QString u
       QStringList domains;
       mCookieJar->extractDomains(fqdn, domains);
-      mCookieJar->setDomainAdvice(domains[0],
+      
+      mCookieJar->setDomainAdvice(domains[domains.count() > 3 ? 3 : 0],
                                   KCookieJar::strToAdvice(advice));
       // Save the cookie config if it has changed

--- kdelibs/kioslave/http/kcookiejar/kcookiejar.cpp  #1.121:1.121.2.1
@@ -999,12 +999,4 @@ KCookieAdvice KCookieJar::cookieAdvice(K
        if (!valid)
        {
-          // Maybe the domain doesn't start with a "."
-          QString domain = '.' + cookiePtr->domain();
-          if (domains.contains(domain))
-             valid = true;
-       }
-       
-       if (!valid)
-       {
           // Maybe it points to a sub-domain
           if (cookiePtr->domain().endsWith("."+cookiePtr->host()))
@@ -1113,5 +1105,6 @@ void KCookieJar::setDomainAdvice(const Q
 void KCookieJar::setDomainAdvice(KHttpCookiePtr cookiePtr, KCookieAdvice _advice)
 {
-    QString domain = stripDomain(cookiePtr); // We file the cookie under this domain.
+    QString domain;
+    stripDomain(cookiePtr->host(), domain); // We file the cookie under this domain.
 
     setDomainAdvice(domain, _advice);