[libsoup/wip/http2] http2: disable content sniffer support
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/http2] http2: disable content sniffer support
- Date: Mon, 17 May 2021 13:36:04 +0000 (UTC)
commit f03639bb42b8e546d95a5e2dead2142ed57206d1
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Mon May 17 15:21:33 2021 +0200
http2: disable content sniffer support
It's causing many issues, let's remove it for now.
libsoup/http2/soup-client-message-io-http2.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/libsoup/http2/soup-client-message-io-http2.c b/libsoup/http2/soup-client-message-io-http2.c
index 56d42681..a356c09f 100644
--- a/libsoup/http2/soup-client-message-io-http2.c
+++ b/libsoup/http2/soup-client-message-io-http2.c
@@ -55,7 +55,6 @@ typedef enum {
STATE_WRITE_DONE,
STATE_READ_HEADERS,
STATE_READ_DATA,
- STATE_READ_DATA_SNIFFED,
STATE_READ_DONE,
STATE_ERROR,
} SoupHTTP2IOState;
@@ -167,8 +166,6 @@ state_to_string (SoupHTTP2IOState state)
return "READ_HEADERS";
case STATE_READ_DATA:
return "REA_DATA";
- case STATE_READ_DATA_SNIFFED:
- return "READ_DATA_SNIFFED";
case STATE_READ_DONE:
return "READ_DONE";
case STATE_ERROR:
@@ -454,22 +451,9 @@ on_data_chunk_recv_callback (nghttp2_session *session,
if (msgdata->paused)
return NGHTTP2_ERR_PAUSE;
- SoupMessage *msg = msgdata->msg;
g_assert (msgdata->body_istream != NULL);
soup_body_input_stream_http2_add_data (SOUP_BODY_INPUT_STREAM_HTTP2 (msgdata->body_istream), data,
len);
- if (msgdata->state < STATE_READ_DATA_SNIFFED) {
- GError *error = NULL;
-
- if (soup_message_try_sniff_content (msg, msgdata->decoded_data_istream, FALSE,
msgdata->cancellable, &error)) {
- h2_debug (io, msgdata, "[DATA] Sniffed content");
- advance_state_from (msgdata, STATE_READ_DATA, STATE_READ_DATA_SNIFFED);
- } else {
- h2_debug (io, msgdata, "[DATA] Sniffer stream was not ready %s", error->message);
- g_clear_error (&error);
- }
- }
-
return 0;
}
@@ -1187,7 +1171,7 @@ soup_client_message_io_http2_run_until_read (SoupClientMessageIO *iface,
GCancellable *cancellable,
GError **error)
{
- return io_run_until (msg, TRUE, STATE_READ_DATA_SNIFFED, cancellable, error);
+ return io_run_until (msg, TRUE, STATE_READ_DATA, cancellable, error);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]