This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new a97f6b2 Back-port thread-safety fix from 8,5.x
a97f6b2 is described below
commit a97f6b281857b4572d73e7e5b681a8b75897a7b2
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 20 16:04:12 2020 +0100
Back-port thread-safety fix from 8,5.x
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 432d89a..c94fd7c 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1328,7 +1328,7 @@ public class AprEndpoint extends AbstractEndpoint<Long> {
// -------------------------------------------------- SocketList Inner
Class
public static class SocketList {
- protected int size;
+ protected volatile int size;
protected int pos;
protected long[] sockets;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2d40bae..ba9834a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -89,6 +89,10 @@
<code>ServletInputStream.available()</code> to provide a more accurate
return value, particularly when end of stream has been reached. (markt)
</fix>
+ <fix>
+ Fix a rare potential race condition when chekcing for timeouts with the
+ APR connector. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
