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.

     1

     2

#include <lua.h>

     3

#include <lauxlib.h>

     4

     5

     6

static int lc_xpcall (lua_State *L) {

     7

  int ret;

     8

  int n_arg = lua_gettop(L);

     9

  /* f, msgh, p1, p2... */

    10

  luaL_argcheck(L, n_arg >= 2, 2, "value expected");

    11

  lua_pushvalue(L, 1);  /* f to top */

    12

  lua_pushvalue(L, 2);  /* msgh to top */

    13

  lua_replace(L, 1); /* msgh to 1 */

    14

  lua_replace(L, 2); /* f to 2 */

    15

  /* msgh, f, p1, p2... */

    16

  ret = lua_pcall(L, n_arg - 2, LUA_MULTRET, 1);

    17

  lua_pushboolean(L, ret == 0);

    18

  lua_replace(L, 1);

    19

  return lua_gettop(L);

    20

}

    21

    22

int luaopen_util_compat(lua_State *L) {

    23

	lua_createtable(L, 0, 2);

    24

	{

    25

		lua_pushcfunction(L, lc_xpcall);

    26

		lua_setfield(L, -2, "xpcall");

    27

	}

    28

	return 1;

    29

}