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

1 files changed, 10 insertions, 0 deletions

diff --git a/rpki/up_down.py b/rpki/up_down.py
index 73a0ae99..5339e9a7 100644
--- a/rpki/up_down.py
+++ b/rpki/up_down.py
@@ -36,6 +36,16 @@ logger = logging.getLogger(__name__)
 xmlns = rpki.relaxng.up_down.xmlns
 nsmap = rpki.relaxng.up_down.nsmap
 
+## @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")
+
 class base_elt(object):
   """
   Generic PDU object.