revert 1544876

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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 0caa5920ea1a75eabd902f887c752a9789673b5d..9da5e6502233d2cffe4df463ee25b5596a9669a0 100644 (file)
--- 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 b2effab24efe8f51034743a73c44cec939d89e42..9c80e387204b3158975f160ade259200309894d8 100644 (file)
--- 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);