You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by aa...@apache.org on 2002/04/28 05:20:06 UTC
cvs commit: httpd-2.0/server/mpm/worker fdqueue.c
aaron 02/04/27 20:20:06
Modified: server/mpm/worker fdqueue.c
Log:
Preserve the original error, or if the unlock fails then use that
error instead.
Obtained from: Justin Erenkrantz
Submitted by: Aaron Bannert
Revision Changes Path
1.17 +4 -3 httpd-2.0/server/mpm/worker/fdqueue.c
Index: fdqueue.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/worker/fdqueue.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fdqueue.c 28 Apr 2002 01:45:00 -0000 1.16
+++ fdqueue.c 28 Apr 2002 03:20:06 -0000 1.17
@@ -130,9 +130,10 @@
rv = apr_thread_cond_wait(queue_info->wait_for_idler,
queue_info->idlers_mutex);
if (rv != APR_SUCCESS) {
- rv = apr_thread_mutex_unlock(queue_info->idlers_mutex);
- if (rv != APR_SUCCESS) {
- return rv;
+ apr_status_t rv2;
+ rv2 = apr_thread_mutex_unlock(queue_info->idlers_mutex);
+ if (rv2 != APR_SUCCESS) {
+ return rv2;
}
return rv;
}