From: Jim Jagielski <jim@apache.org>
Date: Fri, 3 Aug 2007 12:50:32 +0000 (+0000)
Subject: Merge r560533, r562236 from trunk:
X-Git-Tag: 2.2.5~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=370463e4ad61b2345ddf605e8d7ca0757282b8d6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r560533, r562236 from trunk:

PR: 40299	Registered Javascript/ECMAScript MIME types (RFC4329)
PR: 40379	Apple installer registered type

Comment: "dist" and "pkg" are too widely used to reserve.
Not sure if they could be overloaded in the context of "extension"s?


Note mime.types updates

Submitted by: niq
Reviewed by: jim


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

diff --git a/CHANGES b/CHANGES
index dabbfd47260..3bfa5d53371 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,9 @@ Changes with Apache 2.2.5
      values could previously point to cleaned up storage.  PR 41551.
      [Davi Arnaut <davi haxent.com.br>]
 
+  *  mime.types: add Registered Javascript/ECMAScript MIME types (RFC4329)
+     PR 40299 [Dave Hodder <dmh dmh.org.uk>]
+
   *) mod_filter: fix integer comparisons in dispatch rules
      PR 41835 [Nick Kew]
 
diff --git a/STATUS b/STATUS
index a167dba31d3..25e29a4d0bb 100644
--- a/STATUS
+++ b/STATUS
@@ -77,11 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mime.types: Use registered types for Javascript/ECMAscript (RFC4329)
-      PR: 40299
-      http://svn.apache.org/viewvc?view=rev&revision=560533
-      http://svn.apache.org/viewvc?view=rev&revision=562236
-      +1: niq, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index f671b78102e..7091766bf4b 100644
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -24,6 +24,7 @@ application/cybercash
 application/dca-rft
 application/dec-dx
 application/dvcs
+application/ecmascript		es
 application/edi-consent
 application/edifact
 application/edi-x12
@@ -40,6 +41,7 @@ application/index.vnd
 application/iotp
 application/ipp
 application/isup
+application/javascript		js
 application/mac-binhex40	hqx
 application/mac-compactpro	cpt
 application/macwriteii
@@ -106,6 +108,7 @@ application/vnd.aether.imp
 application/vnd.amiga.ami
 application/vnd.anser-web-certificate-issue-initiation
 application/vnd.anser-web-funds-transfer-initiation
+application/vnd.apple.installer+xml	dist distz pkg mpkg
 application/vnd.audiograph
 application/vnd.blueice.multipass
 application/vnd.bmi
@@ -356,7 +359,6 @@ application/x-futuresplash	spl
 application/x-gtar		gtar
 application/x-gzip
 application/x-hdf		hdf
-application/x-javascript	js
 application/x-koan		skp skd skt skm
 application/x-latex		latex
 application/x-netcdf		nc cdf