Last batch of catch-up merges. Still need to test, but this is a

development branch, so committing the merge before testing shouldn't
break anything.

svn path=/branches/tk705/; revision=6084

1 files changed, 1 insertions, 2 deletions

diff --git a/rpki/rpkid.py b/rpki/rpkid.py
index cc7fbc5b..267a95b1 100644
--- a/rpki/rpkid.py
+++ b/rpki/rpkid.py
@@ -137,10 +137,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.