Changeset 270074 in webkit

Timestamp:

Nov 20, 2020 1:40:14 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Migrate WebKitTestServer to libsoup 2.48 API
​https://bugs.webkit.org/show_bug.cgi?id=219160

Patch by Frederic Wang <​fwang@igalia.com> on 2020-11-20
Reviewed by Carlos Garcia Campos.

• TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:

(WebKitTestServer::WebKitTestServer): SOUP_SERVER_INTERFACE and soup_server_get_port are
deprecated. The libsoup doc recommends to use soup_server_listen* and soup_server_get_uris
instead. Existing code uses 127.0.0.1 (https or http) which corresponds to calling
soup_server_listen_local with thIPV4_ONLY (and HTTPS or HTTP) option.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-20  Frederic Wang  <fwang@igalia.com>
+
+        [GTK] Migrate WebKitTestServer to libsoup 2.48 API
+        https://bugs.webkit.org/show_bug.cgi?id=219160
+
+        Reviewed by Carlos Garcia Campos.
+
+        * TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:
+        (WebKitTestServer::WebKitTestServer): SOUP_SERVER_INTERFACE and soup_server_get_port are
+        deprecated. The libsoup doc recommends to use soup_server_listen* and soup_server_get_uris
+        instead. Existing code uses 127.0.0.1 (https or http) which corresponds to calling
+        soup_server_listen_local with thIPV4_ONLY (and HTTPS or HTTP) option.
+
 2020-11-19  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp

@@ -40 +40 @@
     }
 
-    GRefPtr<SoupAddress> address = adoptGRef(soup_address_new("127.0.0.1", SOUP_ADDRESS_ANY_PORT));
-    soup_address_resolve_sync(address.get(), 0);
-
-    m_soupServer = adoptGRef(soup_server_new(SOUP_SERVER_INTERFACE, address.get(),
+    m_soupServer = adoptGRef(soup_server_new(
         SOUP_SERVER_ASYNC_CONTEXT, m_queue ? m_queue->runLoop().mainContext() : nullptr,
         SOUP_SERVER_SSL_CERT_FILE, sslCertificateFile.get(),
         SOUP_SERVER_SSL_KEY_FILE, sslKeyFile.get(), nullptr));
-    m_baseURI = options & ServerHTTPS ? soup_uri_new("https://127.0.0.1/") : soup_uri_new("http://127.0.0.1/");
-    soup_uri_set_port(m_baseURI, soup_server_get_port(m_soupServer.get()));
+
+    GUniqueOutPtr<GError> error;
+    SoupServerListenOptions serverOptions = static_cast<SoupServerListenOptions>(options & ServerHTTPS ? SOUP_SERVER_LISTEN_IPV4_ONLY : SOUP_SERVER_LISTEN_IPV4_ONLY | SOUP_SERVER_LISTEN_HTTPS);
+    if (!soup_server_listen_local(m_soupServer.get(), SOUP_ADDRESS_ANY_PORT, serverOptions, &error.outPtr())) {
+        WTFLogAlways("Failed to start HTTP server: %s", error->message);
+        CRASH();
+    }
+
+    GSList* uris = soup_server_get_uris(m_soupServer.get());
+    ASSERT(uris);
+    m_baseURI = static_cast<SoupURI*>(g_object_ref(uris->data));
+    g_slist_free_full(uris, g_object_unref);
 }