[cvs-annodex] commit (/annodex): mod_annodex-ap20/trunk/mod_annodex.c

[conrad]

Update of /annodex (new revision 584)

Modified files:
   mod_annodex-ap20/trunk/mod_annodex.c

Log Message:
respect Accept: header for CMML even when muxing from CMML


Modified: mod_annodex-ap20/trunk/mod_annodex.c
===================================================================
--- mod_annodex-ap20/trunk/mod_annodex.c	2004-09-16 05:15:15 UTC (rev 583)
+++ mod_annodex-ap20/trunk/mod_annodex.c	2004-09-16 05:27:59 UTC (rev 584)
@@ -637,12 +637,10 @@
     output_type = get_cgi_mode (r, cgi_table);
 #endif
 
-  if (output_type == MOD_ANNODEX_TYPE_UNKNOWN) {
-     if (prefer_cmml (r)) {
-       output_type = MOD_ANNODEX_TYPE_CMML;
-     } else {
-       output_type = MOD_ANNODEX_TYPE_ANX;
-     }
+  if (prefer_cmml (r)) {
+    output_type = MOD_ANNODEX_TYPE_CMML;
+  } else if (output_type == MOD_ANNODEX_TYPE_UNKNOWN) {
+    output_type = MOD_ANNODEX_TYPE_ANX;
   }
 
   if (output_type == MOD_ANNODEX_TYPE_CMML) {


-- 
conrad