From 37cce96940f5360ffaaa56e5f821f548a0bc97a2 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 17 Oct 2013 15:07:23 +0000 Subject: [PATCH] prefixes is a list... and passing a string ended up treating it as a list of characters. ouch! git-svn-id: https://xpra.org/svn/Xpra/trunk@4541 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/server/proxy_server.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/xpra/server/proxy_server.py b/src/xpra/server/proxy_server.py index 31a99a84f9..c19724857e 100644 --- a/src/xpra/server/proxy_server.py +++ b/src/xpra/server/proxy_server.py @@ -280,16 +280,20 @@ def filter_client_caps(self, caps): def filter_server_caps(self, caps): if caps.get("rencode", False): self.server_protocol.enable_rencode() - return self.filter_caps(caps, "aliases") + return self.filter_caps(caps, ("aliases", )) def filter_caps(self, caps, prefixes): #removes caps that the proxy overrides / does not use: #(not very pythonic!) pcaps = {} - for k,v in caps.items(): + removed = [] + for k in caps.keys(): skip = len([e for e in prefixes if k.startswith(e)]) if skip==0: - pcaps[k] = v + pcaps[k] = caps[k] + else: + removed.append(k) + log("filtered out %s matching %s", removed, prefixes) #replace the network caps with the proxy's own: pcaps.update(get_network_caps()) #then add the proxy info: