diff options
| author | Dan Winship <danw@gnome.org> | 2011-08-07 12:10:45 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2011-08-07 13:07:09 -0400 |
| commit | ca6f8d53ab3dbbfee1cfb56d080f44afc4b0e5b4 (patch) | |
| tree | bc3c7ff8ceb5ad91a20fa824161a83263e64a7ef /libsoup/soup-connection.h | |
| parent | 08d2505a429ba408ba47de50e29ea5ea57aefb4d (diff) | |
| download | libsoup-ca6f8d53ab3dbbfee1cfb56d080f44afc4b0e5b4.tar.gz | |
SoupConnection: do TLS handshake at connection time
Previously, when connecting to an https site, the TLS handshake didn't
happen until we started writing the request. Change it so that it now
happens as part of SoupConnection connecting.
Diffstat (limited to 'libsoup/soup-connection.h')
| -rw-r--r-- | libsoup/soup-connection.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h index ebdf9bc3..f3b936c0 100644 --- a/libsoup/soup-connection.h +++ b/libsoup/soup-connection.h @@ -44,6 +44,7 @@ typedef void (*SoupConnectionCallback) (SoupConnection *conn, #define SOUP_CONNECTION_PROXY_URI "proxy-uri" #define SOUP_CONNECTION_SSL_CREDENTIALS "ssl-creds" #define SOUP_CONNECTION_SSL_STRICT "ssl-strict" +#define SOUP_CONNECTION_SSL_FALLBACK "ssl-fallback" #define SOUP_CONNECTION_ASYNC_CONTEXT "async-context" #define SOUP_CONNECTION_TIMEOUT "timeout" #define SOUP_CONNECTION_IDLE_TIMEOUT "idle-timeout" @@ -60,7 +61,12 @@ void soup_connection_connect_async (SoupConnection *conn, guint soup_connection_connect_sync (SoupConnection *conn, GCancellable *cancellable); SoupAddress *soup_connection_get_tunnel_addr(SoupConnection *conn); -gboolean soup_connection_start_ssl (SoupConnection *conn); +guint soup_connection_start_ssl_sync (SoupConnection *conn, + GCancellable *cancellable); +void soup_connection_start_ssl_async (SoupConnection *conn, + GCancellable *cancellable, + SoupConnectionCallback callback, + gpointer user_data); void soup_connection_disconnect (SoupConnection *conn); @@ -79,7 +85,6 @@ void soup_connection_send_request (SoupConnection *conn, SoupMessageCompletionFn completion_cb, gpointer user_data); - G_END_DECLS #endif /* SOUP_CONNECTION_H */ |