[tomcat] 01/02: Fix root cause of APR crash observed in unit tests on Windows

[markt]

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 c97838951cb16b1b44b5ebab8d1b4510f83d2654
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Nov 9 18:55:28 2021 +0000

    Fix root cause of APR crash observed in unit tests on Windows
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 4 ++--
 webapps/docs/changelog.xml                       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index eda0abf..4d157ce 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -676,10 +676,10 @@ public class AprEndpoint extends AbstractEndpoint<Long> 
implements SNICallBack {
         } catch (Error e) {
             if (Status.APR_STATUS_IS_EINVAL(e.getError())) {
                 log.info(sm.getString("endpoint.poll.limitedpollsize", "" + 
size));
-                return 0;
+                throw new RuntimeException(e);
             } else {
                 log.error(sm.getString("endpoint.poll.initfail"), e);
-                return -1;
+                throw new RuntimeException(e);
             }
         }
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57f8993..0e04aa4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,11 @@
         <pr>457</pr>: Add a <code>toString()</code> method to
         <code>MimeHeader</code> to aid debugging. (dblevins)
       </add>
+      <fix>
+        Do not ignore the error condition if the APR connector is not able to
+        open a sever socket as continuing in this case will trigger a JVM 
crash.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org