mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-20 14:18:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

soup: Fix usage of symbols / defines that are gone in libsoup3

Browse source 
I am not sure about the SOUP_MESSAGE_OVERWRITE_CHUNKS change, but it
was definitely already broken when using libsoup-3.0 in a shared
build. souphttpsrc probably needs to be ported from SoupMessage to
SoupServerMessage when using libsoup-3.0.

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1111

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2032>
This commit is contained in:
Nirbheek Chauhan 2022-03-26 00:59:12 +05:30 committed by GStreamer Marge Bot
parent 6c910dc746
commit 54eff61f0f
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
View file

@ -1014,11 +1014,14 @@ thread_func (gpointer user_data)
NULL); NULL);
g_object_unref (proxy_resolver); g_object_unref (proxy_resolver);
} }
#if !defined(STATIC_SOUP) || STATIC_SOUP == 2
} else { } else {
g_object_set (session->session, "ssl-strict", src->ssl_strict, NULL); g_object_set (session->session, "ssl-strict", src->ssl_strict, NULL);
if (src->proxy != NULL) { if (src->proxy != NULL) {
/* Need #if because there's no proxy->soup_uri when STATIC_SOUP == 3 */
g_object_set (session->session, "proxy-uri", src->proxy->soup_uri, NULL); g_object_set (session->session, "proxy-uri", src->proxy->soup_uri, NULL);
} }
#endif
} }
gst_soup_util_log_setup (session->session, src->log_level, gst_soup_util_log_setup (session->session, src->log_level,
@ -1612,6 +1615,8 @@ gst_soup_http_src_parse_status (SoupMessage * msg, GstSoupHTTPSrc * src)
return GST_FLOW_OK; return GST_FLOW_OK;
} }
/* SOUP_STATUS_IS_TRANSPORT_ERROR was replaced with GError in libsoup-3.0 */
#if !defined(STATIC_SOUP) || STATIC_SOUP == 2
if (SOUP_STATUS_IS_TRANSPORT_ERROR (status_code)) { if (SOUP_STATUS_IS_TRANSPORT_ERROR (status_code)) {
switch (status_code) { switch (status_code) {
case SOUP_STATUS_CANT_RESOLVE: case SOUP_STATUS_CANT_RESOLVE:
@ -1647,6 +1652,7 @@ gst_soup_http_src_parse_status (SoupMessage * msg, GstSoupHTTPSrc * src)
} }
return GST_FLOW_OK; return GST_FLOW_OK;
} }
#endif
if (SOUP_STATUS_IS_CLIENT_ERROR (status_code) || if (SOUP_STATUS_IS_CLIENT_ERROR (status_code) ||
SOUP_STATUS_IS_REDIRECTION (status_code) || SOUP_STATUS_IS_REDIRECTION (status_code) ||
@ -1770,8 +1776,20 @@ gst_soup_http_src_build_message (GstSoupHTTPSrc * src, const gchar * method)
G_CALLBACK (gst_soup_http_src_authenticate_cb), src); G_CALLBACK (gst_soup_http_src_authenticate_cb), src);
} }
_soup_message_set_flags (src->msg, SOUP_MESSAGE_OVERWRITE_CHUNKS | {
(src->automatic_redirect ? 0 : SOUP_MESSAGE_NO_REDIRECT)); SoupMessageFlags flags =
src->automatic_redirect ? 0 : SOUP_MESSAGE_NO_REDIRECT;
/* SOUP_MESSAGE_OVERWRITE_CHUNKS is gone in libsoup-3.0, and
* soup_message_body_set_accumulate() requires SoupMessageBody, which
* can only be fetched from SoupServerMessage, not SoupMessage */
#if !defined(STATIC_SOUP) || STATIC_SOUP == 2
if (gst_soup_loader_get_api_version () == 2)
flags |= SOUP_MESSAGE_OVERWRITE_CHUNKS;
#endif
_soup_message_set_flags (src->msg, flags);
}
if (src->automatic_redirect) { if (src->automatic_redirect) {
g_signal_connect (src->msg, "restarted", g_signal_connect (src->msg, "restarted",