From b5edd2fd3a510ebf6b0843175bf2373a02cdd551 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 25 Nov 2013 01:32:53 +0000 Subject: [PATCH] revert 1544876 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545130 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/event/event.c | 4 ++-- server/mpm/eventopt/eventopt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 0caa5920ea1..9da5e650223 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -3057,8 +3057,8 @@ static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog, i = apr_atomic_dec32(&foo); if (i >= 0) { ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO(02405) - "atomics not working as expected - Event MPM may not work"); - /* return HTTP_INTERNAL_SERVER_ERROR; */ + "atomics not working as expected"); + return HTTP_INTERNAL_SERVER_ERROR; } rv = apr_pollset_create(&event_pollset, 1, plog, APR_POLLSET_THREADSAFE | APR_POLLSET_NOCOPY); diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c index b2effab24ef..9c80e387204 100644 --- a/server/mpm/eventopt/eventopt.c +++ b/server/mpm/eventopt/eventopt.c @@ -3033,8 +3033,8 @@ static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog, i = apr_atomic_dec32(&foo); if (i >= 0) { ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO(02406) - "atomics not working as expected - EventOpt MPM may not work"); - /* return HTTP_INTERNAL_SERVER_ERROR; */ + "atomics not working as expected"); + return HTTP_INTERNAL_SERVER_ERROR; } rv = apr_pollset_create(&event_pollset, 1, plog, APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY); -- 2.47.3