Changeset 12:fc40892815eb in ralphm-patches

Timestamp:

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

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Make sure empty default domains works.

Files:

• pubsub_resource.patch (modified) (3 diffs)
• s2s.patch (modified) (4 diffs)

pubsub_resource.patch

@@ -1 @@
-diff -r cf770fa6bcb7 wokkel/iwokkel.py
---- a/wokkel/iwokkel.py Tue Apr 07 11:17:23 2009 +0200
-+++ b/wokkel/iwokkel.py Tue Apr 07 11:25:27 2009 +0200
+diff -r ce121b9d0797 wokkel/iwokkel.py
+--- a/wokkel/iwokkel.py Fri Apr 10 15:36:22 2009 +0200
++++ b/wokkel/iwokkel.py Fri Apr 10 17:31:54 2009 +0200
 @@ -297,75 +297,46 @@
          """
@@ -208 +208 @@
          Called when a node configuration change request has been received.
  
-diff -r cf770fa6bcb7 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Tue Apr 07 11:17:23 2009 +0200
-+++ b/wokkel/pubsub.py  Tue Apr 07 11:25:27 2009 +0200
+diff -r ce121b9d0797 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Fri Apr 10 15:36:22 2009 +0200
++++ b/wokkel/pubsub.py  Fri Apr 10 17:31:54 2009 +0200
 @@ -13,12 +13,13 @@
  from zope.interface import implements
@@ -765 +765 @@
 +    def subscriptionsSet(self, request):
 +        return defer.fail(Unsupported('manage-subscriptions'))
-diff -r cf770fa6bcb7 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Tue Apr 07 11:17:23 2009 +0200
-+++ b/wokkel/test/test_pubsub.py        Tue Apr 07 11:25:27 2009 +0200
+diff -r ce121b9d0797 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Fri Apr 10 15:36:22 2009 +0200
++++ b/wokkel/test/test_pubsub.py        Fri Apr 10 17:31:54 2009 +0200
 @@ -1222,7 +1222,8 @@
  

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