From 3562c5e4574f731c3663ac5cdc25c28c80dc7ca1 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 28 Oct 2009 11:18:58 +0000 Subject: [PATCH] Fix for #293557: Add "jad" mime mapping. git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1015 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 5 +++-- .../main/resources/org/eclipse/jetty/http/mime.properties | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 512ea8a206d..ab383beea21 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -15,7 +15,7 @@ jetty-7.0.1-SNAPSHOT + JETTY-937 More JVM bug work arounds. Insert pause if all else fails + JETTY-983 Send content-length with multipart ranges + JETTY-1114 unsynchronised WebAppClassloader.getResource(String) - + JETTY-1121 Merge Multipart query parameters + + JETTY-1121 Merge Multipart query parameters + JETTY-1122 Handle multi-byte utf that causes buffer overflow + JETTY-1125 TransparentProxy incorrectly configured for test webapp + JETTY-1129 Filter control characters out of StdErrLog @@ -26,7 +26,8 @@ jetty-7.0.1-SNAPSHOT + Promoted Jetty Centralized Logging from Sandbox + Promoted Jetty WebApp Verifier from Sandbox + Refactored continuation test harnessess - + + 293557 Add "jad" mime mapping + jetty-7.0.0.v20091005 5 October 2009 291340 Race condition in onException() notifications diff --git a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties index 7d2acb1d038..5f04b991c28 100644 --- a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties +++ b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties @@ -45,6 +45,7 @@ ico = image/x-icon ief = image/ief iges = model/iges igs = model/iges +jad = text/vnd.sun.j2me.app-descriptor jar = application/java-archive java = text/plain jnlp = application/x-java-jnlp-file