This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fe36afd4df Remove deprecated code
fe36afd4df is described below
commit fe36afd4df187e7a6e5cffce8e9e63ad4119e848
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Feb 13 12:26:03 2023 +0000
Remove deprecated code
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 27 ----------------------
1 file changed, 27 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index d80053a0de..799f5460fe 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.net;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.NetworkInterface;
@@ -973,19 +972,6 @@ public abstract class AbstractEndpoint<S,U> {
public boolean getUseAsyncIO() { return useAsyncIO; }
- /**
- * Always returns {@code false}.
- *
- * @return Always {@code false}
- *
- * @deprecated This code will be removed in Tomcat 11 onwards
- */
- @Deprecated
- protected boolean getDeferAccept() {
- return false;
- }
-
-
/**
* The default behavior is to identify connectors uniquely with address
* and port. However, certain connectors are not using that and need
@@ -1206,19 +1192,6 @@ public abstract class AbstractEndpoint<S,U> {
getLog().debug("About to unlock socket for:" +
unlockAddress);
}
s.connect(unlockAddress,utmo);
- if (getDeferAccept()) {
- /*
- * In the case of a deferred accept / accept filters we
need to
- * send data to wake up the accept. Send OPTIONS * to
bypass
- * even BSD accept filters. The Acceptor will discard it.
- */
- OutputStreamWriter sw;
-
- sw = new OutputStreamWriter(s.getOutputStream(),
"ISO-8859-1");
- sw.write("OPTIONS * HTTP/1.0\r\n" +
- "User-Agent: Tomcat wakeup connection\r\n\r\n");
- sw.flush();
- }
if (getLog().isDebugEnabled()) {
getLog().debug("Socket unlock completed for:" +
unlockAddress);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
