This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e63245d64e2bbe976c026115b49923b972831b1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 26 16:12:34 2020 +0100
socketWrapper.secure is no longer used
It is used in 7.0.x to trigger additional debug logging.
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 -
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 -
java/org/apache/tomcat/util/net/NioEndpoint.java | 1 -
java/org/apache/tomcat/util/net/SocketWrapperBase.java | 12 ++++++++++++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 9849417..8717d30 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -709,7 +709,6 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
}
AprSocketWrapper wrapper = new
AprSocketWrapper(Long.valueOf(socket), this);
wrapper.setKeepAliveLeft(getMaxKeepAliveRequests());
- wrapper.setSecure(isSSLEnabled());
wrapper.setReadTimeout(getConnectionTimeout());
wrapper.setWriteTimeout(getConnectionTimeout());
connections.put(Long.valueOf(socket), wrapper);
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 9719b1d..b28941c 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -321,7 +321,6 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel> {
socketWrapper.setReadTimeout(getSocketProperties().getSoTimeout());
socketWrapper.setWriteTimeout(getSocketProperties().getSoTimeout());
socketWrapper.setKeepAliveLeft(Nio2Endpoint.this.getMaxKeepAliveRequests());
- socketWrapper.setSecure(isSSLEnabled());
socketWrapper.setReadTimeout(getConnectionTimeout());
socketWrapper.setWriteTimeout(getConnectionTimeout());
// Continue processing on another thread
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index a50b721..a70faef 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -742,7 +742,6 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
ka.setReadTimeout(getSocketProperties().getSoTimeout());
ka.setWriteTimeout(getSocketProperties().getSoTimeout());
ka.setKeepAliveLeft(NioEndpoint.this.getMaxKeepAliveRequests());
- ka.setSecure(isSSLEnabled());
ka.setReadTimeout(getConnectionTimeout());
ka.setWriteTimeout(getConnectionTimeout());
PollerEvent r = eventCache.pop();
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 121293e..d044a47 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -165,7 +165,19 @@ public abstract class SocketWrapperBase<E> {
*/
@Deprecated
public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; }
+ /**
+ * @return {@code true} if the connection uses TLS
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ */
+ @Deprecated
public boolean isSecure() { return secure; }
+ /**
+ * @param secure {@code true} if the connection uses TLS
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ */
+ @Deprecated
public void setSecure(boolean secure) { this.secure = secure; }
public String getNegotiatedProtocol() { return negotiatedProtocol; }
public void setNegotiatedProtocol(String negotiatedProtocol) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
