You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/19 14:04:53 UTC
svn commit: r1821659 - /httpd/httpd/trunk/server/mpm_fdqueue.c
Author: ylavic
Date: Fri Jan 19 14:04:53 2018
New Revision: 1821659
URL: http://svn.apache.org/viewvc?rev=1821659&view=rev
Log:
mpm_fdqueue: follow up to r1821624.
Either error matters, simplify code.
Modified:
httpd/httpd/trunk/server/mpm_fdqueue.c
Modified: httpd/httpd/trunk/server/mpm_fdqueue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_fdqueue.c?rev=1821659&r1=1821658&r2=1821659&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_fdqueue.c (original)
+++ httpd/httpd/trunk/server/mpm_fdqueue.c Fri Jan 19 14:04:53 2018
@@ -188,12 +188,8 @@ apr_status_t ap_queue_info_wait_for_idle
rv = apr_thread_cond_wait(queue_info->wait_for_idler,
queue_info->idlers_mutex);
if (rv != APR_SUCCESS) {
- apr_status_t rv2;
AP_DEBUG_ASSERT(0);
- rv2 = apr_thread_mutex_unlock(queue_info->idlers_mutex);
- if (rv2 != APR_SUCCESS) {
- return rv2;
- }
+ apr_thread_mutex_unlock(queue_info->idlers_mutex);
return rv;
}
}