[xiph-commits] r3528 - mod_annodex-ap20/trunk

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-03-27 04:16:36 -0700 (Thu, 27 Mar 2008)
New Revision: 3528

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


Modified: mod_annodex-ap20/trunk/mod_annodex.c
===================================================================
--- mod_annodex-ap20/trunk/mod_annodex.c	2008-03-27 10:13:56 UTC (rev 3527)
+++ mod_annodex-ap20/trunk/mod_annodex.c	2008-03-27 11:16:36 UTC (rev 3528)
@@ -27,8 +27,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"
@@ -219,8 +219,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, 0, r,
@@ -734,7 +734,9 @@
   /* but we still need to determine the output type */
   output_type = MOD_ANNODEX_TYPE_UNKNOWN;
 
-  if (strcmp(r->handler, "annodex") && strcmp(r->handler, "application/x-annodex")) {
+  if (strcmp(r->handler, "annodex") &&
+      strcmp(r->handler, "application/annodex") &&
+      strcmp(r->handler, "application/x-annodex")) {
     ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                   "handler not annodex but %s, DECLINED",
                   r->handler);
@@ -812,7 +814,7 @@
   }
 
   apr_table_set (r->headers_out, (const char *)"X-Accept-TimeURI",
-		 "application/x-annodex");
+                 ANX_MIME_TYPE);
 
   if (r->header_only) {
     ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,