kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 58351-58352 via svnmerge from

Browse Source 
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:
Kevin P. Fleming
2007-03-08 13:21:38 +00:00
parent 9266a6b8d8
commit 4a1a0993f2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_meetme.c
View File

@@ -4708,17 +4708,17 @@ static int load_module(void)
res |= load_config(0); res |= load_config(0);
ast_cli_register_multiple(cli_meetme, ARRAY_LEN(cli_meetme)); 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"); action_meetmemute, "Mute a Meetme user");
res |= ast_manager_register("MeetmeUnmute", EVENT_FLAG_CALL, res |= ast_manager_register("MeetmeUnmute", EVENT_FLAG_CALL,
action_meetmeunmute, "Unmute a Meetme user"); action_meetmeunmute, "Unmute a Meetme user");
res |= ast_register_application(app3, admin_exec, synopsis3, descrip3); res |= ast_register_application(app3, admin_exec, synopsis3, descrip3);
res |= ast_register_application(app2, count_exec, synopsis2, descrip2); res |= ast_register_application(app2, count_exec, synopsis2, descrip2);
res |= ast_register_application(app, conf_exec, synopsis, descrip); res |= ast_register_application(app, conf_exec, synopsis, descrip);
res |= ast_register_application(slastation_app, sla_station_exec, res |= ast_register_application(slastation_app, sla_station_exec,
slastation_synopsis, slastation_desc); slastation_synopsis, slastation_desc);
res |= ast_register_application(slatrunk_app, sla_trunk_exec, res |= ast_register_application(slatrunk_app, sla_trunk_exec,
slatrunk_synopsis, slatrunk_desc); slatrunk_synopsis, slatrunk_desc);
res |= ast_devstate_prov_add("Meetme", meetmestate); res |= ast_devstate_prov_add("Meetme", meetmestate);
res |= ast_devstate_prov_add("SLA", sla_state); res |= ast_devstate_prov_add("SLA", sla_state);

1
main/http.c
View File

@@ -636,6 +636,7 @@ static void *httpd_helper_thread(void *data)
done: done:
if (ser->f) if (ser->f)
fclose(ser->f); fclose(ser->f);
close(ser->fd);
free(ser); free(ser);
return NULL; return NULL;
} }