diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-05-31 11:53:27 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-05-31 11:53:27 (GMT) |
| commit | 312fc45afc6829cf4af54f03d59548350d7be4e0 (patch) | |
| tree | 74594f9e2e0df61592b4f45e483f1526bff58a31 /src/network/access/qnetworkcookie.cpp | |
| parent | 39317d9583a4def0b7d1085778e302a8ccb3be86 (diff) | |
| parent | 50958288e4493920f18ef9f9b062e01bd4782239 (diff) | |
| download | Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.zip Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.tar.gz Qt-312fc45afc6829cf4af54f03d59548350d7be4e0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/network/access/qnetworkcookie.cpp')
| -rw-r--r-- | src/network/access/qnetworkcookie.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp index 865d338..d1bdd57 100644 --- a/src/network/access/qnetworkcookie.cpp +++ b/src/network/access/qnetworkcookie.cpp @@ -991,6 +991,8 @@ QList<QNetworkCookie> QNetworkCookiePrivate::parseSetCookieHeaderLine(const QByt } QString normalizedDomain = QUrl::fromAce(QUrl::toAce(QString::fromUtf8(rawDomain))); + if (normalizedDomain.isEmpty() && !rawDomain.isEmpty()) + return result; cookie.setDomain(maybeLeadingDot + normalizedDomain); } else if (field.first == "max-age") { bool ok = false; |