From: Stefan Fritsch <sf@apache.org>
Date: Sun, 9 Oct 2011 21:52:42 +0000 (+0000)
Subject: mod_mime_magic: Add signatures for PNG and SWF to the example config.
X-Git-Tag: 2.3.15~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b26b48e9c4b9e019df3a6b7424c51502b7c655d;p=apache

mod_mime_magic: Add signatures for PNG and SWF to the example config.

PR: 48352
Submitted by: Jeremy Wagner-Kaiser <jwagner-kaiser adknowledge com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180725 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a2fad322e9..eb51027b4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@ Changes with Apache 2.3.15
      PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,
      <lowprio20 gmail.com>]
 
+  *) mod_mime_magic: Add signatures for PNG and SWF to the example config.
+     PR: 48352. [Jeremy Wagner-Kaiser <jwagner-kaiser adknowledge com>]
+
   *) core, unixd: Add -D DUMP_RUN_CFG option to dump some configuration items
      from the parsed (or default) config. This is useful for init scripts that
      need to setup temporary directories and permissions. [Stefan Fritsch]
diff --git a/docs/conf/magic b/docs/conf/magic
index 0de73361fb..7c56119e9a 100644
--- a/docs/conf/magic
+++ b/docs/conf/magic
@@ -262,6 +262,9 @@
 #0	string		CP		color pointer
 #0	string		BA		bitmap array
 
+0	string		\x89PNG		image/png
+0	string		FWS		application/x-shockwave-flash
+0	string		CWS		application/x-shockwave-flash
 
 #------------------------------------------------------------------------------
 # lisp:  file(1) magic for lisp programs