54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From 995115a24bb868d1204a796f5b3170f62618a6bb Mon Sep 17 00:00:00 2001
|
|
From: wang_yue111 <648774160@qq.com>
|
|
Date: Thu, 11 Mar 2021 18:35:41 +0800
|
|
Subject: [PATCH] SocketWrapper.upgraded is no longer used
|
|
|
|
It used to be used to determine if the processor should be recycled. It
|
|
has been replaced by a flag on the processor.
|
|
|
|
---
|
|
java/org/apache/coyote/AbstractProtocol.java | 2 --
|
|
.../apache/tomcat/util/net/SocketWrapperBase.java | 12 ++++++++++++
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
|
|
index 09ed0a9..9f83906 100644
|
|
--- a/java/org/apache/coyote/AbstractProtocol.java
|
|
+++ b/java/org/apache/coyote/AbstractProtocol.java
|
|
@@ -799,8 +799,6 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
|
|
processor, wrapper));
|
|
}
|
|
wrapper.unRead(leftOverInput);
|
|
- // Mark the connection as upgraded
|
|
- wrapper.setUpgraded(true);
|
|
// Associate with the processor with the connection
|
|
connections.put(socket, processor);
|
|
// Initialise the upgrade handler (which may trigger
|
|
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
|
|
index 2479d6d..f8a79db 100644
|
|
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
|
|
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
|
|
@@ -138,7 +138,19 @@ public abstract class SocketWrapperBase<E> {
|
|
}
|
|
}
|
|
|
|
+ /**
|
|
+ * @return {@code true} if the connection has been upgraded.
|
|
+ *
|
|
+ * @deprecated Unused. Will be removed in Tomcat 10.
|
|
+ */
|
|
+ @Deprecated
|
|
public boolean isUpgraded() { return upgraded; }
|
|
+ /**
|
|
+ * @param upgraded {@code true} if the connection has been upgraded.
|
|
+ *
|
|
+ * @deprecated Unused. Will be removed in Tomcat 10.
|
|
+ */
|
|
+ @Deprecated
|
|
public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; }
|
|
public boolean isSecure() { return secure; }
|
|
public void setSecure(boolean secure) { this.secure = secure; }
|
|
--
|
|
2.23.0
|
|
|