[xiph-commits] r3529 - mod_annodex-ap13/trunk

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-03-27 04:20:15 -0700 (Thu, 27 Mar 2008)
New Revision: 3529

Modified:
   mod_annodex-ap13/trunk/mod_annodex.c
Log:
use non x-prefix MIME types in HTTP and expected Apache config


Modified: mod_annodex-ap13/trunk/mod_annodex.c
===================================================================
--- mod_annodex-ap13/trunk/mod_annodex.c	2008-03-27 11:16:36 UTC (rev 3528)
+++ mod_annodex-ap13/trunk/mod_annodex.c	2008-03-27 11:20:15 UTC (rev 3529)
@@ -58,8 +58,8 @@
 
 #define DEBUG
 
-#define ANX_MIME_TYPE "application/x-annodex"
-#define CMML_MIME_TYPE "text/x-cmml"
+#define ANX_MIME_TYPE "application/annodex"
+#define CMML_MIME_TYPE "text/cmml"
 
 #define CMML_PREAMBLE \
 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n"
@@ -251,8 +251,8 @@
 {
   float qc, qa;
 
-  qc = get_accept_quality (r, "text/x-cmml");
-  qa = get_accept_quality (r, "application/x-annodex");
+  qc = get_accept_quality (r, CMML_MIME_TYPE);
+  qa = get_accept_quality (r, ANX_MIME_TYPE);
 
 #ifdef DEBUG
   ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
@@ -894,7 +894,7 @@
   }
 
   table_set (r->headers_out, (const char *)"X-Accept-TimeURI",
-             "application/x-annodex");
+             ANX_MIME_TYPE);
 
 #ifdef BLAHBLIMBLAM__PROTOTYPE
   if (!(input_type == MOD_ANNODEX_TYPE_ANX &&