Merge r1920113 from trunk:

Use APR_TIMEUP for ETIMEDOUT too

... in apr_proc_mutex_timedlock().

Related to PR53906

AIX manpage:

       ETIMEDOUT
            The time specified by the Timeout parameter expired before the requested operations could be completed.

 (no EAGAIN)




git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1920114 13f79535-47bb-0310-9956-ffa450edef68

CHANGES

@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.8.0
 
+  *) apr_proc_mutex_timedlock() should return APR_TIMEUP on systems
+     where semtimedop() returns ETIMEDOUT rather than
+     EAGAIN. Likely AIX-only. [Eric Covener]
+
   *) apr_getopt: Fix error message. The "-" is the invalid character, not
      the empty string. [Daniel Sahlberg]
 

locks/unix/proc_mutex.c

@@ -396,7 +396,7 @@ static apr_status_t proc_mutex_sysv_timedacquire(apr_proc_mutex_t *mutex,
                             &reltime);
         } while (rc < 0 && errno == EINTR);
         if (rc < 0) {
-            if (errno == EAGAIN) {
+            if (errno == EAGAIN || errno == ETIMEDOUT) {
                 return APR_TIMEUP;
             }
             return errno;