You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jeff Trawick <tr...@gmail.com> on 2013/11/25 01:19:51 UTC
Re: svn commit: r1544876 - in /httpd/httpd/trunk/server/mpm:
event/event.c eventopt/eventopt.c
On Sat, Nov 23, 2013 at 3:29 PM, <ji...@apache.org> wrote:
> Author: jim
> Date: Sat Nov 23 20:29:55 2013
> New Revision: 1544876
>
> URL: http://svn.apache.org/r1544876
> Log:
> Just critically warn people... but keep pushing through.
>
> 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=1544876&r1=1544875&r2=1544876&view=diff
>
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/event/event.c (original)
> +++ httpd/httpd/trunk/server/mpm/event/event.c Sat Nov 23 20:29:55 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");
> - return HTTP_INTERNAL_SERVER_ERROR;
> + "atomics not working as expected - Event MPM may
> not work");
> + /* return HTTP_INTERNAL_SERVER_ERROR; */
>
I guess I like the old version better, however painful and untimely it
might have been to see it in action :)
> }
> 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=1544876&r1=1544875&r2=1544876&view=diff
>
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
> +++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Sat Nov 23 20:29:55
> 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");
> - return HTTP_INTERNAL_SERVER_ERROR;
> + "atomics not working as expected - EventOpt MPM
> may not work");
> + /* return HTTP_INTERNAL_SERVER_ERROR; */
> }
> rv = apr_pollset_create(&event_pollset, 1, plog,
> APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY);
>
>
>
--
Born in Roswell... married an alien...
http://emptyhammock.com/