From: Shane Kearns <ext-shane.2.kearns@nokia.com>
Date: Fri, 8 Jun 2012 16:49:54 +0000 (+0100)
Subject: QNetworkCookie - ignore unparsable expires attribute
X-Git-Tag: 071012110112~219
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ff70a838b5dd06cd55e17e1e55d5922e5155745;p=profile%2Fivi%2Fqtbase.git

QNetworkCookie - ignore unparsable expires attribute

As required by RFC6265, if the date can't be parsed then the
attribute should be ignored but not the whole cookie.

Task-number: QTBUG-15794
Task-number: QTBUG-16798
Change-Id: I2ed2fbbaf2d00b194995349c24b174032a599703
Reviewed-by: Richard J. Moore <rich@kde.org>
---

diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index 1dd1e25..1fdf798 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -925,10 +925,9 @@ QList<QNetworkCookie> QNetworkCookiePrivate::parseSetCookieHeaderLine(const QByt
                     QByteArray dateString = cookieString.mid(position, end - position).trimmed();
                     position = end;
                     QDateTime dt = parseDateString(dateString.toLower());
-                    if (!dt.isValid()) {
-                        return result;
-                    }
-                    cookie.setExpirationDate(dt);
+                    if (dt.isValid())
+                        cookie.setExpirationDate(dt);
+                    //if unparsed, ignore the attribute but not the whole cookie (RFC6265 section 5.2.1)
                 } else if (field.first == "domain") {
                     QByteArray rawDomain = field.second;
                     //empty domain should be ignored (RFC6265 section 5.2.3)