From d0695db46ff2db845c290bc52cc498e59ce01a61 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 11 Nov 2011 17:38:11 +0000 Subject: [PATCH] Merge r1200977 from trunk: don't let thread-scope be selected in a server w/o threads Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200983 13f79535-47bb-0310-9956-ffa450edef68 --- modules/lua/mod_lua.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index 0ac434752e..b27006c377 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -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; } -- 2.40.0