Changeset 12:fc40892815eb in ralphm-patches


Ignore:
Timestamp:
Apr 22, 2009, 10:50:43 AM (11 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

Make sure empty default domains works.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pubsub_resource.patch

    r7 r12  
    1 diff -r cf770fa6bcb7 wokkel/iwokkel.py
    2 --- a/wokkel/iwokkel.py Tue Apr 07 11:17:23 2009 +0200
    3 +++ b/wokkel/iwokkel.py Tue Apr 07 11:25:27 2009 +0200
     1diff -r ce121b9d0797 wokkel/iwokkel.py
     2--- a/wokkel/iwokkel.py Fri Apr 10 15:36:22 2009 +0200
     3+++ b/wokkel/iwokkel.py Fri Apr 10 17:31:54 2009 +0200
    44@@ -297,75 +297,46 @@
    55         """
     
    208208         Called when a node configuration change request has been received.
    209209 
    210 diff -r cf770fa6bcb7 wokkel/pubsub.py
    211 --- a/wokkel/pubsub.py  Tue Apr 07 11:17:23 2009 +0200
    212 +++ b/wokkel/pubsub.py  Tue Apr 07 11:25:27 2009 +0200
     210diff -r ce121b9d0797 wokkel/pubsub.py
     211--- a/wokkel/pubsub.py  Fri Apr 10 15:36:22 2009 +0200
     212+++ b/wokkel/pubsub.py  Fri Apr 10 17:31:54 2009 +0200
    213213@@ -13,12 +13,13 @@
    214214 from zope.interface import implements
     
    765765+    def subscriptionsSet(self, request):
    766766+        return defer.fail(Unsupported('manage-subscriptions'))
    767 diff -r cf770fa6bcb7 wokkel/test/test_pubsub.py
    768 --- a/wokkel/test/test_pubsub.py        Tue Apr 07 11:17:23 2009 +0200
    769 +++ b/wokkel/test/test_pubsub.py        Tue Apr 07 11:25:27 2009 +0200
     767diff -r ce121b9d0797 wokkel/test/test_pubsub.py
     768--- a/wokkel/test/test_pubsub.py        Fri Apr 10 15:36:22 2009 +0200
     769+++ b/wokkel/test/test_pubsub.py        Fri Apr 10 17:31:54 2009 +0200
    770770@@ -1222,7 +1222,8 @@
    771771 
  • s2s.patch

    r11 r12  
    1 diff -r 313d45b505a7 wokkel/server.py
     1diff -r fd1dc58fe561 wokkel/server.py
    22--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
    3 +++ b/wokkel/server.py  Fri Apr 10 09:38:01 2009 +0200
    4 @@ -0,0 +1,709 @@
     3+++ b/wokkel/server.py  Wed Apr 22 01:47:14 2009 -0700
     4@@ -0,0 +1,711 @@
    55+# -*- test-case-name: wokkel.test.test_server -*-
    66+#
     
    357357+                raise error.StreamError('invalid-namespace')
    358358+
    359 +            if not targetDomain or targetDomain not in self.service.domains:
     359+            if targetDomain and targetDomain not in self.service.domains:
    360360+                raise error.StreamError('host-unknown')
    361361+        except error.StreamError, exc:
     
    417417+        def valid(xs):
    418418+            reply('valid')
     419+            if not self.xmlstream.thisEntity:
     420+                self.xmlstream.thisEntity = jid.internJID(receivingServer)
    419421+            self.xmlstream.otherEntity = jid.internJID(originatingServer)
    420422+            self.xmlstream.dispatch(self.xmlstream,
     
    712714+            else:
    713715+                self.xmlstream.send(stanza)
    714 diff -r 313d45b505a7 wokkel/test/test_server.py
     716diff -r fd1dc58fe561 wokkel/test/test_server.py
    715717--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
    716 +++ b/wokkel/test/test_server.py        Fri Apr 10 09:38:01 2009 +0200
     718+++ b/wokkel/test/test_server.py        Wed Apr 22 01:47:14 2009 -0700
    717719@@ -0,0 +1,450 @@
    718720+# Copyright (c) 2003-2008 Ralph Meijer
Note: See TracChangeset for help on using the changeset viewer.