From a83350dc02007372db074545b6dda39f8c7f326e Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Tue, 26 Mar 2002 18:41:14 +0000 Subject: [PATCH] Add text/xml, audio/mpeg, video/quicktime support to mime magic file. (Justin changed the audio/mpeg sequence to match file(1)'s listing.) Minor style changes in nearby areas. PR: 7730 Submitted by: Linus Walleij Reviewed by: Justin Erenkrantz (forward ported from revision 1.5 of apache-1.3/conf/magic) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94187 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ docs/conf/magic | 37 ++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index e56716fe67..ba77087fab 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes with Apache 2.0.34-dev + *) Add some popular types to the mime magic file. PR 7730. + [Linus Walleij , Justin Erenkrantz] + *) Remove the single-byte socket reads for CGI headers [Brian Pane] *) When a proxied site was being served, Apache was replacing diff --git a/docs/conf/magic b/docs/conf/magic index 0aff382ead..9e3e721142 100644 --- a/docs/conf/magic +++ b/docs/conf/magic @@ -87,9 +87,13 @@ # Microsoft WAVE format (*.wav) # [GRR 950115: probably all of the shorts and longs should be leshort/lelong] # Microsoft RIFF -0 string RIFF audio/unknown +0 string RIFF audio/unknown # - WAVE format ->8 string WAVE audio/x-wav +>8 string WAVE audio/x-wav +# MPEG audio. +0 beshort&0xfff0 0xfff0 audio/mpeg +# C64 SID Music files, from Linus Walleij +0 string PSID audio/prs.sid #------------------------------------------------------------------------------ # c-lang: file(1) magic for C programs or various scripts @@ -172,17 +176,20 @@ # from Daniel Quinlan # and Anna Shergold # -0 string \ +0 string \ +# from Apple quicktime file format documentation. +4 string moov video/quicktime +4 string mdat video/quicktime -- 2.50.1