summaryrefslogtreecommitdiff
path: root/locks
diff options
context:
space:
mode:
authorbojan <bojan@13f79535-47bb-0310-9956-ffa450edef68>2009-06-26 05:49:57 +0000
committerbojan <bojan@13f79535-47bb-0310-9956-ffa450edef68>2009-06-26 05:49:57 +0000
commit69831d7637095609c6567f4d4f0f6c9b144f9347 (patch)
treed8ab907f06a5ed7d6b6c444e13f52f1af281c1bf /locks
parentab4cc4f54d306cd2f97227f24b2f195b74d3a1fd (diff)
downloadlibapr-69831d7637095609c6567f4d4f0f6c9b144f9347.tar.gz
Backport r788588 from the trunk.
Avoid proc mutex failures by checking for both EAGAIN and EWOULDBLOCK. Workaround for long standing Linux/hppa bug. Patch by Stefan Fritsch <sf sfritsch.de>. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@788590 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r--locks/unix/proc_mutex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index e433230a8..624f48b49 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -683,7 +683,7 @@ static apr_status_t proc_mutex_flock_tryacquire(apr_proc_mutex_t *mutex)
rc = flock(mutex->interproc->filedes, LOCK_EX | LOCK_NB);
} while (rc < 0 && errno == EINTR);
if (rc < 0) {
- if (errno == EWOULDBLOCK) {
+ if (errno == EWOULDBLOCK || errno == EAGAIN) {
return APR_EBUSY;
}
return errno;