mod_websocket: Fire pre-session-close event (fixes #1800)
This event was added in a7c183bb4e64 and is required to make mod_smacks know
that a session was intentionally closed and shouldn't be hibernated (see
fcea4d9e7502).
Because this was missing from mod_websocket's session.close(), mod_smacks
would always attempt to hibernate websocket sessions even if they closed
cleanly.
That mod_websocket has its own copy of session.close() is something to fix
another day (probably not in the stable branch). So for now this commit makes
the minimal change to get things working again.
Thanks to Damian and the Jitsi team for reporting.
/*
* This project is MIT licensed. Please see the
* COPYING file in the source package for more information.
*
* Copyright (C) 2016 Kim Alvefur
*/
#include <lua.h>
#include <lauxlib.h>
#if (LUA_VERSION_NUM == 501)
#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
#endif
/* TODO Deduplicate code somehow */
int strop_and(lua_State *L) {
luaL_Buffer buf;
size_t a, b, i;
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
}
for(i = 0; i < a; i++) {
luaL_addchar(&buf, str_a[i] & str_b[i % b]);
}
luaL_pushresult(&buf);
return 1;
}
int strop_or(lua_State *L) {
luaL_Buffer buf;
size_t a, b, i;
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
}
for(i = 0; i < a; i++) {
luaL_addchar(&buf, str_a[i] | str_b[i % b]);
}
luaL_pushresult(&buf);
return 1;
}
int strop_xor(lua_State *L) {
luaL_Buffer buf;
size_t a, b, i;
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
}
for(i = 0; i < a; i++) {
luaL_addchar(&buf, str_a[i] ^ str_b[i % b]);
}
luaL_pushresult(&buf);
return 1;
}
LUA_API int luaopen_util_strbitop(lua_State *L) {
luaL_Reg exports[] = {
{ "sand", strop_and },
{ "sor", strop_or },
{ "sxor", strop_xor },
{ NULL, NULL }
};
lua_newtable(L);
luaL_setfuncs(L, exports, 0);
return 1;
}