aboutsummaryrefslogtreecommitdiff
path: root/rpki/rpkid.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/rpkid.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/rpkid.py')
-rw-r--r--rpki/rpkid.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/rpki/rpkid.py b/rpki/rpkid.py
index 36ee2ea9..628209af 100644
--- a/rpki/rpkid.py
+++ b/rpki/rpkid.py
@@ -145,10 +145,9 @@ class main(object):
host = self.http_server_host,
port = self.http_server_port,
handlers = (("/left-right", self.left_right_handler),
- ("/up-down/", self.up_down_handler),
+ ("/up-down/", self.up_down_handler, rpki.up_down.allowed_content_types),
("/cronjob", self.cronjob_handler)))
-
def start_cron(self):
"""
Start clock for rpkid's internal cron process.