summaryrefslogtreecommitdiff
path: root/libsoup/server
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2020-11-05 14:10:18 +0100
committerCarlos Garcia Campos <cgarcia@igalia.com>2020-11-05 14:10:18 +0100
commit252c2b39a657d4c0f9e841870cdf1482437eac62 (patch)
treec0003475271ebf5e670694ad935c54f88b700b21 /libsoup/server
parent7794572ab1b8aceac43756b6d4f006377a1442ae (diff)
downloadlibsoup-252c2b39a657d4c0f9e841870cdf1482437eac62.tar.gz
websocket: remove *_with_extentions variants
Diffstat (limited to 'libsoup/server')
-rw-r--r--libsoup/server/soup-server.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libsoup/server/soup-server.c b/libsoup/server/soup-server.c
index bc3f879d..33e4f6ee 100644
--- a/libsoup/server/soup-server.c
+++ b/libsoup/server/soup-server.c
@@ -920,11 +920,11 @@ complete_websocket_upgrade (SoupServer *server,
g_object_ref (msg);
stream = soup_server_message_steal_connection (msg);
- conn = soup_websocket_connection_new_with_extensions (stream, uri,
- SOUP_WEBSOCKET_CONNECTION_SERVER,
- soup_message_headers_get_one (soup_server_message_get_request_headers (msg), "Origin"),
- soup_message_headers_get_one (soup_server_message_get_response_headers (msg), "Sec-WebSocket-Protocol"),
- handler->websocket_extensions);
+ conn = soup_websocket_connection_new (stream, uri,
+ SOUP_WEBSOCKET_CONNECTION_SERVER,
+ soup_message_headers_get_one (soup_server_message_get_request_headers (msg), "Origin"),
+ soup_message_headers_get_one (soup_server_message_get_response_headers (msg), "Sec-WebSocket-Protocol"),
+ handler->websocket_extensions);
handler->websocket_extensions = NULL;
g_object_unref (stream);
@@ -959,11 +959,11 @@ got_body (SoupServer *server,
SoupServerPrivate *priv;
priv = soup_server_get_instance_private (server);
- if (soup_websocket_server_process_handshake_with_extensions (msg,
- handler->websocket_origin,
- handler->websocket_protocols,
- priv->websocket_extension_types,
- &handler->websocket_extensions)) {
+ if (soup_websocket_server_process_handshake (msg,
+ handler->websocket_origin,
+ handler->websocket_protocols,
+ priv->websocket_extension_types,
+ &handler->websocket_extensions)) {
g_signal_connect_object (msg, "wrote-informational",
G_CALLBACK (complete_websocket_upgrade),
server, G_CONNECT_SWAPPED);