summaryrefslogtreecommitdiff
path: root/libsoup/soup-connection.h
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2008-10-03 21:01:54 +0000
committerDan Winship <danw@src.gnome.org>2008-10-03 21:01:54 +0000
commitd0f981d4761fb088ebbcbc2a1c387c209ce0c243 (patch)
treeb9ffe58b4e51ec09bbd3ffabbc1d09d088d03405 /libsoup/soup-connection.h
parente67b923bffa8fe1d7b6b876e77cf588fa43dd18e (diff)
downloadlibsoup-d0f981d4761fb088ebbcbc2a1c387c209ce0c243.tar.gz
Change the SoupURI properties to SoupAddress properties.
* libsoup/soup-connection.c: Change the SoupURI properties to SoupAddress properties. * libsoup/soup-address.c (soup_address_resolve_async) (soup_address_resolve_sync): Redo slightly so that multiple simultaneous attempts to resolve the same address won't cause problems. (soup_address_hash_by_name, soup_address_equal_by_name): (soup_address_hash_by_ip, soup_address_equal_by_ip): methods to hash addresses by name or IP address * libsoup/soup-message.c (soup_message_get_address): gets a SoupAddress corresponding to the message's URI * libsoup/soup-auth-manager.c (SoupAuthHost): hash hosts by soup_address_hash_by_name() rather than by URI. * libsoup/soup-session.c (soup_session_get_connection): pass addresses to soup_connection_new(), not URIs. (SoupSessionHost): hash hosts by soup_address_hash_by_ip() rather than by URI. This requires that the addresses will have already been resolved by the SoupSession subclasses before calling soup_session_get_connection(), but also means that now requests made to different virtual hosts on the same IP address can share a connection. * libsoup/soup-message-queue.c (SoupMessageQueueItem): add address-resolving state * libsoup/soup-session-sync.c (process_queue_item): resolve the message's address before getting a connection * libsoup/soup-session-async.c (run_queue, resolve_msg_addr) (resolved_msg_addr): resolve the message's address before getting a connection (request_restarted): if the message gets requeued to a different host, we'll need to re-resolve the address. * libsoup/soup-uri.c (soup_uri_copy_root, soup_uri_host_hash) (soup_uri_host_equal): No longer needed * libsoup/soup-dns.c (do_async_callback): disconnect from the cancellable before invoking the callback * tests/proxy-test.c (tests): fix the 403 example; hostnames are resolved by the session now, even when sending to a proxy, so we need to use a hostname that actually exists svn path=/trunk/; revision=1179
Diffstat (limited to 'libsoup/soup-connection.h')
-rw-r--r--libsoup/soup-connection.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index 548cb322..180ab28d 100644
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -45,8 +45,8 @@ typedef void (*SoupConnectionCallback) (SoupConnection *conn,
gpointer data);
-#define SOUP_CONNECTION_ORIGIN_URI "origin-uri"
-#define SOUP_CONNECTION_PROXY_URI "proxy-uri"
+#define SOUP_CONNECTION_SERVER_ADDRESS "server_address"
+#define SOUP_CONNECTION_PROXY_ADDRESS "proxy-address"
#define SOUP_CONNECTION_SSL_CREDENTIALS "ssl-creds"
#define SOUP_CONNECTION_ASYNC_CONTEXT "async-context"
#define SOUP_CONNECTION_TIMEOUT "timeout"