You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/03/01 23:02:15 UTC
svn commit: r1733162 - in /httpd/httpd/trunk/server/mpm: event/event.c
prefork/prefork.c worker/worker.c
Author: ylavic
Date: Tue Mar 1 22:02:14 2016
New Revision: 1733162
URL: http://svn.apache.org/viewvc?rev=1733162&view=rev
Log:
mpms: follow up to r1629925: more error reports.
We want to be able to distinguish errors from stops to exit() with non-zero.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1733162&r1=1733161&r2=1733162&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Tue Mar 1 22:02:14 2016
@@ -3360,7 +3360,7 @@ static int event_open_logs(apr_pool_t *
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03273)
"could not duplicate listeners");
- return DONE;
+ return !OK;
}
all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
@@ -3370,7 +3370,7 @@ static int event_open_logs(apr_pool_t *
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03274)
"could not open pipe-of-death");
- return DONE;
+ return !OK;
}
all_buckets[i].listeners = listen_buckets[i];
}
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1733162&r1=1733161&r2=1733162&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Tue Mar 1 22:02:14 2016
@@ -1323,7 +1323,7 @@ static int prefork_open_logs(apr_pool_t
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03280)
"could not duplicate listeners");
- return DONE;
+ return !OK;
}
all_buckets = apr_pcalloc(pconf, num_buckets *
sizeof(prefork_child_bucket));
@@ -1332,7 +1332,7 @@ static int prefork_open_logs(apr_pool_t
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03281)
"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),
@@ -1342,7 +1342,7 @@ static int prefork_open_logs(apr_pool_t
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03282)
"could not create accept mutex");
- return DONE;
+ return !OK;
}
all_buckets[i].listeners = listen_buckets[i];
}
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1733162&r1=1733161&r2=1733162&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Tue Mar 1 22:02:14 2016
@@ -2048,7 +2048,7 @@ static int worker_open_logs(apr_pool_t *
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03291)
"could not duplicate listeners");
- return DONE;
+ return !OK;
}
all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
@@ -2058,7 +2058,7 @@ static int worker_open_logs(apr_pool_t *
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03292)
"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),
@@ -2068,7 +2068,7 @@ static int worker_open_logs(apr_pool_t *
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03293)
"could not create accept mutex");
- return DONE;
+ return !OK;
}
all_buckets[i].listeners = listen_buckets[i];
}