Author: markt
Date: Mon Aug 21 16:59:56 2017
New Revision: 1805652
URL: http://svn.apache.org/viewvc?rev=1805652&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=48655
Enable Tomcat to shutdown cleanly when using sendfile, the APR/native connector
and a multi-part download is in progress.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1805652&r1=1805651&r2=1805652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Aug 21
16:59:56 2017
@@ -2002,7 +2002,7 @@ public class AprEndpoint extends Abstrac
0, data.fdpool);
// Set the socket to nonblocking mode
Socket.timeoutSet(data.socket, 0);
- while (true) {
+ while (sendfileRunning) {
long nw = Socket.sendfilen(data.socket, data.fd,
data.pos, data.length, 0);
if (nw < 0) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1805652&r1=1805651&r2=1805652&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 21 16:59:56 2017
@@ -112,6 +112,11 @@
renegotiation. (markt)
</fix>
<fix>
+ <bug>48655</bug>: Enable Tomcat to shutdown cleanly when using
sendfile,
+ the APR/native connector and a multi-part download is in progress.
+ (markt)
+ </fix>
+ <fix>
<bug>58244</bug>: Handle the case when OpenSSL resumes a TLS session
using a ticket and the full client certificate chain is not available.
In this case the client certificate without the chain will be presented
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
