]> granicus.if.org Git - apache/commitdiff
projects / apache / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 53298f2)
Add text/xml, audio/mpeg, video/quicktime support to mime magic file.
authorJustin Erenkrantz <jerenkrantz@apache.org>
Tue, 26 Mar 2002 18:41:14 +0000 (18:41 +0000)
committerJustin Erenkrantz <jerenkrantz@apache.org>
Tue, 26 Mar 2002 18:41:14 +0000 (18:41 +0000)
(Justin changed the audio/mpeg sequence to match file(1)'s listing.)

Minor style changes in nearby areas.

PR: 7730
Submitted by: Linus Walleij <triad@df.lth.se>
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 patch | blob | history
docs/conf/magic patch | blob | history

diff --git a/CHANGES b/CHANGES
index e56716fe6763e4a3f2cc2460af2d79c1715bfe6e..ba77087fab8d106991553cb3627da2294c9eebad 100644 (file)
--- 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 <triad@df.lth.se>, 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 0aff382eadd1fa45156b29ea53daaddcda0cf847..9e3e721142921a911a64bf6a0ee6affb3d17c3de 100644 (file)
--- 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 <triad@df.lth.se>
+0   string      PSID        audio/prs.sid
 
 #------------------------------------------------------------------------------
 # c-lang:  file(1) magic for C programs or various scripts
@@ -172,17 +176,20 @@
 # from Daniel Quinlan <quinlan@yggdrasil.com>
 # and Anna Shergold <anna@inext.co.uk>
 #
-0      string          \<!DOCTYPE\ HTML        text/html
-0      string          \<!doctype\ html        text/html
-0      string          \<HEAD          text/html
-0      string          \<head          text/html
-0      string          \<TITLE         text/html
-0      string          \<title         text/html
-0       string          \<html          text/html
-0       string          \<HTML          text/html
-0      string          \<!--           text/html
-0      string          \<h1            text/html
-0      string          \<H1            text/html
+0   string      \<!DOCTYPE\ HTML    text/html
+0   string      \<!doctype\ html    text/html
+0   string      \<HEAD      text/html
+0   string      \<head      text/html
+0   string      \<TITLE     text/html
+0   string      \<title     text/html
+0   string      \<html      text/html
+0   string      \<HTML      text/html
+0   string      \<!--       text/html
+0   string      \<h1        text/html
+0   string      \<H1        text/html
+
+# XML eXtensible Markup Language, from Linus Walleij <triad@df.lth.se>
+0   string      \<?xml      text/xml
 
 #------------------------------------------------------------------------------
 # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
@@ -368,4 +375,8 @@
 #                                              DL file version 1 , medium format (160x100, 4 images/screen)
 0      byte            1                       video/unknown
 0      byte            2                       video/unknown
+# Quicktime video, from Linus Walleij <triad@df.lth.se>
+# from Apple quicktime file format documentation.
+4   string      moov        video/quicktime 
+4   string      mdat        video/quicktime
 
Unnamed repository; edit this file 'description' to name the repository.