[libsoup/wip/http2] fixup! Add initial HTTP2 backend

[Patrick Griffis <pgriffis src gnome org>]

commit 48a7e13d5b15ef409e18f9e67f072904d5cf0176
Author: Patrick Griffis <pgriffis igalia com>
Date:   Wed May 12 14:29:13 2021 -0500

    fixup! Add initial HTTP2 backend

 libsoup/http2/soup-client-message-io-http2.c | 17 -----------------
 libsoup/soup-client-message-io-http1.c       |  9 ---------
 libsoup/soup-client-message-io.c             |  7 -------
 libsoup/soup-client-message-io.h             |  4 ----
 libsoup/soup-session.c                       |  6 ------
 5 files changed, 43 deletions(-)
---
diff --git a/libsoup/http2/soup-client-message-io-http2.c b/libsoup/http2/soup-client-message-io-http2.c
index 9934fdf3..7d9cc36c 100644
--- a/libsoup/http2/soup-client-message-io-http2.c
+++ b/libsoup/http2/soup-client-message-io-http2.c
@@ -990,22 +990,6 @@ soup_client_message_io_http2_get_source (SoupMessage             *msg,
         return source;
 }
 
-static void
-soup_client_message_io_http2_skip_body (SoupClientMessageIO *iface,
-                                        SoupMessage         *msg)
-{
-        SoupMessageIOHTTP2 *io = (SoupMessageIOHTTP2 *)iface;
-        SoupHTTP2MessageData *data = get_data_for_message (io, msg);
-
-        g_debug ("soup_client_message_io_http2_skip_body");
-
-        g_assert (data->body_istream);
-
-        soup_body_input_stream_http2_complete (SOUP_BODY_INPUT_STREAM_HTTP2 (data->body_istream));
-        data->state = STATE_READ_DONE;
-        soup_message_got_body (data->msg);
-}
-
 static void
 client_stream_eof (SoupClientInputStream *stream,
                    gpointer               user_data)
@@ -1309,7 +1293,6 @@ static const SoupClientMessageIOFuncs io_funcs = {
         soup_client_message_io_http2_run_until_read_async,
         soup_client_message_io_http2_run_until_finish,
         soup_client_message_io_http2_in_progress,
-        soup_client_message_io_http2_skip_body,
         soup_client_message_io_http2_is_open,
         soup_client_message_io_http2_is_reusable
 };
diff --git a/libsoup/soup-client-message-io-http1.c b/libsoup/soup-client-message-io-http1.c
index 2443a51d..61f3b695 100644
--- a/libsoup/soup-client-message-io-http1.c
+++ b/libsoup/soup-client-message-io-http1.c
@@ -1108,14 +1108,6 @@ soup_client_message_io_http1_is_reusable (SoupClientMessageIO *iface)
         return soup_message_is_keepalive (io->item->msg);
 }
 
-static void
-soup_client_message_io_http1_skip_body (SoupClientMessageIO *iface,
-                                       SoupMessage         *msg)
-{
-        /* This is already handled by SoupSession reading the rest
-         * of the stream */
-}
-
 static const SoupClientMessageIOFuncs io_funcs = {
         soup_client_message_io_http1_destroy,
         soup_client_message_io_http1_finished,
@@ -1130,7 +1122,6 @@ static const SoupClientMessageIOFuncs io_funcs = {
         soup_client_message_io_http1_run_until_read_async,
         soup_client_message_io_http1_run_until_finish,
         soup_client_message_io_http1_in_progress,
-        soup_client_message_io_http1_skip_body,
         soup_client_message_io_http1_is_open,
         soup_client_message_io_http1_is_reusable,
 };
diff --git a/libsoup/soup-client-message-io.c b/libsoup/soup-client-message-io.c
index 97acdf17..c0ead40e 100644
--- a/libsoup/soup-client-message-io.c
+++ b/libsoup/soup-client-message-io.c
@@ -125,10 +125,3 @@ soup_client_message_io_is_reusable (SoupClientMessageIO *io)
 {
         return io->funcs->is_reusable (io);
 }
-
-void
-soup_client_message_io_skip_body (SoupClientMessageIO *io,
-                                  SoupMessage         *msg)
-{
-        io->funcs->skip_body (io, msg);
-}
diff --git a/libsoup/soup-client-message-io.h b/libsoup/soup-client-message-io.h
index ad358d9f..89b6c9cb 100644
--- a/libsoup/soup-client-message-io.h
+++ b/libsoup/soup-client-message-io.h
@@ -48,8 +48,6 @@ typedef struct {
                                                GError                   **error);
         gboolean      (*in_progress)          (SoupClientMessageIO       *io,
                                                SoupMessage               *msg);
-        void          (*skip_body)            (SoupClientMessageIO       *io,
-                                               SoupMessage               *msg);
         gboolean      (*is_open)              (SoupClientMessageIO       *io);
         gboolean      (*is_reusable)          (SoupClientMessageIO       *io);
 } SoupClientMessageIOFuncs;
@@ -97,5 +95,3 @@ gboolean      soup_client_message_io_in_progress           (SoupClientMessageIO
                                                            SoupMessage               *msg);
 gboolean      soup_client_message_io_is_open              (SoupClientMessageIO       *io);
 gboolean      soup_client_message_io_is_reusable          (SoupClientMessageIO       *io);
-void          soup_client_message_io_skip_body            (SoupClientMessageIO       *io,
-                                                           SoupMessage               *msg);
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index eaa7d794..eea770ff 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -2939,10 +2939,6 @@ send_async_maybe_complete (SoupMessageQueueItem *item,
        if (expected_to_be_requeued (item->session, item->msg)) {
                GOutputStream *ostream;
 
-                /* Tell the backend to expect no more body */
-                soup_client_message_io_skip_body (soup_message_get_io_data (item->msg),
-                                                  item->msg);
-
                /* Gather the current message body... */
                ostream = g_memory_output_stream_new_resizable ();
                g_object_set_data_full (G_OBJECT (item->task), "SoupSession:ostream",
@@ -3345,8 +3341,6 @@ soup_session_send (SoupSession   *session,
                if (!expected_to_be_requeued (session, msg))
                        break;
 
-                soup_client_message_io_skip_body (soup_message_get_io_data (msg), msg);
-
                /* Gather the current message body... */
                ostream = g_memory_output_stream_new_resizable ();
                if (g_output_stream_splice (ostream, stream,