Commit 3acbc534 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

event no longer requires APR_POLLSET_THREADSAFE, or any 

other non-standard feature (all but OS/2 have APR_POLLSET_WAKEABLE)

config-foo: don't require thread-safe pollset in order to
            build event

event.c: don't stress APR_ENOTIMPL in apr_pollset_create errors;
         just give the standard "check system or user limits"
         message


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

server/mpm/event/config.m4

+0 −2
Changes for server/mpm/event/config.m4: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ elif test $ac_cv_define_APR_HAS_THREADS != yes; then 
    AC_MSG_RESULT(no - APR does not support threads)

elif test $have_threaded_sig_graceful != yes; then

    AC_MSG_RESULT(no - SIG_GRACEFUL cannot be used with a threaded MPM)

elif test $ac_cv_have_threadsafe_pollset != yes; then

    AC_MSG_RESULT(no - APR_POLLSET_THREADSAFE is not supported)

else

    AC_MSG_RESULT(yes)

    APACHE_MPM_SUPPORTED(event, yes, yes)

server/mpm/event/event.c

+2 −4
Changes for server/mpm/event/event.c: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ static void *APR_THREAD_FUNC start_threads(apr_thread_t * thd, void *dummy) 
                            pchild, APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY);

    if (rv != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,

                     "apr_pollset_create with Thread Safety failed.");

                     "apr_pollset_create failed; check system or user limits");

        clean_child_exit(APEXIT_CHILDFATAL);

    }
@@ -2866,9 +2866,7 @@ static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog, 
                                APR_POLLSET_WAKEABLE|APR_POLLSET_NOCOPY);

        if (rv != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,

                         "Couldn't create a suitable pollset. "

                         "Is it supported on your platform?"

                         "Also check system or user limits!");

                         "apr_pollset_create failed; check system or user limits");

            return HTTP_INTERNAL_SERVER_ERROR;

        }

        apr_pollset_destroy(event_pollset);