summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2010-11-13 17:06:26 -0500
committerDan Winship <danw@gnome.org>2010-11-13 17:12:45 -0500
commit8fb9245b23bec2b0b5b17af583eabd65060083f3 (patch)
tree5767d9a9d4094c551e12733456b18107bab7a461
parentd4cc1a0cdd62fc3669f4ec5a8974c61aee9e9ce2 (diff)
downloadlibsoup-8fb9245b23bec2b0b5b17af583eabd65060083f3.tar.gz
Return SOUP_STATUS_CAN_RESOLVE_PROXY as appropriate
We weren't converting the status codes to their proxy versions when proxy address resolution failed. https://bugzilla.gnome.org/show_bug.cgi?id=632354
-rw-r--r--libsoup/soup-session-async.c2
-rw-r--r--libsoup/soup-session-sync.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libsoup/soup-session-async.c b/libsoup/soup-session-async.c
index 34d6405c..183ccbb3 100644
--- a/libsoup/soup-session-async.c
+++ b/libsoup/soup-session-async.c
@@ -147,7 +147,7 @@ resolved_proxy_addr (SoupAddress *addr, guint status, gpointer user_data)
SoupMessageQueueItem *item = user_data;
SoupSession *session = item->session;
- if (item_failed (item, status))
+ if (item_failed (item, soup_status_proxify (status)))
return;
item->proxy_addr = g_object_ref (addr);
diff --git a/libsoup/soup-session-sync.c b/libsoup/soup-session-sync.c
index 1b64e9a7..408e3073 100644
--- a/libsoup/soup-session-sync.c
+++ b/libsoup/soup-session-sync.c
@@ -267,7 +267,7 @@ process_queue_item (SoupMessageQueueItem *item)
if (SOUP_STATUS_IS_SUCCESSFUL (status))
item->state = SOUP_MESSAGE_AWAITING_CONNECTION;
else {
- soup_session_set_item_status (session, item, status);
+ soup_session_set_item_status (session, item, soup_status_proxify (status));
item->state = SOUP_MESSAGE_FINISHING;
}
break;