From: Shane Kearns <ext-shane.2.kearns@nokia.com>
Date: Tue, 28 Feb 2012 14:53:42 +0000 (+0000)
Subject: network cookies: check "example.com" != "example.com."
X-Git-Tag: qt-v5.0.0-alpha1~668
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d5b0e2b042c5f6c3074cd20ba9baf9dfd733203;p=profile%2Fivi%2Fqtbase.git

network cookies: check "example.com" != "example.com."

Only test code change, we already have the correct behaviour

Task-number: QTBUG-20001
Change-Id: I2296f405f47f9c8d15796e69f9d1854063e38d6a
Reviewed-by: Richard J. Moore <rich@kde.org>
---

diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 0e046ad..5dffe68 100644
--- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -278,6 +278,8 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
     QTest::newRow("no-match-6") << allCookies << "http://nokia.com/webinar" << result;
     QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
+    QTest::newRow("no-match-8") << allCookies << "http://qt.nokia.com./web" << result;
+    QTest::newRow("no-match-9") << allCookies << "http://nokia.com./web" << result;
 
     result = allCookies;
     QTest::newRow("match-1") << allCookies << "http://nokia.com/web" << result;
@@ -350,6 +352,16 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QTest::newRow("match-secure-1") << allCookies << "https://nokia.com/web" << result;
     QTest::newRow("match-secure-2") << allCookies << "https://qt.nokia.com/web" << result;
 
+    // domain ending in .
+    allCookies.clear();
+    result.clear();
+    QNetworkCookie cookieDot;
+    cookieDot.setDomain(".example.com.");
+    cookieDot.setName("a");
+    allCookies += cookieDot;
+    QTest::newRow("no-match-domain-dot") << allCookies << "http://example.com" << result;
+    result += cookieDot;
+    QTest::newRow("match-domain-dot") << allCookies << "http://example.com." << result;
 }
 
 void tst_QNetworkCookieJar::cookiesForUrl()