[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-13-g4a6bd73

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 91dd419c22bd23642779bfc55136c910202fe3d9
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Feb 19 19:22:37 2012 +0100

    Add "AddCharset" for .brf files in default mod_mime config.
    
    Cherry-picked from d75911e8780a2f0875ac462d0544207d9c7e4316
    Conflicts:
    
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 1e8564f..c6264b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ apache2 (2.2.22-6) UNRELEASED; urgency=low
     directories. Closes: #548213
   * Update ssl default cipher config, add alternative speed optimized config.
     Closes: #649020
+  * Add "AddCharset" for .brf files in default mod_mime config. Closes: #402567
 
  -- Stefan Fritsch <sf at debian.org>  Mon, 28 May 2012 20:02:19 +0200
 
diff --git a/debian/config-dir/mods-available/mime.conf b/debian/config-dir/mods-available/mime.conf
index 331aa3f..ba73f93 100644
--- a/debian/config-dir/mods-available/mime.conf
+++ b/debian/config-dir/mods-available/mime.conf
@@ -206,6 +206,7 @@ AddCharset gb2312      .gb2312 .gb
 AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2
 AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4
 AddCharset shift_jis   .shift_jis .sjis
+AddCharset BRF         .brf
 
 #
 # AddHandler allows you to map certain file extensions to "handlers":

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)