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
The following commit(s) were added to refs/heads/8.5.x by this push:
new defad3a Fix copy/paste error. Fix backport.
defad3a is described below
commit defad3a508c730c283bd550d644aac04ba03df20
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Feb 10 17:16:30 2022 +0000
Fix copy/paste error. Fix backport.
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 0c47367..8653707 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -110,7 +110,7 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
private int previousAcceptedPort = -1;
private String previousAcceptedAddress = null;
- private long previouspreviousAcceptedSocketNanoTime = 0;
+ private long previousAcceptedSocketNanoTime = 0;
@@ -780,13 +780,14 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
long currentNanoTime = System.nanoTime();
if (wrapper.getRemotePort() == previousAcceptedPort) {
if
(wrapper.getRemoteAddr().equals(previousAcceptedAddress)) {
- if (currentNanoTime -
previouspreviousAcceptedSocketNanoTime < 1000) {
+ if (currentNanoTime -
previousAcceptedSocketNanoTime < 1000) {
throw new
IOException(sm.getString("endpoint.err.duplicateAccept"));
}
}
}
previousAcceptedPort = wrapper.getRemotePort();
previousAcceptedAddress = wrapper.getRemoteAddr();
+ previousAcceptedSocketNanoTime = currentNanoTime;
}
wrapper.setKeepAliveLeft(getMaxKeepAliveRequests());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]