You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/03/27 17:59:15 UTC
svn commit: r1582399 - in /tomcat/trunk:
java/org/apache/catalina/servlets/DefaultServlet.java
webapps/docs/changelog.xml
Author: markt
Date: Thu Mar 27 16:59:15 2014
New Revision: 1582399
URL: http://svn.apache.org/r1582399
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56320
Fix fd leak when sendfile is used
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1582399&r1=1582398&r2=1582399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Mar 27 16:59:15 2014
@@ -928,9 +928,16 @@ public class DefaultServlet extends Http
// Silent catch
}
if (ostream != null) {
- if (!checkSendfile(request, response, resource,
- contentLength, null))
+ if (checkSendfile(request, response, resource,
+ contentLength, null)) {
+ try {
+ renderResult.close();
+ } catch (IOException ioe) {
+ // Ignore
+ }
+ } else {
copy(resource, renderResult, ostream);
+ }
} else {
copy(resource, renderResult, writer, encoding);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582399&r1=1582398&r2=1582399&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 16:59:15 2014
@@ -59,6 +59,10 @@
decoder provided by Java. Java 8's decoder is better than Java
7's but it is still buggy. (markt)
</fix>
+ <fix>
+ <bug>56320</bug>: Fix a file descriptor leak in the default servlet when
+ sendfile is used. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org