From: Nick Kew <niq@apache.org>
Date: Sat, 28 Jul 2007 12:37:54 +0000 (+0000)
Subject: Propose backports
X-Git-Tag: 2.2.5~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e055b52872e9fa3ee3ef08e26ca0e794d5ce4de6;p=thirdparty%2Fapache%2Fhttpd.git

Propose backports


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

diff --git a/STATUS b/STATUS
index 7ec7bdc2f22..22f82290440 100644
--- a/STATUS
+++ b/STATUS
@@ -307,6 +307,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=560373
       +1: rederpj
 
+    * mime.types: Use registered types for Javascript/ECMAscript (RFC4329)
+      PR: 40299
+      http://svn.apache.org/viewvc?view=rev&revision=560533
+      +1: niq
+
+    * mime.types: Add registered Apple installer type
+      PR: 40379
+      http://svn.apache.org/viewvc?view=rev&revision=560533
+      +1: niq
+
 PATCHES/ISSUES THAT ARE STALLED
 
     * PKCS#7: backport PCKS#7 patches from trunk.