Commit 9b56720c authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Review of MimeMap sections

Video type:
  Deleted duplicate video/x-msvideo entry.
  Renamed acorn-replay into private name space.
  Added MJPEG.
Multipart & message types:
  Reviewed, no changes.
Audio type:
  Added AC3, L16, MPA.
  Removed audio/mp3.
Application type:
  Duplicate of x-dvi, x-latex, x-shockwave-flash, x-director, x-tar entries removed.
  Caseless compare means .Z and .z are duplicates too.
  Quadruplicate entry for 'TeX' removed.
  Added XML & XML-DTD
  Added Lotus123 and XLS from !Eureka
  Added the office document formats, their XML equivalents, and pen document equivalents.

Also sync md5.c with FreeBSD SVN revision 280716, this is no net code change since it's the result of feedback to FreeBSD from here.

Version 5.57. Tagged as 'Internet-5_57'
parent d9f7546a
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
# MIME type RISC OS Hex Extensions... # MIME type RISC OS Hex Extensions...
# #
# Media type 'Text'
# IANA registered # IANA registered
text/css CSS f79 .css text/css CSS f79 .css
text/csv CSV dfe .csv text/csv CSV dfe .csv
...@@ -27,10 +28,11 @@ text/x-teletext Teletext 112 .ttx ...@@ -27,10 +28,11 @@ text/x-teletext Teletext 112 .ttx
text/x-vcard vCard acf .vcf text/x-vcard vCard acf .vcf
text/* Text fff text/* Text fff
# Media type 'Image'
# IANA registered # IANA registered
image/fits FITS 6a3 .fit .fits image/fits FITS 6a3 .fit .fits
image/gif GIF 695 .gif image/gif GIF 695 .gif
image/jpeg JPEG c85 .jpg .jpeg .jfif .jpe .jfi .jif image/jpeg JPEG c85 .jpg .jpeg .jfif .jpe .jfi .jif .pjpeg .pjpg
image/tiff TIFF ff0 .tif .tiff image/tiff TIFF ff0 .tif .tiff
image/prs.btif TIFF ff0 .btf .btif image/prs.btif TIFF ff0 .btf .btif
image/png PNG b60 .png image/png PNG b60 .png
...@@ -40,85 +42,109 @@ image/vnd.microsoft.icon ICO 132 .ico ...@@ -40,85 +42,109 @@ image/vnd.microsoft.icon ICO 132 .ico
image/vnd-wap-wbmp WBMP f8f .wbmp image/vnd-wap-wbmp WBMP f8f .wbmp
image/vnd.adobe.photoshop PhotoShp f98 .psd image/vnd.adobe.photoshop PhotoShp f98 .psd
# Private # Private
image/x-bitmap XBitMap b61 .bm image/x-bitmap XBitMap b61 .xbm .bm
image/x-ms-bmp BMP 69c .bmp image/x-ms-bmp BMP 69c .bmp
image/x-photo-cd PhotoCD be8 .pcd image/x-photo-cd PhotoCD be8 .pcd
image/x-pict Pict fd5 .pict .pic
image/x-png PNG b60 image/x-png PNG b60
image/x-riscos-sprite Sprite ff9 .spr image/x-riscos-sprite Sprite ff9 .spr
image/x-xbitmap XBitMap b61 .bm image/x-xbitmap XBitMap b61 .xbm .bm
image/x-xpixmap XPM 301 .xpm image/x-xpixmap XPM 301 .xpm
# Not IANA registered, but prevalent # Not IANA registered, but prevalent
image/pjpeg JPEG c85 .pjpeg .pjpg image/pjpeg JPEG c85
image/xbm XBitMap b61 .xbm image/xbm XBitMap b61
image/bmp BMP 69c .bmp image/bmp BMP 69c
video/mpeg MPEG bf8 .mpeg .mpg .mpv # Media type 'Video'
video/x-mpeg2 MPEG bf8 # IANA registered
video/mj2 MJPEG a7a .mjpeg .mjpg
video/mpeg MPEG bf8 .mpeg .mpg .mpv .mpe
# Private
video/x-mpeg2 MPEG bf8 .m2v
video/x-msvideo AVI fb2 .avi video/x-msvideo AVI fb2 .avi
video/quicktime AVI fb2 .mov video/x-acorn-replay ARMovie ae7 .replay .rpl
video/avi AVI fb2 .avi # Not IANA registered, but prevalent
video/msvideo AVI fb2 .avi video/avi AVI fb2
video/x-msvideo AVI fb2 video/msvideo AVI fb2
video/acorn-replay ARMovie ae7 .replay .rpl
# Media type 'Model'
# IANA registered # IANA registered
model/vrml VRML b29 .wrl model/vrml VRML b29 .wrl
# Private # Private
x-world/x-vrml VRML b29 .wrl x-world/x-vrml VRML b29 .wrl
# Media type 'Audio'
# IANA registered
audio/ac3 AC3Audio a8f .ac3
audio/basic WaveForm fb1 .au .snd audio/basic WaveForm fb1 .au .snd
audio/wav WaveForm fb1 .wav audio/L16 AIFF fc2 .l16
audio/x-wav WaveForm fb1 audio/MPA AMPEG 1ad .mpa
audio/aiff AIFF fc2 .aifc .aif .aiff audio/mpeg AMPEG 1ad .mp3 .mp2 .mp1
audio/x-aiff AIFF fc2 # Private
audio/mp3 AMPEG 1ad audio/x-wav WaveForm fb1 .wav .wave
audio/x-aiff AIFF fc2 .aifc .aif .aiff
audio/x-mp3 AMPEG 1ad audio/x-mp3 AMPEG 1ad
audio/mpeg AMPEG 1ad .mp3 .mp2 .mp1 .mpa
audio/x-mpeg AMPEG 1ad audio/x-mpeg AMPEG 1ad
audio/x-pn-realaudio RealAud f88 .ram .rpm .ra audio/x-pn-realaudio RealAud f88 .ram .ra
audio/midi MIDI fd4 .midi .mid
audio/x-midi MIDI fd4 .midi .mid audio/x-midi MIDI fd4 .midi .mid
audio/x-scpls pls aa8 .pls audio/x-scpls pls aa8 .pls
audio/x-mpegurl M3UFile aa7 .m3u audio/x-mpegurl M3UFile aa7 .m3u
audio/* GenSound f96 .voc # Not IANA registered, but prevalent
audio/wav WaveForm fb1
audio/aiff AIFF fc2
audio/midi MIDI fd4
application/hyperstudio HStudio b44 .stk .stak # Media type 'Application'
application/x-tar tar c46 .tar # IANA registered
application/x-director Director ae3 .dxr .dcr .dir application/fits FITS 6a3 .fit .fits
application/x-dvi DVI ce4 .dvi
application/x-latex latex 2a8 .ltx
application/x-tex tex ce5 .tex
application/x-tex tex 2a7 .tex
application/postscript PoScript ff5 .ps .eps
application/pdf PDF adf .pdf
application/nc-download NCDown f93 .ncd
application/nc-smartcard SCBBlk f94 .scb
application/octet-stream Data ffd .z .Z .exe
application/dvi DVI ce4
application/bzip2 BZip2 16E .bz2
application/gzip GZip f89 .gz .gzip .tgz application/gzip GZip f89 .gz .gzip .tgz
application/zip Zip a91 .zip application/hyperstudio HStudio b44 .stk .stak
application/compress Archive ddc .Z .z .arc .spk .lha .arj .lzh application/javascript JSScript f81 .js
application/java-vm Java ae4 .class
application/msword MSWord ae6 .doc application/msword MSWord ae6 .doc
application/octet-stream Data ffd .dat
application/pdf PDF adf .pdf
application/postscript PoScript ff5 .ps .eps
application/riscos * *
application/rtf RTF c32 .rtf application/rtf RTF c32 .rtf
application/x-shockwave-flash Flash 188 .swf application/vnd.lotus-1-2-3 Lotus123 db0 .123 .wk4 .wk3 .wk1
application/vnd.ms-excel Excel ba6 .xls
application/vnd.openxmlformats-officedocument.wordprocessingml.document MSWordX a7e .docx
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ExcelX a7f .xlsx
application/vnd.openxmlformats-officedocument.presentationml.presentation PowerPtX a80 .pptx
application/vnd.oasis.opendocument.database ODB a83 .odb
application/vnd.oasis.opendocument.formula ODF a86 .odf
application/vnd.oasis.opendocument.graphics ODG a85 .odg
application/vnd.oasis.opendocument.presentation ODP a84 .odp
application/vnd.oasis.opendocument.spreadsheet ODS a82 .ods
application/vnd.oasis.opendocument.text ODT a81 .odt
application/xml XML f80 .xml
application/xml-dtd XML_DTD f7f .dtd .mod
application/zip Zip a91 .zip
# Private
application/x-bzip2 BZip2 16e .bz2
application/x-chat Chat 17a .chat .cha application/x-chat Chat 17a .chat .cha
application/x-compress Archive ddc application/x-compress Archive ddc
application/x-director Director ae3 .dxr .dcr .dir application/x-director Director ae3 .dxr .dcr .dir
application/x-dvi DVI ce4 .dvi application/x-dvi DVI ce4 .dvi
application/x-gzip GZip f89 application/x-gzip GZip f89
application/x-zip Zip a91
application/x-latex LaTex 2a8 .ltx application/x-latex LaTex 2a8 .ltx
application/x-nschat Chat 17a .nsc application/x-nschat Chat 17a .nsc
application/x-shockwave-flash Flash 188 .swf application/x-shockwave-flash Flash 188 .swf
application/x-tar Tar c46 .tar application/x-tar tar c46 .tar
application/x-tex TeX ce5 .tex .texi .texinfo application/x-tex TeX ce5 .tex
application/x-tex TeX 2a7 .tex application/x-zip Zip a91
application/riscos * * # Not IANA registered, but prevalent
application/nc-download NCDown f93 .ncd
application/nc-smartcard SCBBlk f94 .scb
application/compress Archive ddc .z .arc .spk .lha .arj .lzh
application/java-vm Java ae4 .class
# Media type 'Multipart'
# Private
multipart/x-mixed-replace Data ffd multipart/x-mixed-replace Data ffd
# Media type 'Message'
# IANA registered
message/* Text fff message/* Text fff
*/* data ffd */* data ffd
...@@ -48,18 +48,16 @@ __FBSDID("$FreeBSD$"); ...@@ -48,18 +48,16 @@ __FBSDID("$FreeBSD$");
#define TEST_BLOCK_COUNT 100000 #define TEST_BLOCK_COUNT 100000
#define MDTESTCOUNT 8 #define MDTESTCOUNT 8
int qflag; static int qflag;
int rflag; static int rflag;
int sflag; static int sflag;
static char* checkAgainst;
static int checksFailed;
#ifdef RISCOS_TWEAK #ifdef RISCOS_TWEAK
const char *__progname = "md5"; const char *__progname = "md5";
const char *MD5TestOutput[MDTESTCOUNT]; const char *MD5TestOutput[MDTESTCOUNT];
#define MDFilter(a,t) usage(a) /* Not supporting stdin -> stdout filter */ #define MDFilter(a,t) usage(a) /* Not supporting stdin -> stdout filter */
char* checkAgainst;
#else
unsigned char* checkAgainst;
#endif #endif
int checksFailed;
typedef void (DIGEST_Init)(void *); typedef void (DIGEST_Init)(void *);
typedef void (DIGEST_Update)(void *, const unsigned char *, size_t); typedef void (DIGEST_Update)(void *, const unsigned char *, size_t);
......
/* (5.56) /* (5.57)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 5.56 #define Module_MajorVersion_CMHG 5.57
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Nov 2014 #define Module_Date_CMHG 30 Mar 2015
#define Module_MajorVersion "5.56" #define Module_MajorVersion "5.57"
#define Module_Version 556 #define Module_Version 557
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "03 Nov 2014" #define Module_Date "30 Mar 2015"
#define Module_ApplicationDate "03-Nov-14" #define Module_ApplicationDate "30-Mar-15"
#define Module_ComponentName "Internet" #define Module_ComponentName "Internet"
#define Module_ComponentPath "mixed/RiscOS/Sources/SystemRes/Internet" #define Module_ComponentPath "mixed/RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.56" #define Module_FullVersion "5.57"
#define Module_HelpVersion "5.56 (03 Nov 2014)" #define Module_HelpVersion "5.57 (30 Mar 2015)"
#define Module_LibraryVersionInfo "5:56" #define Module_LibraryVersionInfo "5:57"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment