Author: markt
Date: Fri Aug 12 07:47:44 2016
New Revision: 1756108
URL: http://svn.apache.org/viewvc?rev=1756108&view=rev
Log:
Provide default implementation to reduce duplication
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1756108&r1=1756107&r2=1756108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Aug 12
07:47:44 2016
@@ -589,7 +589,13 @@ public abstract class AbstractProcessor
protected abstract void populateSslRequestAttributes();
- protected abstract void sslReHandShake() ;
+ /**
+ * Processors that can perform a TLS re-handshake (e.g. HTTP/1.1) should
+ * override this method and implement the re-handshake.
+ */
+ protected void sslReHandShake() {
+ // NO-OP
+ }
protected abstract boolean isRequestBodyFullyRead();
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1756108&r1=1756107&r2=1756108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 12
07:47:44 2016
@@ -1270,13 +1270,6 @@ public class AjpProcessor extends Abstra
@Override
- protected final void sslReHandShake() {
- // NO-OP. Can't force a new SSL handshake with the client when using
- // AJP as the reverse proxy controls that connection.
- }
-
-
- @Override
protected final boolean isRequestBodyFullyRead() {
return endOfStream;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756108&r1=1756107&r2=1756108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12
07:47:44 2016
@@ -196,12 +196,6 @@ public class StreamProcessor extends Abs
@Override
- protected final void sslReHandShake() {
- // No re-negotiation support in HTTP/2.
- }
-
-
- @Override
protected final boolean isRequestBodyFullyRead() {
return stream.getInputBuffer().isRequestBodyFullyRead();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
