pidgin: 36816746: jabber: bosh: Hopefully a final correcti...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Jan 31 23:08:17 EST 2011


----------------------------------------------------------------------
Revision: 36816746a73da13a5358b6c78bb82d1d40925555
Parent:   4de8be0df98bef5673532148464a856741cf510f
Author:   darkrain42 at pidgin.im
Date:     01/31/11 23:00:50
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/36816746a73da13a5358b6c78bb82d1d40925555

Changelog: 

jabber: bosh: Hopefully a final corrective fix.  Refs #13008

Changes against parent 4de8be0df98bef5673532148464a856741cf510f

  patched  libpurple/protocols/jabber/bosh.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/bosh.c	6469985de38e66ac8b45b5187d4d33e955f902dc
+++ libpurple/protocols/jabber/bosh.c	d38d958250a7e80f988e8594ef0bdbc60e285e9b
@@ -365,6 +365,8 @@ jabber_bosh_connection_send(PurpleBOSHCo
 	chosen = find_available_http_connection(conn);
 
 	if (!chosen) {
+		if (type == PACKET_FLUSH)
+			return;
 		/*
 		 * For non-ordinary traffic, we can't 'buffer' it, so use the
 		 * first connection.
@@ -472,6 +474,8 @@ jabber_bosh_disable_pipelining(PurpleBOS
 	if (!bosh->pipelining)
 		return;
 
+	purple_debug_info("jabber", "BOSH: Disabling pipelining on conn %p\n",
+	                            bosh);
 	bosh->pipelining = FALSE;
 	if (bosh->connections[1] == NULL) {
 		bosh->connections[1] = jabber_bosh_http_connection_init(bosh);


More information about the Commits mailing list