From: Dan Winship <danw@gnome.org>
Date: Sat, 19 Dec 2009 14:14:00 +0000 (+0100)
Subject: SoupSession: Handle CONNECT failure without hanging
X-Git-Tag: LIBSOUP_2_29_5~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fe50a83f8e5aefed3ca2355b2070435b6ca7387;p=platform%2Fupstream%2Flibsoup.git

SoupSession: Handle CONNECT failure without hanging

https://bugzilla.gnome.org/show_bug.cgi?id=587528
---

diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index c6d8765..2b13228 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -1230,10 +1230,14 @@ soup_session_connection_failed (SoupSession *session,
 	g_mutex_lock (priv->host_lock);
 	host = g_hash_table_lookup (priv->conns, conn);
 	g_mutex_unlock (priv->host_lock);
-	if (!host)
-		return;
 
-	connection_disconnected (conn, session);
+	if (host)
+		connection_disconnected (conn, session);
+	else {
+		host = g_object_get_data (G_OBJECT (conn), "SoupSessionHost");
+		if (!host)
+			return;
+	}
 
 	/* Cancel any other messages waiting for a connection to it,
 	 * since they're out of luck.
@@ -1408,6 +1412,7 @@ soup_session_get_connection (SoupSession *session,
 		SOUP_CONNECTION_TIMEOUT, priv->io_timeout,
 		SOUP_CONNECTION_IDLE_TIMEOUT, priv->idle_timeout,
 		NULL);
+	g_object_set_data (G_OBJECT (conn), "SoupSessionHost", host);
 	g_signal_connect (conn, "disconnected",
 			  G_CALLBACK (connection_disconnected),
 			  session);