summaryrefslogtreecommitdiff
path: root/common/flatpak-utils-http-private.h
diff options
context:
space:
mode:
authorPatrick <pgriffis@igalia.com>2023-01-07 18:48:28 -0600
committerGitHub <noreply@github.com>2023-01-07 18:48:28 -0600
commite110bf7c7fc28ede5bde59a8a28cfe8b163595e4 (patch)
tree63283a96075325e86b37c3d57a7aaa1c9d2eb4e0 /common/flatpak-utils-http-private.h
parentb61a6d836c30d446c707f50585f7a91a8ae1857d (diff)
parent523cedc27509779e7e815806e53361d5fe7e0bd4 (diff)
downloadflatpak-appstreamcli-compose.tar.gz
Merge branch 'main' into appstreamcli-composeappstreamcli-compose
Diffstat (limited to 'common/flatpak-utils-http-private.h')
-rw-r--r--common/flatpak-utils-http-private.h30
1 files changed, 23 insertions, 7 deletions
diff --git a/common/flatpak-utils-http-private.h b/common/flatpak-utils-http-private.h
index f1319f0f..2c89ba40 100644
--- a/common/flatpak-utils-http-private.h
+++ b/common/flatpak-utils-http-private.h
@@ -23,8 +23,6 @@
#include <string.h>
-#include <libsoup/soup.h>
-
typedef enum {
FLATPAK_HTTP_ERROR_NOT_CHANGED = 0,
FLATPAK_HTTP_ERROR_UNAUTHORIZED = 1,
@@ -34,19 +32,37 @@ typedef enum {
GQuark flatpak_http_error_quark (void);
+typedef struct FlatpakHttpSession FlatpakHttpSession;
+
+FlatpakHttpSession* flatpak_create_http_session (const char *user_agent);
+void flatpak_http_session_free (FlatpakHttpSession* http_session);
-SoupSession * flatpak_create_soup_session (const char *user_agent);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(FlatpakHttpSession, flatpak_http_session_free)
typedef enum {
FLATPAK_HTTP_FLAGS_NONE = 0,
FLATPAK_HTTP_FLAGS_ACCEPT_OCI = 1 << 0,
- FLATPAK_HTTP_FLAGS_STORE_COMPRESSED = 2 << 0,
+ FLATPAK_HTTP_FLAGS_STORE_COMPRESSED = 1 << 1,
+ FLATPAK_HTTP_FLAGS_NOCHECK_STATUS = 1 << 2,
+ FLATPAK_HTTP_FLAGS_HEAD = 1 << 3,
} FlatpakHTTPFlags;
typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
gpointer user_data);
-GBytes * flatpak_load_uri (SoupSession *soup_session,
+GBytes * flatpak_load_uri_full (FlatpakHttpSession *http_session,
+ const char *uri,
+ FlatpakHTTPFlags flags,
+ const char *auth,
+ const char *token,
+ FlatpakLoadUriProgress progress,
+ gpointer user_data,
+ int *out_status,
+ char **out_content_type,
+ char **out_www_authenticate,
+ GCancellable *cancellable,
+ GError **error);
+GBytes * flatpak_load_uri (FlatpakHttpSession *http_session,
const char *uri,
FlatpakHTTPFlags flags,
const char *token,
@@ -55,7 +71,7 @@ GBytes * flatpak_load_uri (SoupSession *soup_session,
char **out_content_type,
GCancellable *cancellable,
GError **error);
-gboolean flatpak_download_http_uri (SoupSession *soup_session,
+gboolean flatpak_download_http_uri (FlatpakHttpSession *http_session,
const char *uri,
FlatpakHTTPFlags flags,
GOutputStream *out,
@@ -64,7 +80,7 @@ gboolean flatpak_download_http_uri (SoupSession *soup_session,
gpointer user_data,
GCancellable *cancellable,
GError **error);
-gboolean flatpak_cache_http_uri (SoupSession *soup_session,
+gboolean flatpak_cache_http_uri (FlatpakHttpSession *http_session,
const char *uri,
FlatpakHTTPFlags flags,
int dest_dfd,