[asterisk-commits] kpfleming: trunk r58355 - in /trunk: ./ main/http.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Mar  8 07:27:02 2007
New Revision: 58355

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58355
Log:
Merged revisions 58354 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58354 | kpfleming | 2007-03-08 08:23:46 -0500 (Thu, 08 Mar 2007) | 2 lines

this change was not needed; fclose() handles closing the file descriptor already

........

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

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

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=58355&r1=58354&r2=58355
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Thu Mar  8 07:27:02 2007
@@ -634,9 +634,7 @@
 		free(title);
 
 done:
-	if (ser->f)
-		fclose(ser->f);
-	close(ser->fd);
+	fclose(ser->f);
 	free(ser);
 	return NULL;
 }