summaryrefslogtreecommitdiff
path: root/libsoup/soup-proxy-connection.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-06-03 20:38:38 +0000
committerDan Winship <danw@src.gnome.org>2003-06-03 20:38:38 +0000
commit0c5f03a037b5dd4d6761b86e4e4160421f056aac (patch)
tree315b5295fa37211aaadd74c41f43f2f135a517c8 /libsoup/soup-proxy-connection.c
parent514012912dad15272f0788c4ece31fe073f3a318 (diff)
downloadlibsoup-soup-refactoring.tar.gz
Push SoupContext into the background in preparation for itssoup-refactoring
eventual removal. * libsoup/soup-message.c (soup_message_new, soup_message_new_full): Take a SoupUri instead of a SoupContext (soup_message_set_uri): instead of set_context (redirect_handler): Use soup_message_set_uri (soup_message_get_context): gone * libsoup/soup-context.c (struct _SoupContext): Move this here. No one else needs to know. (soup_context_get): Gone (soup_context_from_uri): constify uri (get_proxy): moved here from soup-misc.c and made to return a SoupUri. (try_create_connection): Update for that. * libsoup/soup-private.h: Remove struct _SoupContext def * libsoup/soup-connection.c (soup_connection_new): constify uri * libsoup/soup-proxy-connection.c (soup_proxy_connection_new): constify uri arguments, remove SoupContext references * libsoup/soup-misc.c (soup_get_proxy): Gone * libsoup/soup-server-cgi.c (run_async): Use soup_message_set_uri, etc * libsoup/soup-server-tcp.c (read_headers_cb): Likewise * tests/*: update soup_message_new() calls
Diffstat (limited to 'libsoup/soup-proxy-connection.c')
-rw-r--r--libsoup/soup-proxy-connection.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libsoup/soup-proxy-connection.c b/libsoup/soup-proxy-connection.c
index 645443ca..97e5e465 100644
--- a/libsoup/soup-proxy-connection.c
+++ b/libsoup/soup-proxy-connection.c
@@ -109,8 +109,10 @@ set_property (GObject *object, guint prop_id,
SoupConnection *
-soup_proxy_connection_new (SoupUri *origin_server, SoupAuthContext *origin_ac,
- SoupUri *proxy_server, SoupAuthContext *proxy_ac)
+soup_proxy_connection_new (const SoupUri *origin_server,
+ SoupAuthContext *origin_ac,
+ const SoupUri *proxy_server,
+ SoupAuthContext *proxy_ac)
{
SoupProxyConnection *pconn;
@@ -156,7 +158,6 @@ connected (SoupSocket *sock, SoupKnownErrorCode err)
{
SoupProxyConnection *pconn = SOUP_PROXY_CONNECTION (sock);
SoupConnection *conn = SOUP_CONNECTION (sock);
- SoupContext *ctx;
SoupMessage *connect_msg;
/* Let the signal through if it's an error, or we don't need
@@ -170,9 +171,8 @@ connected (SoupSocket *sock, SoupKnownErrorCode err)
g_signal_stop_emission_by_name (sock, "connected");
/* Handle HTTPS tunnel setup via proxy CONNECT request. */
- ctx = soup_context_from_uri (pconn->priv->tunnel_dest);
- connect_msg = soup_message_new (ctx, SOUP_METHOD_CONNECT);
- soup_context_unref (ctx);
+ connect_msg = soup_message_new (pconn->priv->tunnel_dest,
+ SOUP_METHOD_CONNECT);
connect_msg->connection = conn;
soup_message_queue (connect_msg, connect_cb, conn);
}