diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java index 41154dafd42..597832c13ff 100644 --- a/java/org/apache/coyote/AbstractProcessor.java +++ b/java/org/apache/coyote/AbstractProcessor.java @@ -45,7 +45,6 @@ public abstract class AbstractProcessor extends AbstractProcessorLight implement protected final Response response; protected volatile SocketWrapperBase socketWrapper = null; protected volatile SSLSupport sslSupport; - private String clientCertProvider = null; /** * Error state for the request/response currently being processed. @@ -141,17 +140,6 @@ public Adapter getAdapter() { } - @Override - public String getClientCertProvider() { - return clientCertProvider; - } - - - public void setClientCertProvider(String s) { - this.clientCertProvider = s; - } - - /** * Set the socket wrapper being used. */ diff --git a/java/org/apache/coyote/Processor.java b/java/org/apache/coyote/Processor.java index 8094ac714d6..35cfea6c4f1 100644 --- a/java/org/apache/coyote/Processor.java +++ b/java/org/apache/coyote/Processor.java @@ -69,20 +69,6 @@ public interface Processor { */ void recycle(); - /** - * When client certificate information is presented in a form other than - * instances of {@link java.security.cert.X509Certificate} it needs to be - * converted before it can be used and this property controls which JSSE - * provider is used to perform the conversion. For example it is used with - * the AJP connectors, the HTTP APR connector and with the - * {@link org.apache.catalina.valves.SSLValve}. If not specified, the - * default provider will be used. - * - * @return The name of the JSSE provider to use for certificate - * transformation if required - */ - String getClientCertProvider(); - void setSslSupport(SSLSupport sslSupport); /** diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 103803781b9..cd14b246983 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -243,6 +243,8 @@ public class AjpProcessor extends AbstractProcessor { private long bytesWritten = 0; + + // ------------------------------------------------------------ Constructor public AjpProcessor(int packetSize, AbstractEndpoint endpoint) { @@ -318,6 +320,19 @@ public void setRequiredSecret(String requiredSecret) { } + /** + * When client certificate information is presented in a form other than + * instances of {@link java.security.cert.X509Certificate} it needs to be + * converted before it can be used and this property controls which JSSE + * provider is used to perform the conversion. + */ + private String clientCertProvider = null; + public String getClientCertProvider() { return clientCertProvider; } + public void setClientCertProvider(String clientCertProvider) { + this.clientCertProvider = clientCertProvider; + } + + // --------------------------------------------------------- Public Methods diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java index e4a03ce61b3..31457ca0dad 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java @@ -627,7 +627,6 @@ protected void configureProcessor(Http11Processor processor) { processor.setRestrictedUserAgents(getRestrictedUserAgents()); processor.setMaxSavePostSize(getMaxSavePostSize()); processor.setServer(getServer()); - processor.setClientCertProvider(getClientCertProvider()); } diff --git a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java index 5af65096b33..866b705acbe 100644 --- a/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java +++ b/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java @@ -99,12 +99,6 @@ public final Request getRequest() { } - @Override - public String getClientCertProvider() { - return null; - } - - @Override public ByteBuffer getLeftoverInput() { return null; diff --git a/java/org/apache/coyote/http2/StreamProcessor.java b/java/org/apache/coyote/http2/StreamProcessor.java index 493e51a66ef..cb05747f3d9 100644 --- a/java/org/apache/coyote/http2/StreamProcessor.java +++ b/java/org/apache/coyote/http2/StreamProcessor.java @@ -369,7 +369,6 @@ public void recycle() { // is reused setSocketWrapper(null); setAdapter(null); - setClientCertProvider(null); }