Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1733176 - in /httpd/httpd/trunk/server/mpm:
 motorz/motorz.c
 simple/simple_api.c
Date: Tue, 01 Mar 2016 22:33:24 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20160301223324.586EF3A024F@svn01-us-west.apache.org>

Author: ylavic
Date: Tue Mar  1 22:33:24 2016
New Revision: 1733176

URL: http://svn.apache.org/viewvc?rev=1733176&view=rev
Log:
mpms: follow up to r1629925: more error reports.
motorz and simple cases (not in 2.4.x, for now).

Modified:
    httpd/httpd/trunk/server/mpm/motorz/motorz.c
    httpd/httpd/trunk/server/mpm/simple/simple_api.c

Modified: httpd/httpd/trunk/server/mpm/motorz/motorz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/motorz.c?rev=1733176&r1=1733175&r2=1733176&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/motorz.c (original)
+++ httpd/httpd/trunk/server/mpm/motorz/motorz.c Tue Mar  1 22:33:24 2016
@@ -1536,7 +1536,7 @@ static int motorz_open_logs(apr_pool_t *
         ap_log_error(APLOG_MARK, APLOG_ALERT | level_flags, 0,
                      (startup ? NULL : s), APLOGNO(03275)
                      "no listening sockets available, shutting down");
-        return DONE;
+        return !OK;
     }
 
     if (one_process) {
@@ -1551,7 +1551,7 @@ static int motorz_open_logs(apr_pool_t *
         ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
                      (startup ? NULL : s), APLOGNO(03276)
                      "could not duplicate listeners");
-        return DONE;
+        return !OK;
     }
     all_buckets = apr_pcalloc(pconf, num_buckets *
                                      sizeof(motorz_child_bucket));
@@ -1560,7 +1560,7 @@ static int motorz_open_logs(apr_pool_t *
             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
                          (startup ? NULL : s), APLOGNO(03277)
                          "could not open pipe-of-death");
-            return DONE;
+            return !OK;
         }
         /* Initialize cross-process accept lock (safe accept needed only) */
         if ((rv = SAFE_ACCEPT((apr_snprintf(id, sizeof id, "%i", i),
@@ -1570,7 +1570,7 @@ static int motorz_open_logs(apr_pool_t *
             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
                          (startup ? NULL : s), APLOGNO(03278)
                          "could not create accept mutex");
-            return DONE;
+            return !OK;
         }
         all_buckets[i].listeners = listen_buckets[i];
     }

Modified: httpd/httpd/trunk/server/mpm/simple/simple_api.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_api.c?rev=1733176&r1=1733175&r2=1733176&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_api.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_api.c Tue Mar  1 22:33:24 2016
@@ -115,7 +115,7 @@ simple_open_logs(apr_pool_t * p,
         ap_log_error(APLOG_MARK, APLOG_ALERT, 0,
                      s, APLOGNO(00256)
                      "simple_open_logs: no listening sockets available, shutting down");
-        return DONE;
+        return !OK;
     }
 
     return OK;