httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/docs/conf magic
Date Tue, 26 Mar 2002 18:41:14 GMT
jerenkrantz    02/03/26 10:41:14

  Modified:    .        CHANGES
               docs/conf magic
  Log:
  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 <triad@df.lth.se>
  Reviewed by:  Justin Erenkrantz
  (forward ported from revision 1.5 of apache-1.3/conf/magic)
  
  Revision  Changes    Path
  1.657     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.656
  retrieving revision 1.657
  diff -u -r1.656 -r1.657
  --- CHANGES	26 Mar 2002 18:17:57 -0000	1.656
  +++ CHANGES	26 Mar 2002 18:41:14 -0000	1.657
  @@ -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
  
  
  
  1.3       +24 -13    httpd-2.0/docs/conf/magic
  
  Index: magic
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/magic,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- magic	29 Aug 2001 12:35:21 -0000	1.2
  +++ magic	26 Mar 2002 18:41:14 -0000	1.3
  @@ -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
   
  
  
  

Mime
View raw message