Author: markt
Date: Tue Oct 20 09:01:52 2015
New Revision: 1709548
URL: http://svn.apache.org/viewvc?rev=1709548&view=rev
Log:
clientCertProvider is only used by AJP
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.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=1709548&r1=1709547&r2=1709548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Oct 20
09:01:52 2015
@@ -45,7 +45,6 @@ public abstract class AbstractProcessor
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 abstract class AbstractProcessor
}
- @Override
- public String getClientCertProvider() {
- return clientCertProvider;
- }
-
-
- public void setClientCertProvider(String s) {
- this.clientCertProvider = s;
- }
-
-
/**
* Set the socket wrapper being used.
*/
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1709548&r1=1709547&r2=1709548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Tue Oct 20 09:01:52 2015
@@ -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);
/**
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=1709548&r1=1709547&r2=1709548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Oct 20
09:01:52 2015
@@ -243,6 +243,8 @@ public class AjpProcessor extends Abstra
private long bytesWritten = 0;
+
+
// ------------------------------------------------------------ Constructor
public AjpProcessor(int packetSize, AbstractEndpoint<?> endpoint) {
@@ -318,6 +320,19 @@ public class AjpProcessor extends Abstra
}
+ /**
+ * 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
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1709548&r1=1709547&r2=1709548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
Oct 20 09:01:52 2015
@@ -627,7 +627,6 @@ public abstract class AbstractHttp11Prot
processor.setRestrictedUserAgents(getRestrictedUserAgents());
processor.setMaxSavePostSize(getMaxSavePostSize());
processor.setServer(getServer());
- processor.setClientCertProvider(getClientCertProvider());
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1709548&r1=1709547&r2=1709548&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
Tue Oct 20 09:01:52 2015
@@ -100,12 +100,6 @@ public abstract class UpgradeProcessorBa
@Override
- public String getClientCertProvider() {
- return null;
- }
-
-
- @Override
public ByteBuffer getLeftoverInput() {
return null;
}
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=1709548&r1=1709547&r2=1709548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Oct 20
09:01:52 2015
@@ -369,7 +369,6 @@ public class StreamProcessor extends Abs
// is reused
setSocketWrapper(null);
setAdapter(null);
- setClientCertProvider(null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
