5494e05306
- httpd-event-deadlock.patch: Fix worker-listener deadlock in graceful restart. OBS-URL: https://build.opensuse.org/request/show/259172 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=416
19 lines
695 B
Diff
19 lines
695 B
Diff
--- httpd-2.4.10.orig/server/mpm/event/event.c
|
|
+++ httpd-2.4.10/server/mpm/event/event.c
|
|
@@ -1271,13 +1271,13 @@ static void get_worker(int *have_idle_wo
|
|
else
|
|
rc = ap_queue_info_try_get_idler(worker_queue_info);
|
|
|
|
- if (rc == APR_SUCCESS) {
|
|
+ if (rc == APR_SUCCESS || APR_STATUS_IS_EOF(rc)) {
|
|
*have_idle_worker_p = 1;
|
|
}
|
|
else if (!blocking && rc == APR_EAGAIN) {
|
|
*all_busy = 1;
|
|
}
|
|
- else if (!APR_STATUS_IS_EOF(rc)) {
|
|
+ else {
|
|
ap_log_error(APLOG_MARK, APLOG_ERR, rc, ap_server_conf, APLOGNO(00472)
|
|
"ap_queue_info_wait_for_idler failed. "
|
|
"Attempting to shutdown process gracefully");
|