From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 1 Mar 2016 22:33:24 +0000 (+0000)
Subject: mpms: follow up to r1629925: more error reports.
X-Git-Tag: 2.5.0-alpha~1973
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d8b9c1b2ed3d068687eb4ee8c55c19813595ae8;p=thirdparty%2Fapache%2Fhttpd.git

mpms: follow up to r1629925: more error reports.
motorz and simple cases (not in 2.4.x, for now).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733176 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c
index 2d77bf112cb..4d0eb70ab56 100644
--- a/server/mpm/motorz/motorz.c
+++ b/server/mpm/motorz/motorz.c
@@ -1536,7 +1536,7 @@ static int motorz_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
         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 *p, apr_pool_t *plog, apr_pool_t *ptemp,
         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 *p, apr_pool_t *plog, apr_pool_t *ptemp,
             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 *p, apr_pool_t *plog, apr_pool_t *ptemp,
             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];
     }
diff --git a/server/mpm/simple/simple_api.c b/server/mpm/simple/simple_api.c
index 8906db62643..5d019e1839b 100644
--- a/server/mpm/simple/simple_api.c
+++ b/server/mpm/simple/simple_api.c
@@ -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;