summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-09-24 15:23:34 -0400
committerKali Kaneko <kali@leap.se>2015-09-24 15:23:34 -0400
commit67d341b062640ace095fae835107ec677e9d7cae (patch)
tree0eaa17436ea5990dcae0737119050fa0db8f471a /server/src
parent363d960c3feddb93a0f660075d9b4b33f3713882 (diff)
parent4be6f05d91891122e83f74d21c83c5f8fcd3a618 (diff)
Merge tag '0.7.3' into debian/experimental
Tag leap.soledad version 0.7.3
Diffstat (limited to 'server/src')
-rw-r--r--server/src/leap/soledad/server/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index 7a03f6fb..1b795016 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -238,6 +238,7 @@ class HTTPInvocationByMethodWithBody(
if content_type == 'application/x-soledad-sync-put':
meth_put = self._lookup('%s_put' % method)
meth_end = self._lookup('%s_end' % method)
+ entries = []
while True:
line = body_getline()
entry = line.strip()
@@ -246,9 +247,11 @@ class HTTPInvocationByMethodWithBody(
if not entry or not comma: # empty or no prec comma
raise http_app.BadRequest
entry, comma = utils.check_and_strip_comma(entry)
- meth_put({}, entry)
+ entries.append(entry)
if comma or body_getline(): # extra comma or data
raise http_app.BadRequest
+ for entry in entries:
+ meth_put({}, entry)
return meth_end()
# handle outgoing documents
elif content_type == 'application/x-soledad-sync-get':