Author: markt
Date: Thu Oct 8 21:26:24 2015
New Revision: 1707622
URL: http://svn.apache.org/viewvc?rev=1707622&view=rev
Log:
Pull up sslSupport to the AbstractProcessor.
This removes the check for this being set for AJP but that check never detected
a bug
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.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=1707622&r1=1707621&r2=1707622&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Thu Oct 8
21:26:24 2015
@@ -26,6 +26,7 @@ import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -44,6 +45,7 @@ public abstract class AbstractProcessor
protected final Request request;
protected final Response response;
protected volatile SocketWrapperBase<?> socketWrapper = null;
+ protected volatile SSLSupport sslSupport;
private String clientCertProvider = null;
/**
@@ -168,6 +170,15 @@ public abstract class AbstractProcessor
/**
+ * Set the SSL information for this HTTP connection.
+ */
+ @Override
+ public final void setSslSupport(SSLSupport sslSupport) {
+ this.sslSupport = sslSupport;
+ }
+
+
+ /**
* Obtain the Executor used by the underlying endpoint.
*/
@Override
@@ -248,6 +259,14 @@ public abstract class AbstractProcessor
/**
+ * Perform any necessary processing for a non-blocking read before
+ * dispatching to the adapter.
+ */
+ protected void dispatchNonBlockingRead() {
+ asyncStateMachine.asyncOperation();
+ }
+
+ /**
* Flush any pending writes. Used during non-blocking writes to flush any
* remaining data from a previous incomplete write.
*
@@ -260,14 +279,6 @@ public abstract class AbstractProcessor
protected abstract boolean flushBufferedWrite() throws IOException ;
/**
- * Perform any necessary processing for a non-blocking read before
- * dispatching to the adapter.
- */
- protected void dispatchNonBlockingRead() {
- asyncStateMachine.asyncOperation();
- }
-
- /**
* Perform any necessary clean-up processing if the dispatch resulted in
the
* completion of processing for the current request.
*
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=1707622&r1=1707621&r2=1707622&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Oct 8
21:26:24 2015
@@ -790,16 +790,6 @@ public class AjpProcessor extends Abstra
@Override
- public void setSslSupport(SSLSupport sslSupport) {
- if (sslSupport != null) {
- // Should never reach this code but in case we do...
- throw new IllegalStateException(
- sm.getString("ajpprocessor.ssl.notsupported"));
- }
- }
-
-
- @Override
public HttpUpgradeHandler getHttpUpgradeHandler() {
// Should never reach this code but in case we do...
throw new IllegalStateException(
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1707622&r1=1707621&r2=1707622&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Thu Oct 8
21:26:24 2015
@@ -26,7 +26,6 @@ ajpprocessor.readtimeout=Timeout attempt
ajpprocessor.request.prepare=Error preparing request
ajpprocessor.request.process=Error processing request
ajpprocessor.certs.fail=Certificate conversion failed
-ajpprocessor.ssl.notsupported=The SSL protocol is not supported by this
connector
ajpprocessor.httpupgrade.notsupported=HTTP upgrade is not supported by the AJP
protocol
ajpmessage.null=Cannot append null value
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=1707622&r1=1707621&r2=1707622&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:26:24 2015
@@ -231,12 +231,6 @@ public class Http11Processor extends Abs
/**
- * SSL information.
- */
- protected SSLSupport sslSupport;
-
-
- /**
* UpgradeProtocol information
*/
private final Map<String,UpgradeProtocol> httpUpgradeProtocols;
@@ -628,15 +622,6 @@ public class Http11Processor extends Abs
}
- /**
- * Set the SSL information for this HTTP connection.
- */
- @Override
- public void setSslSupport(SSLSupport sslSupport) {
- this.sslSupport = sslSupport;
- }
-
-
/**
* Send an action to the connector.
*
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=1707622&r1=1707621&r2=1707622&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Thu Oct 8
21:26:24 2015
@@ -394,12 +394,6 @@ public class StreamProcessor extends Abs
@Override
- public void setSslSupport(SSLSupport sslSupport) {
- this.sslSupport = sslSupport;
- }
-
-
- @Override
public void recycle() {
// StreamProcessor instances are not re-used.
// Clear fields that can be cleared to aid GC and trigger NPEs if this
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
