diff options
| author | Greg Wilkins | 2010-10-19 23:10:36 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2010-10-19 23:10:36 +0000 |
| commit | 75648cc09593bdd419754fc73dd81ae70b47ce7f (patch) | |
| tree | db3e7de5c9efbbdcf9175005de4863796e05e693 /jetty-servlet/src/main | |
| parent | 5ab4634dfba15268aac121ebb77b05256feb7659 (diff) | |
| download | org.eclipse.jetty.project-75648cc09593bdd419754fc73dd81ae70b47ce7f.tar.gz org.eclipse.jetty.project-75648cc09593bdd419754fc73dd81ae70b47ce7f.tar.xz org.eclipse.jetty.project-75648cc09593bdd419754fc73dd81ae70b47ce7f.zip | |
327725 cleanup
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2368 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-servlet/src/main')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index 7b0be494ca..594963ea2c 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -462,7 +462,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory { // ensure we have content if (content==null) - content=new HttpContent.ResourceAsHttpContent(resource,_mimeTypes); + content=new HttpContent.ResourceAsHttpContent(resource,_mimeTypes.getMimeByExtension(resource.toString())); if (included.booleanValue() || passConditionalHeaders(request,response, resource,content)) { @@ -532,7 +532,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory } else { - content=new HttpContent.ResourceAsHttpContent(resource,_mimeTypes); + content=new HttpContent.ResourceAsHttpContent(resource,_mimeTypes.getMimeByExtension(resource.toString())); if (included.booleanValue() || passConditionalHeaders(request,response, resource,content)) sendDirectory(request,response,resource,pathInContext); } |