Commit afcae68c authored by Sebastien Robin's avatar Sebastien Robin

correctet a potential problem when sending http response with pubsync


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@643 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent feda3a6f
...@@ -545,6 +545,9 @@ class SynchronizationTool( UniqueObject, SimpleItem, ...@@ -545,6 +545,9 @@ class SynchronizationTool( UniqueObject, SimpleItem,
if send: if send:
if type(to_url) is type('a'): if type(to_url) is type('a'):
if to_url.find('http://')==0: if to_url.find('http://')==0:
# XXX Make sure this is not a problem
if domain.domain_type == self.PUB:
return None
# we will send an http response # we will send an http response
self.activate(activity='RAMQueue').sendHttpResponse(sync_id=sync_id, self.activate(activity='RAMQueue').sendHttpResponse(sync_id=sync_id,
to_url=to_url, to_url=to_url,
...@@ -562,8 +565,7 @@ class SynchronizationTool( UniqueObject, SimpleItem, ...@@ -562,8 +565,7 @@ class SynchronizationTool( UniqueObject, SimpleItem,
to_address = to_url[len('mailto:'):] to_address = to_url[len('mailto:'):]
from_address = from_url[len('mailto:'):] from_address = from_url[len('mailto:'):]
self.sendMail(from_address,to_address,sync_id,xml) self.sendMail(from_address,to_address,sync_id,xml)
else: return xml
return xml
security.declarePrivate('sendHttpResponse') security.declarePrivate('sendHttpResponse')
def sendHttpResponse(self, to_url=None, sync_id=None, xml=None, domain=None ): def sendHttpResponse(self, to_url=None, sync_id=None, xml=None, domain=None ):
...@@ -667,8 +669,6 @@ class SynchronizationTool( UniqueObject, SimpleItem, ...@@ -667,8 +669,6 @@ class SynchronizationTool( UniqueObject, SimpleItem,
for subscription in self.getSubscriptionList(): for subscription in self.getSubscriptionList():
if subscription.getSubscriptionUrl()==url: if subscription.getSubscriptionUrl()==url:
result = self.SubSync(sync_id,xml) result = self.SubSync(sync_id,xml)
#if result is not None: # Why Do I have this ??? XXX
# self.SubSync(sync_id,result)
# we use from only if we have a file # we use from only if we have a file
elif type(from_url) is type('a'): elif type(from_url) is type('a'):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment