Changeset 12:fc40892815eb in ralphm-patches for s2s.patch

Timestamp:

Apr 22, 2009, 10:50:43 AM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Make sure empty default domains works.

File:

• s2s.patch (modified) (4 diffs)

s2s.patch

@@ -1 @@
-diff -r 313d45b505a7 wokkel/server.py
+diff -r fd1dc58fe561 wokkel/server.py
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/wokkel/server.py  Fri Apr 10 09:38:01 2009 +0200
-@@ -0,0 +1,709 @@
++++ b/wokkel/server.py  Wed Apr 22 01:47:14 2009 -0700
+@@ -0,0 +1,711 @@
 +# -*- test-case-name: wokkel.test.test_server -*-
 +#
@@ -357 +357 @@
 +                raise error.StreamError('invalid-namespace')
 +
-+            if not targetDomain or targetDomain not in self.service.domains:
++            if targetDomain and targetDomain not in self.service.domains:
 +                raise error.StreamError('host-unknown')
 +        except error.StreamError, exc:
@@ -417 +417 @@
 +        def valid(xs):
 +            reply('valid')
++            if not self.xmlstream.thisEntity:
++                self.xmlstream.thisEntity = jid.internJID(receivingServer)
 +            self.xmlstream.otherEntity = jid.internJID(originatingServer)
 +            self.xmlstream.dispatch(self.xmlstream,
@@ -712 +714 @@
 +            else:
 +                self.xmlstream.send(stanza)
-diff -r 313d45b505a7 wokkel/test/test_server.py
+diff -r fd1dc58fe561 wokkel/test/test_server.py
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/wokkel/test/test_server.py        Fri Apr 10 09:38:01 2009 +0200
++++ b/wokkel/test/test_server.py        Wed Apr 22 01:47:14 2009 -0700
 @@ -0,0 +1,450 @@
 +# Copyright (c) 2003-2008 Ralph Meijer