summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2016-07-21 19:31:30 +0200
committerTimm Bäder <mail@baedert.org>2017-02-21 17:00:12 +0100
commit9d1dbce10ccd89957055d46e9705a99500e20689 (patch)
tree11ff694ca05533eaaeb213846ad9d82696f983ed
parent5baf8b6f131abb8688dacb25c37ec8ea39780320 (diff)
downloadlibrest-9d1dbce10ccd89957055d46e9705a99500e20689.tar.gz
tests/proxy: Remove libsoup 2.28 check
configure.ac already checks for libsoup >= 2.42
-rw-r--r--tests/proxy.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/proxy.c b/tests/proxy.c
index 4cb9c32..79841a4 100644
--- a/tests/proxy.c
+++ b/tests/proxy.c
@@ -35,13 +35,6 @@
#include <libsoup/soup.h>
#include <rest/rest-proxy.h>
-#if SOUP_CHECK_VERSION (2, 28, 0)
-/* Avoid deprecation warning with newer libsoup */
-#define soup_message_headers_get soup_message_headers_get_one
-#endif
-
-#define PORT 8080
-
typedef struct {
SoupServer *server;
GMainLoop *main_loop;
@@ -118,7 +111,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
}
}
else if (g_str_equal (path, "/useragent/none")) {
- if (soup_message_headers_get (msg->request_headers, "User-Agent") == NULL) {
+ if (soup_message_headers_get_one (msg->request_headers, "User-Agent") == NULL) {
soup_message_set_status (msg, SOUP_STATUS_OK);
} else {
soup_message_set_status (msg, SOUP_STATUS_EXPECTATION_FAILED);
@@ -126,7 +119,7 @@ server_callback (SoupServer *server, SoupMessage *msg,
}
else if (g_str_equal (path, "/useragent/testsuite")) {
const char *value;
- value = soup_message_headers_get (msg->request_headers, "User-Agent");
+ value = soup_message_headers_get_one (msg->request_headers, "User-Agent");
if (g_strcmp0 (value, "TestSuite-1.0") == 0) {
soup_message_set_status (msg, SOUP_STATUS_OK);
} else {