From 1c31074ed8a27a91cc794c5ebf26c64fcb0fda75 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Wed, 7 Apr 2010 11:51:54 -0700 Subject: [PATCH] libsoup-2.4: update to 2.30.0 Fixes bug 615047. --- vapi/libsoup-2.4.vapi | 99 +++++- vapi/packages/libsoup-2.4/libsoup-2.4.gi | 291 +++++++++++++++++- .../packages/libsoup-2.4/libsoup-2.4.metadata | 6 +- 3 files changed, 389 insertions(+), 7 deletions(-) diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index dd83ee531..8568abd5c 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -47,6 +47,7 @@ namespace Soup { public bool is_for_proxy { get; construct; } public string realm { get; construct; } public string scheme_name { get; } + public virtual signal void save_password (string p0, string p1); } [CCode (cheader_filename = "libsoup/soup.h")] public class AuthDomain : GLib.Object { @@ -120,6 +121,17 @@ namespace Soup { public unowned string get_host (); public unowned Soup.Socket get_socket (); } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ContentDecoder : GLib.Object, Soup.SessionFeature { + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ContentSniffer : GLib.Object, Soup.SessionFeature { + [CCode (has_construct_function = false)] + public ContentSniffer (); + [NoWrapper] + public virtual size_t get_buffer_size (); + public virtual string sniff (Soup.Message msg, Soup.Buffer buffer, out GLib.HashTable? @params); + } [Compact] [CCode (copy_function = "soup_cookie_copy", type_id = "SOUP_TYPE_COOKIE", cheader_filename = "libsoup/soup.h")] public class Cookie { @@ -134,6 +146,7 @@ namespace Soup { public Cookie (string name, string value, string domain, string path, int max_age); public bool applies_to_uri (Soup.URI uri); public Soup.Cookie copy (); + public bool domain_matches (string host); public bool equal (Soup.Cookie cookie2); public static unowned Soup.Cookie parse (string header, Soup.URI origin); public void set_domain (string domain); @@ -154,9 +167,13 @@ namespace Soup { public void add_cookie (Soup.Cookie cookie); public GLib.SList all_cookies (); public void delete_cookie (Soup.Cookie cookie); + public Soup.CookieJarAcceptPolicy get_accept_policy (); public unowned string get_cookies (Soup.URI uri, bool for_http); public virtual void save (); + public void set_accept_policy (Soup.CookieJarAcceptPolicy policy); public void set_cookie (Soup.URI uri, string cookie); + public void set_cookie_with_first_party (Soup.URI uri, Soup.URI first_party, string cookie); + public Soup.CookieJarAcceptPolicy accept_policy { get; set; } [NoAccessorMethod] public bool read_only { get; construct; } public virtual signal void changed (Soup.Cookie old_cookie, Soup.Cookie new_cookie); @@ -211,14 +228,17 @@ namespace Soup { public Message (string method, string uri_string); public uint add_header_handler (string @signal, string header, GLib.Callback callback); public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback); + public void disable_feature (GLib.Type feature_type); [CCode (has_construct_function = false)] public Message.from_uri (string method, Soup.URI uri); public unowned Soup.Address get_address (); + public unowned Soup.URI get_first_party (); public Soup.MessageFlags get_flags (); public Soup.HTTPVersion get_http_version (); public unowned Soup.URI get_uri (); public bool is_keepalive (); public void set_chunk_allocator (owned Soup.ChunkAllocator allocator); + public void set_first_party (...); public void set_flags (Soup.MessageFlags flags); public void set_http_version (Soup.HTTPVersion version); public void set_request (string content_type, Soup.MemoryUse req_use, string req_body, size_t req_length); @@ -226,6 +246,7 @@ namespace Soup { public void set_status (uint status_code); public void set_status_full (uint status_code, string reason_phrase); public void set_uri (Soup.URI uri); + public Soup.URI first_party { get; set; } public Soup.MessageFlags flags { get; set; } public Soup.HTTPVersion http_version { get; set; } [NoAccessorMethod] @@ -238,6 +259,8 @@ namespace Soup { public uint status_code { get; set; } public Soup.URI uri { get; set; } [HasEmitter] + public virtual signal void content_sniffed (string p0, GLib.HashTable p1); + [HasEmitter] public virtual signal void finished (); [HasEmitter] public virtual signal void got_body (); @@ -292,9 +315,11 @@ namespace Soup { public bool get_content_disposition (out string disposition, out GLib.HashTable? @params); public int64 get_content_length (); public bool get_content_range (int64 start, int64 end, int64 total_length); - public unowned string get_content_type (out GLib.HashTable? @params); + public unowned string get_content_type (out GLib.HashTable? @params); public Soup.Encoding get_encoding (); public Soup.Expectation get_expectations (); + public unowned string get_list (string name); + public unowned string get_one (string name); public bool get_ranges (int64 total_length, out unowned Soup.Range ranges, int length); public void remove (string name); public void replace (string name, string value); @@ -371,15 +396,25 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public class Session : GLib.Object { public void abort (); + [NoWrapper] + public virtual void auth_required (Soup.Message msg, Soup.Auth auth, bool retrying); public virtual void cancel_message (Soup.Message msg, uint status_code); public unowned GLib.MainContext get_async_context (); + public unowned Soup.SessionFeature get_feature (GLib.Type feature_type); + public unowned Soup.SessionFeature get_feature_for_message (GLib.Type feature_type, Soup.Message msg); + public GLib.SList get_features (GLib.Type feature_type); public void pause_message (Soup.Message msg); + public void prepare_for_uri (Soup.URI uri); public virtual void queue_message (owned Soup.Message msg, Soup.SessionCallback? callback); public void remove_feature (Soup.SessionFeature feature); public virtual void requeue_message (Soup.Message msg); public virtual uint send_message (Soup.Message msg); public void unpause_message (Soup.Message msg); [NoAccessorMethod] + public string accept_language { owned get; set; } + [NoAccessorMethod] + public bool accept_language_auto { get; set; } + [NoAccessorMethod] public Soup.SessionFeature add_feature { owned get; set; } [NoAccessorMethod] public GLib.Type add_feature_by_type { get; set; } @@ -397,15 +432,19 @@ namespace Soup { [NoAccessorMethod] public string ssl_ca_file { owned get; set; } [NoAccessorMethod] + public bool ssl_strict { get; set; } + [NoAccessorMethod] public uint timeout { get; set; } [NoAccessorMethod] public bool use_ntlm { get; set; } [NoAccessorMethod] public string user_agent { owned get; set; } public virtual signal void authenticate (Soup.Message msg, Soup.Auth auth, bool retrying); + public virtual signal void connection_created (GLib.Object p0); public virtual signal void request_queued (Soup.Message p0); public virtual signal void request_started (Soup.Message msg, Soup.Socket socket); public virtual signal void request_unqueued (Soup.Message p0); + public virtual signal void tunneling (GLib.Object p0); } [CCode (cheader_filename = "libsoup/soup.h")] public class SessionAsync : Soup.Session { @@ -428,6 +467,7 @@ namespace Soup { public void connect_async (GLib.Cancellable cancellable, Soup.SocketCallback callback); public uint connect_sync (GLib.Cancellable cancellable); public void disconnect (); + public int get_fd (); public unowned Soup.Address get_local_address (); public unowned Soup.Address get_remote_address (); public bool is_connected (); @@ -449,7 +489,11 @@ namespace Soup { [NoAccessorMethod] public void* ssl_creds { get; set; } [NoAccessorMethod] + public bool ssl_strict { get; construct; } + [NoAccessorMethod] public uint timeout { get; set; } + [NoAccessorMethod] + public bool trusted_certificate { get; construct; } public virtual signal void disconnected (); public virtual signal void new_connection (Soup.Socket p0); public virtual signal void readable (); @@ -469,9 +513,12 @@ namespace Soup { [CCode (has_construct_function = false)] public URI (string uri_string); public Soup.URI copy (); + public unowned Soup.URI copy_host (); public static string decode (string part); public static string encode (string part, string? escape_extra); public bool equal (Soup.URI uri2); + public static bool host_equal (void* v1, void* v2); + public static uint host_hash (void* key); public static string normalize (string part, string unescape_extra); public void set_fragment (string fragment); public void set_host (string host); @@ -494,6 +541,11 @@ namespace Soup { public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable cancellable, out unowned Soup.Address addr); } [CCode (cheader_filename = "libsoup/soup.h")] + public interface ProxyURIResolver : GLib.Object { + public abstract void get_proxy_uri_async (Soup.URI uri, GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.ProxyURIResolverCallback callback); + public abstract uint get_proxy_uri_sync (Soup.URI uri, GLib.Cancellable cancellable, out unowned Soup.URI proxy_uri); + } + [CCode (cheader_filename = "libsoup/soup.h")] public interface SessionFeature : GLib.Object { public abstract void attach (Soup.Session session); public abstract void detach (Soup.Session session); @@ -510,6 +562,21 @@ namespace Soup { IPV4, IPV6 } + [CCode (cprefix = "SOUP_CONNECTION_", cheader_filename = "libsoup/soup.h")] + public enum ConnectionState { + NEW, + CONNECTING, + IDLE, + IN_USE, + REMOTE_DISCONNECTED, + DISCONNECTED + } + [CCode (cprefix = "SOUP_COOKIE_JAR_ACCEPT_", cheader_filename = "libsoup/soup.h")] + public enum CookieJarAcceptPolicy { + ALWAYS, + NEVER, + NO_THIRD_PARTY + } [CCode (cprefix = "SOUP_DATE_", cheader_filename = "libsoup/soup.h")] public enum DateFormat { HTTP, @@ -621,8 +688,10 @@ namespace Soup { [CCode (cprefix = "SOUP_MESSAGE_", cheader_filename = "libsoup/soup.h")] [Flags] public enum MessageFlags { + NO_REDIRECT, OVERWRITE_CHUNKS, - NO_REDIRECT + CONTENT_DECODED, + CERTIFICATE_TRUSTED } [CCode (cprefix = "SOUP_MESSAGE_HEADERS_", cheader_filename = "libsoup/soup.h")] public enum MessageHeadersType { @@ -682,6 +751,8 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h", has_target = false)] public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4, void* p5); [CCode (cheader_filename = "libsoup/soup.h")] + public delegate void ProxyURIResolverCallback (Soup.ProxyURIResolver resolver, uint status, Soup.URI proxy_uri); + [CCode (cheader_filename = "libsoup/soup.h")] public delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable query, Soup.ClientContext client); [CCode (cheader_filename = "libsoup/soup.h")] public delegate void SessionCallback (Soup.Session session, Soup.Message msg); @@ -700,8 +771,6 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const string ADDRESS_SOCKADDR; [CCode (cheader_filename = "libsoup/soup.h")] - public const int AF_INET6; - [CCode (cheader_filename = "libsoup/soup.h")] public const string AUTH_DOMAIN_ADD_PATH; [CCode (cheader_filename = "libsoup/soup.h")] public const string AUTH_DOMAIN_BASIC_AUTH_CALLBACK; @@ -744,8 +813,14 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const string AUTH_SCHEME_NAME; [CCode (cheader_filename = "libsoup/soup.h")] + public const int CONTENT_DECODER_H; + [CCode (cheader_filename = "libsoup/soup.h")] + public const int CONTENT_SNIFFER_H; + [CCode (cheader_filename = "libsoup/soup.h")] public const int COOKIE_H; [CCode (cheader_filename = "libsoup/soup.h")] + public const string COOKIE_JAR_ACCEPT_POLICY; + [CCode (cheader_filename = "libsoup/soup.h")] public const int COOKIE_JAR_H; [CCode (cheader_filename = "libsoup/soup.h")] public const string COOKIE_JAR_READ_ONLY; @@ -778,6 +853,8 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const int MESSAGE_BODY_H; [CCode (cheader_filename = "libsoup/soup.h")] + public const string MESSAGE_FIRST_PARTY; + [CCode (cheader_filename = "libsoup/soup.h")] public const string MESSAGE_FLAGS; [CCode (cheader_filename = "libsoup/soup.h")] public const int MESSAGE_H; @@ -802,8 +879,12 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const int MULTIPART_H; [CCode (cheader_filename = "libsoup/soup.h")] + public const int PASSWORD_MANAGER_H; + [CCode (cheader_filename = "libsoup/soup.h")] public const int PROXY_RESOLVER_H; [CCode (cheader_filename = "libsoup/soup.h")] + public const int PROXY_URI_RESOLVER_H; + [CCode (cheader_filename = "libsoup/soup.h")] public const string SERVER_ASYNC_CONTEXT; [CCode (cheader_filename = "libsoup/soup.h")] public const int SERVER_H; @@ -820,6 +901,10 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const string SERVER_SSL_KEY_FILE; [CCode (cheader_filename = "libsoup/soup.h")] + public const string SESSION_ACCEPT_LANGUAGE; + [CCode (cheader_filename = "libsoup/soup.h")] + public const string SESSION_ACCEPT_LANGUAGE_AUTO; + [CCode (cheader_filename = "libsoup/soup.h")] public const string SESSION_ADD_FEATURE; [CCode (cheader_filename = "libsoup/soup.h")] public const string SESSION_ADD_FEATURE_BY_TYPE; @@ -844,6 +929,8 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const string SESSION_SSL_CA_FILE; [CCode (cheader_filename = "libsoup/soup.h")] + public const string SESSION_SSL_STRICT; + [CCode (cheader_filename = "libsoup/soup.h")] public const int SESSION_SYNC_H; [CCode (cheader_filename = "libsoup/soup.h")] public const string SESSION_TIMEOUT; @@ -866,8 +953,12 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const string SOCKET_SSL_CREDENTIALS; [CCode (cheader_filename = "libsoup/soup.h")] + public const string SOCKET_SSL_STRICT; + [CCode (cheader_filename = "libsoup/soup.h")] public const string SOCKET_TIMEOUT; [CCode (cheader_filename = "libsoup/soup.h")] + public const string SOCKET_TRUSTED_CERTIFICATE; + [CCode (cheader_filename = "libsoup/soup.h")] public const int STATUS_H; [CCode (cheader_filename = "libsoup/soup.h")] public const int TYPES_H; diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.gi b/vapi/packages/libsoup-2.4/libsoup-2.4.gi index e61ee2990..d8f67fb05 100644 --- a/vapi/packages/libsoup-2.4/libsoup-2.4.gi +++ b/vapi/packages/libsoup-2.4/libsoup-2.4.gi @@ -539,6 +539,15 @@ + + + + + + + + + @@ -683,6 +692,13 @@ + + + + + + + @@ -1032,6 +1048,20 @@ + + + + + + + + + + + + + + @@ -1202,6 +1232,12 @@ + + + + + + @@ -1228,6 +1264,19 @@ + + + + + + + + + + + + + @@ -1345,6 +1394,19 @@ + + + + + + + + + + + + + @@ -1478,8 +1540,10 @@ - + + + @@ -1670,6 +1734,14 @@ + + + + + + + + @@ -1864,6 +1936,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1888,6 +1997,12 @@ + + + + + + @@ -1905,6 +2020,13 @@ + + + + + + + @@ -1913,6 +2035,16 @@ + + + + + + + + + + @@ -2016,6 +2148,21 @@ + + + + + + + + + + + + + + + @@ -2028,6 +2175,12 @@ + + + + + + @@ -2106,6 +2259,13 @@ + + + + + + + @@ -2193,6 +2353,7 @@ + @@ -2200,6 +2361,14 @@ + + + + + + + + @@ -2445,6 +2614,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -2452,6 +2643,13 @@ + + + + + + + @@ -2496,6 +2694,8 @@ + + @@ -2505,6 +2705,7 @@ + @@ -2517,6 +2718,13 @@ + + + + + + + @@ -2539,6 +2747,22 @@ + + + + + + + + + + + + + + + + @@ -2616,6 +2840,12 @@ + + + + + + @@ -2709,7 +2939,9 @@ + + @@ -2782,6 +3014,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2840,7 +3117,6 @@ - @@ -2868,7 +3144,10 @@ + + + @@ -2885,6 +3164,7 @@ + @@ -2897,7 +3177,9 @@ + + @@ -2906,6 +3188,8 @@ + + @@ -2918,6 +3202,7 @@ + @@ -2929,7 +3214,9 @@ + + diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata index 4ae8b0679..5b0e2ada9 100644 --- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata +++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata @@ -18,6 +18,8 @@ soup_auth_domain_digest_set_auth_callback.callback transfer_ownership="1" soup_auth_domain_digest_set_auth_callback.dnotify hidden="1" SoupBuffer ref_function="soup_buffer_copy" unref_function="soup_buffer_free" soup_buffer_copy transfer_ownership="1" +soup_content_sniffer_sniff transfer_ownership="1" +soup_content_sniffer_sniff.params is_out="1" transfer_ownership="1" nullable="1" type_arguments="string,string" soup_cookie_copy transfer_ownership="1" soup_cookies_free hidden="1" soup_cookies_to_cookie_header.cookies type_arguments="Cookie" @@ -47,6 +49,7 @@ soup_logger_set_request_filter.destroy hidden="1" soup_logger_set_response_filter.response_filter transfer_ownership="1" soup_logger_set_response_filter.filter_data hidden="1" soup_logger_set_response_filter.destroy hidden="1" +SoupMessage::content_sniffed has_emitter="1" SoupMessage::finished has_emitter="1" SoupMessage::got_body has_emitter="1" SoupMessage::got_chunk has_emitter="1" @@ -63,7 +66,7 @@ soup_cookies_from_response type_arguments="Cookie" transfer_ownership="1" soup_header_parse_semi_param_list type_arguments="string,string" transfer_ownership="1" soup_message_headers_get_content_disposition.disposition transfer_ownership="1" soup_message_headers_get_content_disposition.params is_out="1" transfer_ownership="1" nullable="1" -soup_message_headers_get_content_type.params is_out="1" transfer_ownership="1" nullable="1" +soup_message_headers_get_content_type.params is_out="1" transfer_ownership="1" nullable="1" type_arguments="string,string" soup_message_set_chunk_allocator.allocator transfer_ownership="1" soup_message_set_chunk_allocator.destroy_notify hidden="1" SoupMessageBody.data type_name="uint8" is_array="1" @@ -76,6 +79,7 @@ SoupServerCallback.query type_arguments="string,string" SoupSession::add_feature has_emitter="1" SoupSession::add_feature_by_type has_emitter="1" SoupSession::remove_feature_by_type has_emitter="1" +soup_session_get_features transfer_ownership="1" type_arguments="unowned SessionFeature" soup_session_queue_message.msg transfer_ownership="1" soup_session_queue_message.callback nullable="1" soup_session_async_new_with_options ellipsis="1" -- 2.47.3