Changeset 637

Timestamp:

24/07/08 00:58:50 (4 months ago)

Author:

markdoliner

Message:

Fix a bug in s2s where xmlns="jabber:client" would get appended to an
incoming stanza even though the stanza already had an xmlns attribute
set.

I noticed this with people who interacted with Google Talk users who
were logged in with a Jabber client for the Black Berry.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• s2s/in.c (modified) (1 diff)

trunk/ChangeLog

@@ -1 +1 @@
 2008-07-23 Mark Doliner <mark@meebo.com>
-        * Removed scod module
+        * Removed scod module.
         * Added a maximum stanza limit to c2s.  This can be used to set an
           upper limit on the number of individual requests that can be made
           in a given window of time.
+        * Fix a bug in s2s where xmlns="jabber:client" would get appended to an
+          incoming stanza even though the stanza already had an xmlns attribute
+          set.
 
 2008-07-15 Tomasz Sterna <tomek@xiaoka.com>

trunk/s2s/in.c

@@ -549 +549 @@
     }
 
-    ns = nad_find_namespace(nad, 0, uri_CLIENT, NULL);
+    /*
+     * If stanza is not in any namespace (either because we removed the
+     * jabber:server namespace above or because it's in the default
+     * namespace for this stream) then this packet is intended to be
+     * handled by sm (and not just routed through the server), so set the
+     * jabber:client namespace.
+     */
+    ns = nad->elems[0].ns;
     if(ns < 0) {
         ns = nad_add_namespace(nad, uri_CLIENT, NULL);