Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2014-11-05 16:26:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2014-10-25 08:32:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2014-11-05 16:26:45.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 31 16:04:15 UTC 2014 - [email protected] + +- httpd-event-deadlock.patch: Fix worker-listener + deadlock in graceful restart. + +------------------------------------------------------------------- New: ---- httpd-event-deadlock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.koHxXJ/_old 2014-11-05 16:26:46.000000000 +0100 +++ /var/tmp/diff_new_pack.koHxXJ/_new 2014-11-05 16:26:46.000000000 +0100 @@ -157,6 +157,7 @@ Patch68: httpd-2.x.x-logresolve.patch Patch69: httpd-2.2.x-bnc690734.patch Patch70: apache2-implicit-pointer-decl.patch +Patch71: httpd-event-deadlock.patch # PATCH-FEATURE-UPSTREAM apache2-mod_ssl_npn.patch [email protected] -- Add npn support to mod_ssl (needed for spdy) #Patch108: apache2-mod_ssl_npn.patch #Provides: apache2(mod_ssl+npn) @@ -338,6 +339,7 @@ %patch68 -p1 #%patch69 %patch70 -p1 +%patch71 -p1 #%patch108 -p1 %patch109 -p1 %patch111 -p1 ++++++ httpd-event-deadlock.patch ++++++ --- 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"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
