Changeset 219290 in webkit

Timestamp:

Jul 10, 2017 6:21:35 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] SoupCookieJar is never released (resulting in sqlite temp files lying around)
​https://bugs.webkit.org/show_bug.cgi?id=166029

Reviewed by Michael Catanzaro.

Source/WebCore:

Add clearSoupNetworkSessionAndCookieStorage() to clear the SoupNetworkSession and cookie storage of the main
network session, ensuring the cookies database is properly closed.

• platform/network/NetworkStorageSession.h:
• platform/network/soup/NetworkStorageSessionSoup.cpp:

(WebCore::NetworkStorageSession::clearSoupNetworkSessionAndCookieStorage):

Source/WebKit2:

Clear the SoupNetworkSession and cookie storage after the main loop quits.

• NetworkProcess/soup/NetworkProcessMainSoup.cpp:

(WebKit::NetworkProcessMainUnix):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/NetworkStorageSession.h (modified) (1 diff)
• WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] SoupCookieJar is never released (resulting in sqlite temp files lying around)
+        https://bugs.webkit.org/show_bug.cgi?id=166029
+
+        Reviewed by Michael Catanzaro.
+
+        Add clearSoupNetworkSessionAndCookieStorage() to clear the SoupNetworkSession and cookie storage of the main
+        network session, ensuring the cookies database is properly closed.
+
+        * platform/network/NetworkStorageSession.h:
+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
+        (WebCore::NetworkStorageSession::clearSoupNetworkSessionAndCookieStorage):
+
 2017-07-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/network/NetworkStorageSession.h

@@ -93 +93 @@
     SoupNetworkSession* soupNetworkSession() const { return m_session.get(); };
     SoupNetworkSession& getOrCreateSoupNetworkSession() const;
+    void clearSoupNetworkSessionAndCookieStorage();
     SoupCookieJar* cookieStorage() const;
     void setCookieStorage(SoupCookieJar*);

trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp

@@ -104 +104 @@
 }
 
+void NetworkStorageSession::clearSoupNetworkSessionAndCookieStorage()
+{
+    ASSERT(defaultSession().get() == this);
+    m_session = nullptr;
+    m_cookieObserverHandler = nullptr;
+    m_cookieStorage = nullptr;
+}
+
 void NetworkStorageSession::cookiesDidChange(NetworkStorageSession* session)
 {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] SoupCookieJar is never released (resulting in sqlite temp files lying around)
+        https://bugs.webkit.org/show_bug.cgi?id=166029
+
+        Reviewed by Michael Catanzaro.
+
+        Clear the SoupNetworkSession and cookie storage after the main loop quits.
+
+        * NetworkProcess/soup/NetworkProcessMainSoup.cpp:
+        (WebKit::NetworkProcessMainUnix):
+
 2017-07-10  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp

@@ -30 +30 @@
 #include "ChildProcessMain.h"
 #include "NetworkProcessMainUnix.h"
+#include <WebCore/NetworkStorageSession.h>
 
 namespace WebKit {
 
+class NetworkProcessMain final: public ChildProcessMainBase {
+public:
+    void platformFinalize() override
+    {
+        WebCore::NetworkStorageSession::defaultStorageSession().clearSoupNetworkSessionAndCookieStorage();
+    }
+};
+
 int NetworkProcessMainUnix(int argc, char** argv)
 {
-    return ChildProcessMain<NetworkProcess, ChildProcessMainBase>(argc, argv);
+    return ChildProcessMain<NetworkProcess, NetworkProcessMain>(argc, argv);
 }