From: Rainer Jung <rjung@apache.org>
Date: Tue, 3 May 2011 11:56:47 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.2.18~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cace1496b85d7365fd3fe385f77fa1b98505e8d;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1099029 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 1e4bff01d5c..bcb37562281 100644
--- a/STATUS
+++ b/STATUS
@@ -135,6 +135,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trawick: any reason it shouldn't be completely aligned with default_handler's
              choice to return OK vs. 500?
 
+  * mime.types: Syncing from trunk.
+    At the moment trunk is 2.2 plus many additional entries
+    plus r1099022 (Fixes one suffix, comments out two unused entries)
+    plus r1085498 (Fixes one duplicate definition).
+    Syncing by simply copying from trunk to 2.2 seems to be low-hanging fruit.
+    Not sure, whether mime.types is actually CTR.
+    +1: rjung
+
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of