changeset 31623:928335d6461b

jabber: bosh: Hopefully a final corrective fix. Refs #13008
author Paul Aurich <paul@darkrain42.org>
date Tue, 01 Feb 2011 04:00:50 +0000
parents c9e4250c5b0d
children e743507b3767 f0e6aaf942f8
files libpurple/protocols/jabber/bosh.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/bosh.c	Sun Jan 30 20:29:40 2011 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Tue Feb 01 04:00:50 2011 +0000
@@ -365,6 +365,8 @@
 	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 @@
 	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);