[Pkg-javascript-commits] [ltx] 90/469: server: don't wait for features on non-1.0 servers

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository ltx.

commit 3828180b80a74c7ef5c61893220c971dc1571996
Author: Astro <astro at spaceboyz.net>
Date:   Mon Sep 6 03:17:07 2010 +0200

    server: don't wait for features on non-1.0 servers
---
 lib/xmpp/router.js | 3 ++-
 lib/xmpp/server.js | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/xmpp/router.js b/lib/xmpp/router.js
index 16e6680..c310d3b 100644
--- a/lib/xmpp/router.js
+++ b/lib/xmpp/router.js
@@ -11,7 +11,7 @@ dbgStream = function(tag, stream) {
 	console.log(tag + ' in: ' + data);
     });
     stream.on('error', function(e) {
-	console.log(tag + ' error: ' + e.stack);
+	console.log(tag + ' error: ' + e.stack ? e.stack : e);
     });
     stream.on('close', function() {
 	console.log(tag + ' close');
@@ -319,6 +319,7 @@ Router.prototype.send = function(stanza) {
     if (stanza.root)
 	stanza = stanza.root();
 
+    // TODO: inner routing
     if (stanza.attrs && stanza.attrs.from) {
 	var domain = (new JID.JID(stanza.attrs.from)).domain;
 	this.getContext(domain).send(stanza);
diff --git a/lib/xmpp/server.js b/lib/xmpp/server.js
index 14c1116..cc8402c 100644
--- a/lib/xmpp/server.js
+++ b/lib/xmpp/server.js
@@ -135,6 +135,11 @@ exports.makeOutgoingServer = function(domain) {
 	self.addListener('connect', self.startStream);
     });
 
+    self.addListener('streamStart', function(attrs) {
+			 if (attrs.version !== "1.0")
+			     // Don't wait for <stream:features/>
+			     self.emit('online');
+		     });
     self.addListener('rawStanza', function(stanza) {
 	if (stanza.is('features', Connection.NS_STREAM)) {
 	    self.emit('online');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/ltx.git