diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-04-29 22:32:23 +0000 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-04-29 22:32:23 +0000 |
| commit | 63e559a00201f97f3446d2829abc0d7468993969 (patch) | |
| tree | 419a6c1af0541f91db1036b364621c31946782a7 /tests | |
| parent | 440fe3c55fb87aa5ad80b624984066c90e4a41a6 (diff) | |
| download | epiphany-63e559a00201f97f3446d2829abc0d7468993969.tar.gz | |
Revert "Add support for soup3"
This reverts commit 440fe3c55fb87aa5ad80b624984066c90e4a41a6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ephy-web-view-test.c | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c index 05b6558aa..22a473011 100644 --- a/tests/ephy-web-view-test.c +++ b/tests/ephy-web-view-test.c @@ -38,14 +38,6 @@ #define HTML_STRING "testing-ephy-web-view" #define SERVER_PORT 12321 -#if SOUP_CHECK_VERSION (2, 99, 4) -static void -server_callback (SoupServer *server, - SoupServerMessage *msg, - const char *path, - GHashTable *query, - gpointer data) -#else static void server_callback (SoupServer *server, SoupMessage *msg, @@ -53,39 +45,20 @@ server_callback (SoupServer *server, GHashTable *query, SoupClientContext *context, gpointer data) -#endif { - SoupMessageHeaders *response_headers; - SoupMessageBody *response_body; - -#if SOUP_CHECK_VERSION (2, 99, 4) - response_headers = soup_server_message_get_response_headers (msg); - response_body = soup_server_message_get_response_body (msg); -#else - response_headers = msg->response_headers; - response_body = msg->response_body; -#endif - - if (!strcmp (path, "/redirect")) { -#if SOUP_CHECK_VERSION (2, 99, 4) - soup_server_message_set_status (msg, SOUP_STATUS_MOVED_PERMANENTLY, NULL); -#else + if (!strcmp (path, "/cancelled")) + soup_message_set_status (msg, SOUP_STATUS_CANT_CONNECT); + else if (!strcmp (path, "/redirect")) { soup_message_set_status (msg, SOUP_STATUS_MOVED_PERMANENTLY); -#endif - soup_message_headers_append (response_headers, "Location", "/redirect-result"); - } else { -#if SOUP_CHECK_VERSION (2, 99, 4) - soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL); -#else + soup_message_headers_append (msg->response_headers, "Location", "/redirect-result"); + } else soup_message_set_status (msg, SOUP_STATUS_OK); -#endif - } - soup_message_body_append (response_body, SOUP_MEMORY_STATIC, + soup_message_body_append (msg->response_body, SOUP_MEMORY_STATIC, HTML_STRING, strlen (HTML_STRING)); - soup_message_body_complete (response_body); + soup_message_body_complete (msg->response_body); } static void |