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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index cc69a13..5b77321 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4708,17 +4708,17 @@ 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, 
-               action_meetmemute, "Mute a Meetme user");
+       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");
+                                   action_meetmeunmute, "Unmute a Meetme user");
        res |= ast_register_application(app3, admin_exec, synopsis3, descrip3);
        res |= ast_register_application(app2, count_exec, synopsis2, descrip2);
        res |= ast_register_application(app, conf_exec, synopsis, descrip);
        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,
-               slatrunk_synopsis, slatrunk_desc);
+                                       slatrunk_synopsis, slatrunk_desc);
 
        res |= ast_devstate_prov_add("Meetme", meetmestate);
        res |= ast_devstate_prov_add("SLA", sla_state);

diff --git a/main/http.c b/main/http.c
index 97738b4..b6b2abe 100644 (file)
--- a/main/http.c
+++ b/main/http.c
@@ -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;
 }