From c82f46c999a2dbd147dc5f126c368b84ad663234 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 21 Jul 2015 17:41:54 +0000
Subject: 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
---
 rpki/up_down.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'rpki/up_down.py')

diff --git a/rpki/up_down.py b/rpki/up_down.py
index 7b392640..839c60f6 100644
--- a/rpki/up_down.py
+++ b/rpki/up_down.py
@@ -35,11 +35,20 @@ from lxml.etree import Element, SubElement, tostring as ElementToString
 
 logger = logging.getLogger(__name__)
 
-
 xmlns   = rpki.relaxng.up_down.xmlns
 nsmap   = rpki.relaxng.up_down.nsmap
 version = "1"
 
+## @var content_type
+# MIME content type to use when sending up-down queries.
+#content_type = "application/rpki-updown"
+content_type = "application/x-rpki"
+
+## @var allowed_content_types
+# MIME content types which we consider acceptable for incoming up-down
+# queries.
+allowed_content_types = ("application/rpki-updown", "application/x-rpki")
+
 tag_certificate = xmlns + "certificate"
 tag_class       = xmlns + "class"
 tag_description = xmlns + "description"
-- 
cgit v1.2.3