[naviserver-commits] naviserver/nsd mimetypes.c,1.1.1.1,1.2

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24187/nsd

Modified Files:
	mimetypes.c 
Log Message:
XML mime types changed to application/xml from text/xml, fixes
bug #1145927.  Added a handful of new mime mappings.


Index: mimetypes.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/mimetypes.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mimetypes.c	16 Feb 2005 08:39:35 -0000	1.1.1.1
--- mimetypes.c	28 Feb 2005 04:34:20 -0000	1.2
***************
*** 78,81 ****
--- 78,82 ----
       */
  
+     { ".323",   "text/h323" },
      { ".ai",    "application/postscript" },
      { ".aif",   "audio/aiff" },
***************
*** 84,105 ****
      { ".ani",   "application/x-navi-animation" },
      { ".art",   "image/x-art" },
      { ".au",    "audio/basic" },
      { ".avi",   "video/x-msvideo" },
      { ".bin",   "application/x-macbinary" },
      { ".bmp",   "image/bmp" },
      { ".css",   "text/css" },
!     { ".csv",   "application/csv" },
      { ".dcr",   "application/x-director" },
      { ".dir",   "application/x-director" },
      { ".dp",    "application/commonground" },
      { ".dxr",   "application/x-director" },
      { ".elm",   "text/plain" },
      { ".eml",   "text/plain" },
      { ".exe",   "application/octet-stream" },
      { ".gbt",   "text/plain" },    
      { ".gif",   "image/gif" },
      { ".gz",    "application/x-compressed" },
      { ".hqx",   "application/mac-binhex40" },
      { ".jfif",  "image/jpeg" },
      { ".jpe",   "image/jpeg" },
      { ".jpg",   "image/jpeg" },
--- 85,126 ----
      { ".ani",   "application/x-navi-animation" },
      { ".art",   "image/x-art" },
+     { ".asf",   "video/x-ms-asf" },
+     { ".asr",   "video/x-ms-asf" },
+     { ".asx",   "video/x-ms-asf" },
+     { ".atom",  "application/atom+xml" },
      { ".au",    "audio/basic" },
      { ".avi",   "video/x-msvideo" },
      { ".bin",   "application/x-macbinary" },
      { ".bmp",   "image/bmp" },
+     { ".cer",   "application/x-x509-ca-cert" },
+     { ".class", "application/octet-stream" },
+     { ".cpio",  "application/x-cpio" },
      { ".css",   "text/css" },
!     { ".csv",   "text/csv" },
      { ".dcr",   "application/x-director" },
+     { ".der",   "application/x-x509-ca-cert" },
+     { ".dia",   "application/x-dia" },
      { ".dir",   "application/x-director" },
+     { ".doc",   "application/msword" },
+     { ".dot",   "application/msword" },
      { ".dp",    "application/commonground" },
+     { ".dtd",   "application/xml-dtd" },
      { ".dxr",   "application/x-director" },
      { ".elm",   "text/plain" },
      { ".eml",   "text/plain" },
+     { ".eps",   "application/postscript" },
      { ".exe",   "application/octet-stream" },
      { ".gbt",   "text/plain" },    
      { ".gif",   "image/gif" },
      { ".gz",    "application/x-compressed" },
+     { ".h",     "text/plain" },
      { ".hqx",   "application/mac-binhex40" },
+     { ".ico",   "image/x-icon" },
+     { ".ica",   "application/x-ica" },
+     { ".ics",   "text/calendar" },
+     { ".ifb",   "text/calendar" },
+     { ".jar",   "application/x-java-archive" },
      { ".jfif",  "image/jpeg" },
+     { ".jng",   "image/x-jng" },
      { ".jpe",   "image/jpeg" },
      { ".jpg",   "image/jpeg" },
***************
*** 107,120 ****
--- 128,154 ----
      { ".js",    "application/x-javascript" },
      { ".ls",    "application/x-javascript" },
+     { ".m3u",   "audio/x-mpegurl" },
+     { ".m4a",   "audio/mp4" },
+     { ".m4p",   "audio/mp4" },
+     { ".man",   "application/x-troff-man" },
      { ".map",   "application/x-navimap" },
+     { ".mdb",   "application/x-msaccess" },
      { ".mid",   "audio/x-midi" },
      { ".midi",  "audio/x-midi" },
+     { ".mng",   "image/x-mng" },
      { ".mocha", "application/x-javascript" },
      { ".mov",   "video/quicktime" },
+     { ".mp2",   "audio/mpeg" },
+     { ".mp3",   "audio/mpeg" },
+     { ".mp4",   "audio/mp4" },
      { ".mpe",   "video/mpeg" },
      { ".mpeg",  "video/mpeg" },
      { ".mpg",   "video/mpeg" },
+     { ".mpga",  "video/mpeg" },
+     { ".mpv2",  "video/mpeg" },
+     { ".mxu",   "video/vnd.mpegurl" },
      { ".nvd",   "application/x-navidoc" },
      { ".nvm",   "application/x-navimap" },
