320264 Removed duplicate mime.property entries

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2157 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-07-20 00:47:10 +00:00
parent 4dd6536e1b
commit 599294e8f3
2 changed files with 13 additions and 13 deletions

View File

@ -6,6 +6,7 @@ jetty-7.2-SNAPSHOT
+ 319444 Two nulls are appended to log statements from ContextHanler$Context
+ 320073 Reconsile configuration mechanism
+ 320112 Websocket in aggregate jars
+ 320264 Removed duplicate mime.property entries
+ JETTY-1245 Do not use direct buffers with NIO SSL
+ JETTY-1249 Apply max idle time to all connectors
+ Added ignore to Logger interface

View File

@ -38,8 +38,8 @@ gzip = application/gzip
hdf = application/x-hdf
hqx = application/mac-binhex40
htc = text/x-component
html = text/html
htm = text/html
html = text/html
ice = x-conference/x-cooltalk
ico = image/x-icon
ief = image/ief
@ -49,8 +49,8 @@ jad = text/vnd.sun.j2me.app-descriptor
jar = application/java-archive
java = text/plain
jnlp = application/x-java-jnlp-file
jpeg = image/jpeg
jpe = image/jpeg
jpeg = image/jpeg
jpg = image/jpeg
js = application/x-javascript
jsp = text/html
@ -66,14 +66,14 @@ mid = audio/midi
midi = audio/midi
mif = application/vnd.mif
mol = chemical/x-mdl-molfile
movie = video/x-sgi-movie
mov = video/quicktime
movie = video/x-sgi-movie
mp2 = audio/mpeg
mp3 = audio/mpeg
mpeg = video/mpeg
mpe = video/mpeg
mpga = audio/mpeg
mpeg = video/mpeg
mpg = video/mpeg
mpga = audio/mpeg
ms = application/x-troff-ms
msh = model/mesh
msi = application/octet-stream
@ -105,12 +105,11 @@ pgn = application/x-chess-pgn
png = image/png
pnm = image/x-portable-anymap
ppm = image/x-portable-pixmap
pps = application/vnd.ms-powerpoint
pps = application/vnd.ms-powerpoint
ppt = application/vnd.ms-powerpoint
ps = application/postscript
qt = video/quicktime
ra = audio/x-pn-realaudio
ra = audio/x-realaudio
ram = audio/x-pn-realaudio
ras = image/x-cmu-raster
rdf = application/rdf+xml
@ -118,12 +117,12 @@ rgb = image/x-rgb
rm = audio/x-pn-realaudio
roff = application/x-troff
rpm = application/x-rpm
rpm = audio/x-pn-realaudio
rtf = application/rtf
rtx = text/richtext
rv = video/vnd.rn-realvideo
ser = application/java-serialized-object
sgml = text/sgml
sgm = text/sgml
sgml = text/sgml
sh = application/x-sh
shar = application/x-shar
silo = model/mesh
@ -149,8 +148,8 @@ tex = application/x-tex
texi = application/x-texinfo
texinfo = application/x-texinfo
tgz = application/x-gtar
tiff = image/tiff
tif = image/tiff
tiff = image/tiff
tr = application/x-troff
tsv = text/tab-separated-values
txt = text/plain
@ -160,10 +159,10 @@ vrml = model/vrml
vxml = application/voicexml+xml
wav = audio/x-wav
wbmp = image/vnd.wap.wbmp
wmlc = application/vnd.wap.wmlc
wmlsc = application/vnd.wap.wmlscriptc
wmls = text/vnd.wap.wmlscript
wml = text/vnd.wap.wml
wmlc = application/vnd.wap.wmlc
wmls = text/vnd.wap.wmlscript
wmlsc = application/vnd.wap.wmlscriptc
wrl = model/vrml
wtls-ca-certificate = application/vnd.wap.wtls-ca-certificate
xbm = image/x-xbitmap