[683] in BarnOwl Developers
[D-O-H] r756 - trunk/owl/perl/modules/Jabber/lib/XML
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:08:38 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Fri, 17 Aug 2007 12:48:38 -0400 (EDT)
Author: asedeno
Date: 2007-08-17 12:48:37 -0400 (Fri, 17 Aug 2007)
New Revision: 756
Modified:
trunk/owl/perl/modules/Jabber/lib/XML/Stream.pm
Log:
Apply patch from:
http://rt.cpan.org/Public/Bug/Display.html?id=17484
Fixing problems with jabber servers keeping the same stream id when negotiating TLS.
Thanks to ghudson for tracking this down.
Modified: trunk/owl/perl/modules/Jabber/lib/XML/Stream.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/XML/Stream.pm 2007-08-15 03:08:49 UTC (rev 755)
+++ trunk/owl/perl/modules/Jabber/lib/XML/Stream.pm 2007-08-17 16:48:37 UTC (rev 756)
@@ -1160,7 +1160,8 @@
$self->{SOCKETS}->{*STDIN} = $sid;
}
- delete($self->{SIDS}->{$currsid});
+ # 08.04.05(Fri) slipstream@yandex.ru for compapility with ejabberd since it reuses stream id
+ delete($self->{SIDS}->{$currsid}) unless ($currsid eq $sid);
if (exists($self->GetRoot($sid)->{version}) &&
($self->GetRoot($sid)->{version} ne ""))
