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 2015/10/08 23:56:54 UTC
svn commit: r1707624 -
/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Thu Oct 8 21:56:54 2015
New Revision: 1707624
URL: http://svn.apache.org/viewvc?rev=1707624&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1707624&r1=1707623&r2=1707624&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Oct 8 21:56:54 2015
@@ -110,13 +110,6 @@ public class Http11Processor extends Abs
/**
- * Flag that indicates that send file processing is in progress and that the
- * socket should not be returned to the poller (where a poller is used).
- */
- protected boolean sendfileInProgress = false;
-
-
- /**
* Flag that indicates if the request headers have been completely read.
*/
protected boolean readComplete = true;
@@ -938,7 +931,6 @@ public class Http11Processor extends Abs
// Flags
keepAlive = true;
openSocket = false;
- sendfileInProgress = false;
readComplete = true;
boolean keptAlive = false;
@@ -1139,7 +1131,7 @@ public class Http11Processor extends Abs
} else if (isUpgrade()) {
return SocketState.UPGRADING;
} else {
- if (sendfileInProgress) {
+ if (sendfileData != null) {
return SocketState.SENDFILE;
} else {
if (openSocket) {
@@ -1775,9 +1767,9 @@ public class Http11Processor extends Abs
switch (socketWrapper.processSendfile(sendfileData)) {
case DONE:
// If sendfile is complete, no need to break keep-alive loop
+ sendfileData = null;
return false;
case PENDING:
- sendfileInProgress = true;
return true;
case ERROR:
// Write failed
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org