diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-27 15:30:48 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-27 15:30:48 (GMT) |
commit | 15d8672d0981f4ea8605e3c905f11a71286ff35b (patch) | |
tree | 68ddb490d2e30348c26ac5eadc3b9f799e5d92af | |
parent | f21d183b26ea824fadb7c54a3ba9cdf66d99b726 (diff) | |
parent | 10b5653ad4f25c6f37d640facf4a5ef01fe25926 (diff) | |
download | Qt-15d8672d0981f4ea8605e3c905f11a71286ff35b.zip Qt-15d8672d0981f4ea8605e3c905f11a71286ff35b.tar.gz Qt-15d8672d0981f4ea8605e3c905f11a71286ff35b.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
-rw-r--r-- | src/corelib/io/qfilesystemwatcher_dnotify.cpp | 3 | ||||
-rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_dnotify.cpp b/src/corelib/io/qfilesystemwatcher_dnotify.cpp index 17ac9c6..03172e5 100644 --- a/src/corelib/io/qfilesystemwatcher_dnotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_dnotify.cpp @@ -295,6 +295,9 @@ QStringList QDnotifyFileSystemWatcherEngine::addPaths(const QStringList &paths, pathToFD.insert(path, fd); if(parentFd) parentToFD.insert(parentFd, fd); + + ::closedir(d); + if(parent) ::closedir(parent); } Directory &directory = fdToDirectory[fd]; diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 5fe716a..6d43c1d 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -3241,8 +3241,11 @@ void tst_QNetworkReply::receiveCookiesFromHttp_data() cookie = QNetworkCookie("a", "b"); cookie.setPath("/not/part-of-path"); header << cookie; + cookie.setDomain(QtNetworkSettings::serverName()); + jar << cookie; QTest::newRow("invalid-cookie-path") << "a=b; path=/not/part-of-path" << header << jar; + jar.clear(); cookie = QNetworkCookie("a", "b"); cookie.setDomain(".example.com"); header.clear(); |