diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/download.vala | 14 | ||||
| -rw-r--r-- | tests/tab.vala | 14 |
3 files changed, 30 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index af1f9d44..d9850bb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,10 @@ if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0") set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0) endif () endif () +if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.48.0") + add_definitions("-DHAVE_LIBSOUP_2_48_0") + set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0) +endif () if (${DEPS_gio-2.0_VERSION} VERSION_GREATER "2.40.0" OR WIN32) add_definitions("-DLIBNOTIFY_VERSION=\"No\"") diff --git a/tests/download.vala b/tests/download.vala index a3dc561a..4e2d641c 100644 --- a/tests/download.vala +++ b/tests/download.vala @@ -69,11 +69,23 @@ static void download_unique () { } void download_properties () { +#if HAVE_LIBSOUP_2_48_0 + var test_server = new Soup.Server ("server-header", null, null); + try { + test_server.listen_local (0, Soup.ServerListenOptions.IPV4_ONLY); + } + catch (Error error) { + GLib.error (error.message); + } + var port = test_server.get_uris ().data.port; +#else var test_address = new Soup.Address ("127.0.0.1", Soup.ADDRESS_ANY_PORT); test_address.resolve_sync (null); var test_server = new Soup.Server ("interface", test_address, null); - string test_url = "http://127.0.0.1:%u".printf (test_server.get_port ()); test_server.run_async (); + var port = test_server.get_port (); +#endif + string test_url = "http://127.0.0.1:%u".printf (port); test_server.add_handler ("/", (server, msg, path, query, client)=>{ Thread.usleep (1000000); /* 1 seconds in µs */ if ("/not_found/" in path) diff --git a/tests/tab.vala b/tests/tab.vala index de08953c..37814e28 100644 --- a/tests/tab.vala +++ b/tests/tab.vala @@ -178,11 +178,23 @@ void tab_http () { browser.add_tab (tab); var loop = MainContext.default (); +#if HAVE_LIBSOUP_2_48_0 + var test_server = new Soup.Server ("server-header", null, null); + try { + test_server.listen_local (0, Soup.ServerListenOptions.IPV4_ONLY); + } + catch (Error error) { + GLib.error (error.message); + } + var port = test_server.get_uris ().data.port; +#else var test_address = new Soup.Address ("127.0.0.1", Soup.ADDRESS_ANY_PORT); test_address.resolve_sync (null); var test_server = new Soup.Server ("interface", test_address, null); - string test_url = "http://127.0.0.1:%u".printf (test_server.get_port ()); test_server.run_async (); + var port = test_server.get_port (); +#endif + string test_url = "http://127.0.0.1:%u".printf (port); test_server.add_handler ("/", (server, msg, path, query, client)=>{ msg.set_status_full (200, "OK"); msg.response_body.append_take ("<body></body>".data); |