mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
Merged revisions 58351-58352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58351 | kpfleming | 2007-03-08 08:17:17 -0500 (Thu, 08 Mar 2007) | 2 lines fix two cases where HTTP session file descriptors would not be closed ........ r58352 | kpfleming | 2007-03-08 08:17:42 -0500 (Thu, 08 Mar 2007) | 2 lines fix a compiler warning, and overwriting 'res' value ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -4708,7 +4708,7 @@ static int load_module(void)
|
||||
res |= load_config(0);
|
||||
|
||||
ast_cli_register_multiple(cli_meetme, ARRAY_LEN(cli_meetme));
|
||||
res = ast_manager_register("MeetmeMute", EVENT_FLAG_CALL,
|
||||
res |= ast_manager_register("MeetmeMute", EVENT_FLAG_CALL,
|
||||
action_meetmemute, "Mute a Meetme user");
|
||||
res |= ast_manager_register("MeetmeUnmute", EVENT_FLAG_CALL,
|
||||
action_meetmeunmute, "Unmute a Meetme user");
|
||||
|
@@ -636,6 +636,7 @@ static void *httpd_helper_thread(void *data)
|
||||
done:
|
||||
if (ser->f)
|
||||
fclose(ser->f);
|
||||
close(ser->fd);
|
||||
free(ser);
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user