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:21 UTC
svn commit: r1654325 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Processor.java Http11AprProcessor.java
Http11Nio2Processor.java Http11NioProcessor.java
Author: markt
Date: Fri Jan 23 19:03:21 2015
New Revision: 1654325
URL: http://svn.apache.org/r1654325
Log:
Another unnecessary method now sendfileData has moved to the
AbstractHttp11Processor
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=1654325&r1=1654324&r2=1654325&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:21 2015
@@ -1206,8 +1206,7 @@ public abstract class AbstractHttp11Proc
http09 = false;
contentDelimitation = false;
expectation = false;
-
- prepareRequestInternal();
+ sendfileData = null;
if (endpoint.isSSLEnabled()) {
request.scheme().setString("https");
@@ -1386,12 +1385,6 @@ public abstract class AbstractHttp11Proc
/**
- * Connector implementation specific request preparation. Ideally, this will
- * go away in the future.
- */
- protected abstract void prepareRequestInternal();
-
- /**
* When committing the response, we have to validate the set of headers, as
* well as setup the response filters.
*/
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=1654325&r1=1654324&r2=1654325&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:21 2015
@@ -316,12 +316,6 @@ public class Http11AprProcessor extends
// ------------------------------------------------------ Protected Methods
-
- @Override
- protected void prepareRequestInternal() {
- sendfileData = null;
- }
-
@Override
protected boolean prepareSendfile(OutputFilter[] outputFilters) {
String fileName = (String) request.getAttribute(
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=1654325&r1=1654324&r2=1654325&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:21 2015
@@ -310,12 +310,6 @@ public class Http11Nio2Processor extends
// ------------------------------------------------------ Protected Methods
-
- @Override
- protected void prepareRequestInternal() {
- sendfileData = null;
- }
-
@Override
protected boolean prepareSendfile(OutputFilter[] outputFilters) {
String fileName = (String) request.getAttribute(
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=1654325&r1=1654324&r2=1654325&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:21 2015
@@ -276,12 +276,6 @@ public class Http11NioProcessor extends
// ------------------------------------------------------ Protected Methods
-
- @Override
- protected void prepareRequestInternal() {
- sendfileData = null;
- }
-
@Override
protected boolean prepareSendfile(OutputFilter[] outputFilters) {
String fileName = (String) request.getAttribute(
@@ -308,5 +302,4 @@ public class Http11NioProcessor extends
public void setSslSupport(SSLSupport sslSupport) {
this.sslSupport = sslSupport;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org