Merge earth-team into origin/master'

4 files changed, 15 insertions, 13 deletions

diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 0438fb5..d827b03 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -1030,14 +1030,11 @@ QNetworkCacheMetaData QNetworkAccessHttpBackend::fetchCacheMetaData(const QNetwo
         if (hop_by_hop)
             continue;
 
-        // for 4.6.0, we were planning to not store the date header in the
-        // cached resource; through that we planned to reduce the number
-        // of writes to disk when using a QNetworkDiskCache (i.e. don't
-        // write to disk when only the date changes).
-        // However, without the date we cannot calculate the age of the page
-        // anymore.
-        //if (header == "date")
-            //continue;
+        // we are currently not using the date header to determine the expiration time of a page,
+        // but only the "Expires", "max-age" and "s-maxage" headers, see
+        // QNetworkAccessHttpBackend::validateCache() and below ("metaData.setExpirationDate()").
+        if (header == "date")
+            continue;
 
         // Don't store Warning 1xx headers
         if (header == "warning") {
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 9e1eaea..10fe74c 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -197,6 +197,9 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
 
 /*!
     Constructs a QNetworkConfigurationManager with the given \a parent.
+
+    Note that to ensure a valid list of current configurations immediately available, updating
+    is done during construction which causes some delay.
 */
 QNetworkConfigurationManager::QNetworkConfigurationManager(QObject *parent)
     : QObject(parent)
diff --git a/src/network/bearer/qsharednetworksession.cpp b/src/network/bearer/qsharednetworksession.cpp
index 28ca173..fcb0128 100644
--- a/src/network/bearer/qsharednetworksession.cpp
+++ b/src/network/bearer/qsharednetworksession.cpp
@@ -59,6 +59,11 @@ inline QSharedNetworkSessionManager* sharedNetworkSessionManager()
     return rv;
 }
 
+static void doDeleteLater(QObject* obj)
+{
+    obj->deleteLater();
+}
+
 QSharedPointer<QNetworkSession> QSharedNetworkSessionManager::getSession(QNetworkConfiguration config)
 {
     QSharedNetworkSessionManager *m(sharedNetworkSessionManager());
@@ -69,7 +74,7 @@ QSharedPointer<QNetworkSession> QSharedNetworkSessionManager::getSession(QNetwor
             return p;
     }
     //otherwise make one
-    QSharedPointer<QNetworkSession> session(new QNetworkSession(config));
+    QSharedPointer<QNetworkSession> session(new QNetworkSession(config), doDeleteLater);
     m->sessions[config] = session;
     return session;
 }
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 14f5af8..185f574 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -579,10 +579,7 @@ bool QLocalSocket::waitForDisconnected(int msecs)
 bool QLocalSocket::isValid() const
 {
     Q_D(const QLocalSocket);
-    if (d->handle == INVALID_HANDLE_VALUE)
-        return false;
-
-    return PeekNamedPipe(d->handle, NULL, 0, NULL, NULL, NULL);
+    return d->handle != INVALID_HANDLE_VALUE;
 }
 
 bool QLocalSocket::waitForReadyRead(int msecs)