]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r560533, r562236 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 3 Aug 2007 12:50:32 +0000 (12:50 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 3 Aug 2007 12:50:32 +0000 (12:50 +0000)
commit370463e4ad61b2345ddf605e8d7ca0757282b8d6
treef2791e46266490eef096e65a6782b6f5f2a7b058
parentccf1fb0757bf4f740dc729ab22116b3b19ada0a7
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
CHANGES
STATUS
docs/conf/mime.types