From 746dddeb9f95b45d23256177efe2b474ef104640 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 11 Dec 2013 11:16:08 +0100 Subject: QNetworkCookie: allow cookies for IPv4 domains If the domain is an IP address, we should not do any magic regarding leading dots etc. Task-number: QTBUG-35022 Change-Id: I7722de4e6027666dde27e9e37b6353e3da775d94 Reviewed-by: Thiago Macieira Reviewed-by: Richard J. Moore --- .../auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp') diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp index 4ee4b67ec0..25d91d63f5 100644 --- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp +++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp @@ -211,6 +211,11 @@ void tst_QNetworkCookieJar::setCookiesFromUrl_data() result += cookie; QTest::newRow("effective-tld2-accepted") << preset << cookie << "http://www.gobiernoelectronico.ar" << result << true; + result.clear(); + preset.clear(); + cookie.setDomain("127.0.0.1"); + result += cookie; + QTest::newRow("IPv4-address-as-domain") << preset << cookie << "http://127.0.0.1/" << result << true; // setting the defaults: finalCookie = cookie; -- cgit v1.2.3 From ae293c1cb220847194fba6dcebdbb9194837bb56 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 26 Nov 2013 13:58:47 -0500 Subject: QNetworkCookie: allow cookies for IPv6 domains For IPv6 addresses don't call toAce as it returns the empty string. We should reflect the behavior of browsers here, which all accept cookies from IPv6 addresses. Original-patch-by: David Tapuska Task-number: QTBUG-35022 Change-Id: Ic00369e923d044ec459822b2405865c13e4185b6 Reviewed-by: Thiago Macieira Reviewed-by: Richard J. Moore --- .../auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp') diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp index 25d91d63f5..bcfe9f090f 100644 --- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp +++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp @@ -217,6 +217,12 @@ void tst_QNetworkCookieJar::setCookiesFromUrl_data() result += cookie; QTest::newRow("IPv4-address-as-domain") << preset << cookie << "http://127.0.0.1/" << result << true; + result.clear(); + preset.clear(); + cookie.setDomain("fe80::250:56ff:fec0:1"); + result += cookie; + QTest::newRow("IPv6-address-as-domain") << preset << cookie << "http://[fe80::250:56ff:fec0:1]/" << result << true; + // setting the defaults: finalCookie = cookie; finalCookie.setPath("/something/"); -- cgit v1.2.3