aboutsummaryrefslogtreecommitdiff
path: root/rpki/config.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/config.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/config.py')
-rw-r--r--rpki/config.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/rpki/config.py b/rpki/config.py
index f38427c4..253e56cf 100644
--- a/rpki/config.py
+++ b/rpki/config.py
@@ -304,3 +304,8 @@ class parser(object):
pass
except:
logger.warning("insecure-debug-only-rsa-key-db configured but initialization failed, check for corrupted database file")
+
+ try:
+ rpki.up_down.content_type = self.get("up_down_content_type")
+ except ConfigParser.NoOptionError:
+ pass