diff --git a/build/lua.m4 b/build/lua.m4 index d0288acfe4..5f1d5bf369 100644 --- a/build/lua.m4 +++ b/build/lua.m4 @@ -6,7 +6,7 @@ AC_DEFUN([CHECK_LUA], [dnl # Possible names for the lua library/package (pkg-config) -LUA_POSSIBLE_LIB_NAMES="lua lua53 lua5.3 lua52 lua5.2 lua51 lua5.1" +LUA_POSSIBLE_LIB_NAMES="lua lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1" # Possible extensions for the library LUA_POSSIBLE_EXTENSIONS="so so0 la sl dll dylib so.0.0.0" diff --git a/src/engine/lua.cc b/src/engine/lua.cc index 898d7cf38b..a16ac3dd41 100644 --- a/src/engine/lua.cc +++ b/src/engine/lua.cc @@ -371,26 +371,32 @@ int Lua::setvar(lua_State *L) { if (collection == "TX") { t->m_collections.m_tx_collection->storeOrUpdateFirst( - "TX:" + variableName, "", var_value); + variableName, + var_value); } else if (collection == "IP") { t->m_collections.m_ip_collection->storeOrUpdateFirst( - "IP:" + variableName, t->m_collections.m_ip_collection_key, + variableName, t->m_collections.m_ip_collection_key, + t->m_rules->m_secWebAppId.m_value, var_value); } else if (collection == "GLOBAL") { t->m_collections.m_global_collection->storeOrUpdateFirst( - "GLOBAL:" + variableName, t->m_collections.m_global_collection_key, + variableName, t->m_collections.m_global_collection_key, + t->m_rules->m_secWebAppId.m_value, var_value); } else if (collection == "RESOURCE") { t->m_collections.m_resource_collection->storeOrUpdateFirst( - "RESOURCE:" + variableName, - t->m_collections.m_resource_collection_key, var_value); + variableName, + t->m_collections.m_resource_collection_key, + t->m_rules->m_secWebAppId.m_value, + var_value); } else if (collection == "SESSION") { t->m_collections.m_session_collection->storeOrUpdateFirst( - "SESSION:" + variableName, t->m_collections.m_session_collection_key, + variableName, t->m_collections.m_session_collection_key, + t->m_rules->m_secWebAppId.m_value, var_value); }