You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/11/25 02:32:53 UTC
svn commit: r1545130 - in /httpd/httpd/trunk/server/mpm: event/event.c
eventopt/eventopt.c
Author: jim
Date: Mon Nov 25 01:32:53 2013
New Revision: 1545130
URL: http://svn.apache.org/r1545130
Log:
revert 1544876
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/eventopt/eventopt.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=1545130&r1=1545129&r2=1545130&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Mon Nov 25 01:32:53 2013
@@ -3057,8 +3057,8 @@ static int event_pre_config(apr_pool_t *
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);
Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1545130&r1=1545129&r2=1545130&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Mon Nov 25 01:32:53 2013
@@ -3033,8 +3033,8 @@ static int event_pre_config(apr_pool_t *
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);