Commit 62e619b8 authored by Eric Covener's avatar Eric Covener
Browse files

don't let thread-scope be selected in a server w/o threads



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200977 13f79535-47bb-0310-9956-ffa450edef68
parent 384f9dd9
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -857,14 +857,23 @@ static const char *register_lua_scope(cmd_parms *cmd,
        cfg->vm_scope = AP_LUA_SCOPE_CONN;
    }
    else if (strcmp("thread", scope) == 0) {
#if !APR_HAS_THREADS
        return apr_psprintf(cmd->pool,
                            "Scope type of '%s' cannot be used because this "
                            "server does not have threading support "
                            "(APR_HAS_THREADS)" 
                            scope);
#endif
        cfg->vm_scope = AP_LUA_SCOPE_THREAD;
    }
    else {
        return apr_psprintf(cmd->pool,
                            "Invalid value for LuaScope, '%s', acceptable "
                            "values are 'once', 'request', 'conn', and "
                            "'server'",
                            scope);
                            "values are: 'once', 'request', 'conn', 'server'"
#if APR_HAS_THREADS
                            ", 'thread'"
#endif
                            ,scope);
    }
    return NULL;
}