aboutsummaryrefslogtreecommitdiff
path: root/rpki/rootd.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-07-21 17:41:54 +0000
committerRob Austein <sra@hactrn.net>2015-07-21 17:41:54 +0000
commitc82f46c999a2dbd147dc5f126c368b84ad663234 (patch)
tree73efa0705d4abb76e5afe743d052fc90b2a042e6 /rpki/rootd.py
parent9376f9afbade89253f354e9164a6f40328fa494a (diff)
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
Diffstat (limited to 'rpki/rootd.py')
-rw-r--r--rpki/rootd.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpki/rootd.py b/rpki/rootd.py
index 8f08e0dd..c9e409db 100644
--- a/rpki/rootd.py
+++ b/rpki/rootd.py
@@ -454,4 +454,4 @@ class main(object):
rpki.http_simple.server(host = self.http_server_host,
port = self.http_server_port,
- handlers = self.handler)
+ handlers = (("/", self.up_down_handler, rpki.up_down.allowed_content_types),))