aboutsummaryrefslogtreecommitdiff
path: root/rpki/left_right.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-12-19 17:38:55 +0000
committerRob Austein <sra@hactrn.net>2014-12-19 17:38:55 +0000
commit17dc566f6ab144bb5be8ceaa23595c960d917fba (patch)
treef099b3b24cbf3b01e89072112efdfd20d4379e9f /rpki/left_right.py
parentb2b0d58c3eecb66c5a36cd912ce7da422065a3b1 (diff)
Accept either old or new MIME Content-Type in up-down server code, and
allow configuration of either old or new in up-down client code. For the moment, client defaults to using the old Content-Type, to avoid breaking deployed services, but this will change at some point. See #747. svn path=/trunk/; revision=6045
Diffstat (limited to 'rpki/left_right.py')
-rw-r--r--rpki/left_right.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/rpki/left_right.py b/rpki/left_right.py
index 68ead08f..c8b6d19b 100644
--- a/rpki/left_right.py
+++ b/rpki/left_right.py
@@ -821,10 +821,11 @@ class parent_elt(data_elt):
cb(r_msg)
rpki.http.client(
- msg = q_der,
- url = self.peer_contact_uri,
- callback = unwrap,
- errback = eb)
+ msg = q_der,
+ url = self.peer_contact_uri,
+ callback = unwrap,
+ errback = eb,
+ content_type = rpki.up_down.content_type)
class child_elt(data_elt):
"""