Modified: trunk/Source/WebCore/ChangeLog (230251 => 230252)
--- trunk/Source/WebCore/ChangeLog 2018-04-04 06:55:15 UTC (rev 230251)
+++ trunk/Source/WebCore/ChangeLog 2018-04-04 09:31:31 UTC (rev 230252)
@@ -1,3 +1,14 @@
+2018-04-04 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix the build with libsoup < 2.49.91 after r230251.
+
+ Stop using ResourceHandle in SoupNetworkSession.
+
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::SoupNetworkSession):
+ (WebCore::authenticateCallback): Deleted.
+ (WebCore::requestStartedCallback): Deleted.
+
2018-04-03 Alex Christensen <achristen...@webkit.org>
Remove unused libsoup ResourceHandle implementation
Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (230251 => 230252)
--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2018-04-04 06:55:15 UTC (rev 230251)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2018-04-04 09:31:31 UTC (rev 230252)
@@ -33,7 +33,6 @@
#include "FileSystem.h"
#include "GUniquePtrSoup.h"
#include "Logging.h"
-#include "ResourceHandle.h"
#include "SoupNetworkProxySettings.h"
#include <glib/gstdio.h>
#include <libsoup/soup.h>
@@ -95,24 +94,6 @@
return certificates;
}
-static void authenticateCallback(SoupSession*, SoupMessage* soupMessage, SoupAuth* soupAuth, gboolean retrying)
-{
- RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(g_object_get_data(G_OBJECT(soupMessage), "handle"));
- if (!handle)
- return;
- handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(soupMessage, soupAuth, retrying, handle.get()));
-}
-
-#if !SOUP_CHECK_VERSION(2, 49, 91)
-static void requestStartedCallback(SoupSession*, SoupMessage* soupMessage, SoupSocket*, gpointer)
-{
- RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(g_object_get_data(G_OBJECT(soupMessage), "handle"));
- if (!handle)
- return;
- handle->didStartRequest();
-}
-#endif
-
SoupNetworkSession::SoupNetworkSession(PAL::SessionID sessionID, SoupCookieJar* cookieJar)
: m_soupSession(adoptGRef(soup_session_async_new()))
{
@@ -159,11 +140,6 @@
if (gProxySettings.mode != SoupNetworkProxySettings::Mode::Default)
setupProxy();
setupLogger();
-
- g_signal_connect(m_soupSession.get(), "authenticate", G_CALLBACK(authenticateCallback), nullptr);
-#if !SOUP_CHECK_VERSION(2, 49, 91)
- g_signal_connect(m_soupSession.get(), "request-started", G_CALLBACK(requestStartedCallback), nullptr);
-#endif
}
SoupNetworkSession::~SoupNetworkSession() = default;
