svn commit: r562446 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS docs/conf/mime.types

[ji...@apache.org]

Author: jim
Date: Fri Aug  3 05:50:32 2007
New Revision: 562446

URL: http://svn.apache.org/viewvc?view=rev&rev=562446
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/conf/mime.types

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=562446&r1=562445&r2=562446
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Aug  3 05:50:32 2007
@@ -21,6 +21,9 @@
      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]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=562446&r1=562445&r2=562446
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug  3 05:50:32 2007
@@ -77,11 +77,6 @@
 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:
 

Modified: httpd/httpd/branches/2.2.x/docs/conf/mime.types
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/conf/mime.types?view=diff&rev=562446&r1=562445&r2=562446
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/conf/mime.types (original)
+++ httpd/httpd/branches/2.2.x/docs/conf/mime.types Fri Aug  3 05:50:32 2007
@@ -24,6 +24,7 @@
 application/dca-rft
 application/dec-dx
 application/dvcs
+application/ecmascript		es
 application/edi-consent
 application/edifact
 application/edi-x12
@@ -40,6 +41,7 @@
 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.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-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