httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1634526 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/mpm/event/event.c
Date Mon, 27 Oct 2014 12:46:45 GMT
Author: jim
Date: Mon Oct 27 12:46:45 2014
New Revision: 1634526

URL: http://svn.apache.org/r1634526
Log:
Merge r1629577 from trunk:

event: Fix worker-listener deadlock in graceful restart caused by get_worker()
allocating new worker after ap_queue_info_term(), but not setting the
have_idle_worker variable. PR 56960.

Submitted By: Zin UDA
Committed By: jkaluza

Submitted by: jkaluza
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/mpm/event/event.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1629577

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1634526&r1=1634525&r2=1634526&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Oct 27 12:46:45 2014
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.11
 
+  *) event: Fix worker-listener deadlock in graceful restart.
+     PR 56960.
+
   *) Concat strings at compile time when possible. PR 53741.
 
   *) mod_substitute: Restrict configuration in .htaccess to

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1634526&r1=1634525&r2=1634526&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 27 12:46:45 2014
@@ -102,13 +102,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * event: Fix worker-listener deadlock in graceful restart caused by
-     get_worker() allocating new worker after ap_queue_info_term(),
-     but not setting the have_idle_worker variable. PR 56960.
-     trunk patch: http://svn.apache.org/r1629577
-     2.4.x patch: trunk works
-     +1: jkaluza, ylavic, jim
-
    * mod_cache_socache: Add cache status to server-status.
      The status_hook simply calls the status function of
      socache, very much like mod_ssl does for the ssl

Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1634526&r1=1634525&r2=1634526&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/event/event.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/event/event.c Mon Oct 27 12:46:45 2014
@@ -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");



Mime
View raw message