+     { ".ogg",   "application/ogg" },
      { ".pbm",   "image/x-portable-bitmap" },
      { ".pdf",   "application/pdf" },
***************
*** 124,138 ****
      { ".pnm",   "image/x-portable-anymap" },
      { ".png",   "image/png" },
      { ".ps",    "application/postscript" },
      { ".qt",    "video/quicktime" },
      { ".ra",    "audio/x-pn-realaudio" },
      { ".ram",   "audio/x-pn-realaudio" },
      { ".ras",   "image/x-cmu-raster" },
      { ".rgb",   "image/x-rgb" },
!     { ".rtf",   "application/rtf" },
      { ".sit",   "application/x-stuffit" },
      { ".snd",   "audio/basic" },
      { ".sql",   "application/x-sql" },
      { ".stl",   "application/x-navistyle" },
      { ".tar",   "application/x-tar" },
      { ".tcl",   "text/plain" },
--- 158,196 ----
      { ".pnm",   "image/x-portable-anymap" },
      { ".png",   "image/png" },
+     { ".pot",   "application/vnd.ms-powerpoint"},
+     { ".pps",   "application/vnd.ms-powerpoint"},
+     { ".ppt",   "application/vnd.ms-powerpoint"},
      { ".ps",    "application/postscript" },
+     { ".pub",   "application/x-mspubllisher" },
      { ".qt",    "video/quicktime" },
      { ".ra",    "audio/x-pn-realaudio" },
      { ".ram",   "audio/x-pn-realaudio" },
      { ".ras",   "image/x-cmu-raster" },
+     { ".rdf",   "application/rdf+xml" },
      { ".rgb",   "image/x-rgb" },
!     { ".rtf",   "text/rtf" },
!     { ".rtx",   "text/richtext" },
!     { ".rss",   "application/rss+xml" },
      { ".sit",   "application/x-stuffit" },
+     { ".smi",   "application/smil" },
+     { ".smil",  "application/smil" },
      { ".snd",   "audio/basic" },
+     { ".spx",   "application/ogg" },
      { ".sql",   "application/x-sql" },
+     { ".stc",   "application/vnd.sun.xml.calc.template" },
+     { ".std",   "application/vnd.sun.xml.draw.template" },
+     { ".sti",   "application/vnd.sun.xml.impress.template" },
      { ".stl",   "application/x-navistyle" },
+     { ".stm",   "text/html" },
+     { ".stw",   "application/vnd.sun.xml.writer.template" },
+     { ".svg",   "image/svg+xml" },
+     { ".svgz",  "image/x-svgz" },
+     { ".swf",   "application/x-shockwave-flash" },
+     { ".sxc",   "application/vnd.sun.xml.calc" },
+     { ".sxd",   "application/vnd.sun.xml.draw" },
+     { ".sxg",   "application/vnd.sun.xml.writer.global" },
+     { ".sxi",   "application/vnd.sun.xml.impress" },
+     { ".sxm",   "application/vnd.sun.xml.math" },
+     { ".sxw",   "application/vnd.sun.xml.writer" },
      { ".tar",   "application/x-tar" },
      { ".tcl",   "text/plain" },
***************
*** 141,151 ****
      { ".tif",   "image/tiff" },
      { ".tiff",  "image/tiff" },
      { ".txt",   "text/plain" },
      { ".xbm",   "image/x-xbitmap" },
      { ".xpm",   "image/x-xpixmap" },
      { ".xht",   "application/xhtml+xml"},
      { ".xhtml", "application/xhtml+xml"},
!     { ".xml",   "text/xml"},
!     { ".xsl",   "text/xml"},
      { ".vrml",  "x-world/x-vrml" },
      { ".wav",   "audio/x-wav" },
--- 199,220 ----
      { ".tif",   "image/tiff" },
      { ".tiff",  "image/tiff" },
+     { ".torrent", "application/x-bittorrent" },
+     { ".tsv",   "text/tab-separated-values" },
      { ".txt",   "text/plain" },
+     { ".vcf",   "text/x-vcard" },
      { ".xbm",   "image/x-xbitmap" },
      { ".xpm",   "image/x-xpixmap" },
      { ".xht",   "application/xhtml+xml"},
      { ".xhtml", "application/xhtml+xml"},
!     { ".xla",   "application/vnd.ms-excel"},
!     { ".xlc",   "application/vnd.ms-excel"},
!     { ".xlm",   "application/vnd.ms-excel"},
!     { ".xls",   "application/vnd.ms-excel"},
!     { ".xlt",   "application/vnd.ms-excel"},
!     { ".xlw",   "application/vnd.ms-excel"},
!     { ".xml",   "application/xml"},
!     { ".xsl",   "application/xml"},
!     { ".xslt",  "application/xslt+xml"},
!     { ".xul",   "application/vnd.mozilla.xul+xml"},
      { ".vrml",  "x-world/x-vrml" },
      { ".wav",   "audio/x-wav" },