[asterisk-commits] kpfleming: trunk r58353 - in /trunk: ./ apps/app_meetme.c main/http.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Mar  8 07:21:38 2007
New Revision: 58353

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58353
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c
    trunk/main/http.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=58353&r1=58352&r2=58353
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Mar  8 07:21:38 2007
@@ -4708,17 +4708,17 @@
 	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);

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=58353&r1=58352&r2=58353
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Thu Mar  8 07:21:38 2007
@@ -636,6 +636,7 @@
 done:
 	if (ser->f)
 		fclose(ser->f);
+	close(ser->fd);
 	free(ser);
 	return NULL;
 }