From e28e2e189f6c7ee72b987189ab072ee51d778a22 Mon Sep 17 00:00:00 2001
From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Tue, 26 Mar 2002 18:35:16 +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.)

PR: 7730
Submitted by:	Linus Walleij <triad@df.lth.se>
Reviewed by:	Justin Erenkrantz
(minor change with no effect on code, so committing.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@94186 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/magic  | 11 +++++++++++
 src/CHANGES |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/conf/magic b/conf/magic
index 9c098efa9a2..809ce30ec1f 100644
--- a/conf/magic
+++ b/conf/magic
@@ -90,6 +90,10 @@
 0	string		RIFF		audio/unknown
 #					- WAVE format
 >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
@@ -184,6 +188,9 @@
 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
 
diff --git a/src/CHANGES b/src/CHANGES
index 44516e15219..6269ac134b1 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.25
 
+  *) Add some popular types to the mime magic file.  PR 7730.
+     [Linus Walleij <triad@df.lth.se>, Justin Erenkrantz]
+
   *) Tighten up the overridden-Server-header bugfix in the proxy, by
      only overriding if the request is a proxy request. It has been
      pointed out that the previous fix allows CGIs and modules to
-- 
2.47.2