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/01/23 20:03:37 UTC
svn commit: r1654328 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Processor.java Http11AprProcessor.java
Http11Nio2Processor.java Http11NioProcessor.java
Author: markt
Date: Fri Jan 23 19:03:37 2015
New Revision: 1654328
URL: http://svn.apache.org/r1654328
Log:
Pull up prepareSendfile()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1654328&r1=1654327&r2=1654328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri Jan 23 19:03:37 2015
@@ -1559,7 +1559,22 @@ public abstract class AbstractHttp11Proc
return connection.equals(Constants.CLOSE);
}
- abstract boolean prepareSendfile(OutputFilter[] outputFilters);
+ private boolean prepareSendfile(OutputFilter[] outputFilters) {
+ String fileName = (String) request.getAttribute(
+ org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
+ if (fileName != null) {
+ // No entity body sent here
+ getOutputBuffer().addActiveFilter(outputFilters[Constants.VOID_FILTER]);
+ contentDelimitation = true;
+ sendfileData = socketWrapper.createSendfileData(fileName,
+ ((Long) request.getAttribute(
+ org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR)).longValue(),
+ ((Long) request.getAttribute(
+ org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue() - sendfileData.pos);
+ return true;
+ }
+ return false;
+ }
/**
* Parse host.
@@ -1772,7 +1787,7 @@ public abstract class AbstractHttp11Proc
*
* @return true if the keep-alive loop should be broken
*/
- protected boolean breakKeepAliveLoop(SocketWrapperBase<S> socketWrapper) {
+ private boolean breakKeepAliveLoop(SocketWrapperBase<S> socketWrapper) {
openSocket = keepAlive;
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !getErrorState().isError()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1654328&r1=1654327&r2=1654328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Fri Jan 23 19:03:37 2015
@@ -312,25 +312,4 @@ public class Http11AprProcessor extends
}
}
}
-
-
- // ------------------------------------------------------ Protected Methods
-
- @Override
- protected boolean prepareSendfile(OutputFilter[] outputFilters) {
- String fileName = (String) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
- if (fileName != null) {
- // No entity body sent here
- getOutputBuffer().addActiveFilter(outputFilters[Constants.VOID_FILTER]);
- contentDelimitation = true;
- sendfileData = socketWrapper.createSendfileData(fileName,
- ((Long) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR)).longValue(),
- ((Long) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue() - sendfileData.pos);
- return true;
- }
- return false;
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1654328&r1=1654327&r2=1654328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Fri Jan 23 19:03:37 2015
@@ -310,24 +310,6 @@ public class Http11Nio2Processor extends
// ------------------------------------------------------ Protected Methods
- @Override
- protected boolean prepareSendfile(OutputFilter[] outputFilters) {
- String fileName = (String) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
- if (fileName != null) {
- // No entity body sent here
- getOutputBuffer().addActiveFilter(outputFilters[Constants.VOID_FILTER]);
- contentDelimitation = true;
- sendfileData = socketWrapper.createSendfileData(fileName,
- ((Long) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR)).longValue(),
- ((Long) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue() - sendfileData.pos);
- return true;
- }
- return false;
- }
-
/**
* Set the SSL information for this HTTP connection.
*/
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1654328&r1=1654327&r2=1654328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Fri Jan 23 19:03:37 2015
@@ -276,24 +276,6 @@ public class Http11NioProcessor extends
// ------------------------------------------------------ Protected Methods
- @Override
- protected boolean prepareSendfile(OutputFilter[] outputFilters) {
- String fileName = (String) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
- if (fileName != null) {
- // No entity body sent here
- getOutputBuffer().addActiveFilter(outputFilters[Constants.VOID_FILTER]);
- contentDelimitation = true;
- sendfileData = socketWrapper.createSendfileData(fileName,
- ((Long) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR)).longValue(),
- ((Long) request.getAttribute(
- org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue() - sendfileData.pos);
- return true;
- }
- return false;
- }
-
/**
* Set the SSL information for this HTTP connection.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org