Diff
Modified: trunk/ChangeLog (273544 => 273545)
--- trunk/ChangeLog 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/ChangeLog 2021-02-26 09:37:41 UTC (rev 273545)
@@ -1,3 +1,13 @@
+2021-02-26 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Bump libsoup3 version to 2.99.1
+ https://bugs.webkit.org/show_bug.cgi?id=222413
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2021-02-24 Cameron McCormack <[email protected]>
Fix typo in Introduction.md.
Modified: trunk/Source/WTF/ChangeLog (273544 => 273545)
--- trunk/Source/WTF/ChangeLog 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/WTF/ChangeLog 2021-02-26 09:37:41 UTC (rev 273545)
@@ -1,3 +1,12 @@
+2021-02-26 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Bump libsoup3 version to 2.99.1
+ https://bugs.webkit.org/show_bug.cgi?id=222413
+
+ Reviewed by Adrian Perez de Castro.
+
+ * wtf/Platform.h: Set minimum required version to 2.99
+
2021-02-25 Commit Queue <[email protected]>
Unreviewed, reverting r273503.
Modified: trunk/Source/WTF/wtf/Platform.h (273544 => 273545)
--- trunk/Source/WTF/wtf/Platform.h 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/WTF/wtf/Platform.h 2021-02-26 09:37:41 UTC (rev 273545)
@@ -99,7 +99,7 @@
#if USE(SOUP2)
#define SOUP_VERSION_MIN_REQUIRED SOUP_VERSION_2_54
#else
-#define SOUP_VERSION_MIN_REQUIRED SOUP_VERSION_2_90
+#define SOUP_VERSION_MIN_REQUIRED SOUP_VERSION_2_99
#endif
#endif
Modified: trunk/Source/WebCore/ChangeLog (273544 => 273545)
--- trunk/Source/WebCore/ChangeLog 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/WebCore/ChangeLog 2021-02-26 09:37:41 UTC (rev 273545)
@@ -1,3 +1,21 @@
+2021-02-26 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Bump libsoup3 version to 2.99.1
+ https://bugs.webkit.org/show_bug.cgi?id=222413
+
+ Reviewed by Adrian Perez de Castro.
+
+ Use new session getters and setters instead of g_object_get/set.
+
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::SoupNetworkSession):
+ (WebCore::SoupNetworkSession::setProxySettings):
+ (WebCore::SoupNetworkSession::setAcceptLanguages):
+ * platform/network/soup/SoupVersioning.h:
+ (soup_session_set_proxy_resolver):
+ (soup_session_get_proxy_resolver):
+ (soup_session_set_accept_language):
+
2021-02-25 Chris Dumez <[email protected]>
Fix threading issue in ScriptProcessorNode::process()
Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (273544 => 273545)
--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2021-02-26 09:37:41 UTC (rev 273545)
@@ -101,8 +101,7 @@
}
SoupNetworkSession::SoupNetworkSession(PAL::SessionID sessionID)
- : m_soupSession(adoptGRef(soup_session_new()))
- , m_sessionID(sessionID)
+ : m_sessionID(sessionID)
{
// Values taken from http://www.browserscope.org/ following
// the rule "Do What Every Other Modern Browser Is Doing". They seem
@@ -111,12 +110,12 @@
static const int maxConnections = 17;
static const int maxConnectionsPerHost = 6;
- g_object_set(m_soupSession.get(),
+ m_soupSession = adoptGRef(soup_session_new_with_options(
"max-conns", maxConnections,
"max-conns-per-host", maxConnectionsPerHost,
"timeout", 0,
"idle-timeout", 0,
- nullptr);
+ nullptr));
soup_session_add_feature_by_type(m_soupSession.get(), SOUP_TYPE_CONTENT_SNIFFER);
soup_session_add_feature_by_type(m_soupSession.get(), SOUP_TYPE_AUTH_NTLM);
@@ -281,10 +280,8 @@
GRefPtr<GProxyResolver> resolver;
switch (m_proxySettings.mode) {
case SoupNetworkProxySettings::Mode::Default: {
- GRefPtr<GProxyResolver> currentResolver;
- g_object_get(m_soupSession.get(), "proxy-resolver", ¤tResolver.outPtr(), nullptr);
GProxyResolver* defaultResolver = g_proxy_resolver_get_default();
- if (currentResolver.get() == defaultResolver)
+ if (defaultResolver == soup_session_get_proxy_resolver(m_soupSession.get()))
return;
resolver = defaultResolver;
break;
@@ -303,7 +300,7 @@
break;
}
- g_object_set(m_soupSession.get(), "proxy-resolver", resolver.get(), nullptr);
+ soup_session_set_proxy_resolver(m_soupSession.get(), resolver.get());
soup_session_abort(m_soupSession.get());
}
@@ -314,7 +311,7 @@
void SoupNetworkSession::setAcceptLanguages(const CString& languages)
{
- g_object_set(m_soupSession.get(), "accept-language", languages.data(), nullptr);
+ soup_session_set_accept_language(m_soupSession.get(), languages.data());
}
void SoupNetworkSession::setIgnoreTLSErrors(bool ignoreTLSErrors)
Modified: trunk/Source/WebCore/platform/network/soup/SoupVersioning.h (273544 => 273545)
--- trunk/Source/WebCore/platform/network/soup/SoupVersioning.h 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/WebCore/platform/network/soup/SoupVersioning.h 2021-02-26 09:37:41 UTC (rev 273545)
@@ -138,4 +138,24 @@
soup_auth_cancel(SoupAuth*)
{
}
+
+static inline void
+soup_session_set_proxy_resolver(SoupSession* session, GProxyResolver* resolver)
+{
+ g_object_set(session, "proxy-resolver", resolver, nullptr);
+}
+
+static inline GProxyResolver*
+soup_session_get_proxy_resolver(SoupSession* session)
+{
+ GRefPtr<GProxyResolver> resolver;
+ g_object_get(session, "proxy-resolver", &resolver.outPtr(), nullptr);
+ return resolver.get();
+}
+
+static inline void
+soup_session_set_accept_language(SoupSession* session, const char* acceptLanguage)
+{
+ g_object_set(session, "accept-language", acceptLanguage, nullptr);
+}
#endif // USE(SOUP2)
Modified: trunk/Source/cmake/OptionsGTK.cmake (273544 => 273545)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-02-26 09:37:41 UTC (rev 273545)
@@ -201,7 +201,7 @@
if (USE_SOUP2)
set(SOUP_MINIMUM_VERSION 2.54.0)
else ()
- set(SOUP_MINIMUM_VERSION 2.91.0)
+ set(SOUP_MINIMUM_VERSION 2.99.1)
endif ()
find_package(LibSoup ${SOUP_MINIMUM_VERSION} REQUIRED)
Modified: trunk/Source/cmake/OptionsWPE.cmake (273544 => 273545)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-02-26 09:20:38 UTC (rev 273544)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-02-26 09:37:41 UTC (rev 273545)
@@ -130,7 +130,7 @@
if (USE_SOUP2)
set(SOUP_MINIMUM_VERSION 2.54.0)
else ()
- set(SOUP_MINIMUM_VERSION 2.91.0)
+ set(SOUP_MINIMUM_VERSION 2.99.1)
endif ()
find_package(LibSoup ${SOUP_MINIMUM_VERSION} REQUIRED)
