Merge tag '2.46.0' into baserock/morphbaserock/morph

2.46.0

1 files changed, 43 insertions, 11 deletions

diff --git a/libsoup/soup-misc-private.h b/libsoup/soup-misc-private.h
index 8276b8a5..50a3b988 100644
--- a/libsoup/soup-misc-private.h
+++ b/libsoup/soup-misc-private.h
@@ -4,26 +4,48 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef SOUP_URI_PRIVATE_H
-#define SOUP_URI_PRIVATE_H 1
+#ifndef SOUP_MISC_PRIVATE_H
+#define SOUP_MISC_PRIVATE_H 1
 
 #include "soup-socket.h"
+#include "soup-message-headers.h"
 
-char *uri_decoded_copy (const char *str, int length);
+char *soup_uri_decoded_copy (const char *str, int length, int *decoded_length);
+char *soup_uri_to_string_internal (SoupURI *uri, gboolean just_path_and_query,
+				   gboolean force_port);
+gboolean soup_uri_is_http (SoupURI *uri, char **aliases);
+gboolean soup_uri_is_https (SoupURI *uri, char **aliases);
 
-guint soup_socket_handshake_sync  (SoupSocket         *sock,
-				   GCancellable       *cancellable);
-void  soup_socket_handshake_async (SoupSocket         *sock,
-				   GCancellable       *cancellable,
-				   SoupSocketCallback  callback,
-				   gpointer            user_data);
+gboolean soup_socket_connect_sync_internal   (SoupSocket          *sock,
+					      GCancellable        *cancellable,
+					      GError             **error);
+void     soup_socket_connect_async_internal  (SoupSocket          *sock,
+					      GCancellable        *cancellable,
+					      GAsyncReadyCallback  callback,
+					      gpointer             user_data);
+gboolean soup_socket_connect_finish_internal (SoupSocket          *sock,
+					      GAsyncResult        *result,
+					      GError             **error);
+
+gboolean soup_socket_handshake_sync   (SoupSocket           *sock,
+				       const char           *host,
+				       GCancellable         *cancellable,
+				       GError              **error);
+void     soup_socket_handshake_async  (SoupSocket           *sock,
+				       const char           *host,
+				       GCancellable         *cancellable,
+				       GAsyncReadyCallback   callback,
+				       gpointer              user_data);
+gboolean soup_socket_handshake_finish (SoupSocket           *sock,
+				       GAsyncResult         *result,
+				       GError              **error);
 
 GSocket   *soup_socket_get_gsocket    (SoupSocket *sock);
 GIOStream *soup_socket_get_connection (SoupSocket *sock);
 GIOStream *soup_socket_get_iostream   (SoupSocket *sock);
 
 #define SOUP_SOCKET_CLEAN_DISPOSE "clean-dispose"
-#define SOUP_SOCKET_USE_PROXY     "use-proxy"
+#define SOUP_SOCKET_PROXY_RESOLVER "proxy-resolver"
 SoupURI *soup_socket_get_http_proxy_uri (SoupSocket *sock);
 
 /* At some point it might be possible to mark additional methods
@@ -41,4 +63,14 @@ SoupURI *soup_socket_get_http_proxy_uri (SoupSocket *sock);
 					   method == SOUP_METHOD_PUT || \
 					   method == SOUP_METHOD_DELETE)
 
-#endif /* SOUP_URI_PRIVATE_H */
+GSource *soup_add_completion_reffed (GMainContext *async_context,
+				     GSourceFunc   function,
+				     gpointer      data);
+
+guint soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+						goffset              total_length,
+						gboolean             check_satisfiable,
+						SoupRange          **ranges,
+						int                 *length);
+
+#endif /* SOUP_MISC_PRIVATE_H */