[svn-commits] twilson: branch 1.6.0 r165233 - in /branches/1.6.0: ./ res/res_phoneprov.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed Dec 17 14:00:11 2008
New Revision: 165233

URL: http://svn.digium.com/view/asterisk?view=rev&rev=165233
Log:
Merged revisions 165219 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r165219 | twilson | 2008-12-17 13:55:10 -0600 (Wed, 17 Dec 2008) | 2 lines
  
  Polycom phones close the connection after reading a little bit of the firmware files, we should stop sending in that case. Also, make that case print out a debug statement instead of a scary WARNING.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_phoneprov.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_phoneprov.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_phoneprov.c?view=diff&rev=165233&r1=165232&r2=165233
==============================================================================
--- branches/1.6.0/res/res_phoneprov.c (original)
+++ branches/1.6.0/res/res_phoneprov.c Wed Dec 17 14:00:11 2008
@@ -369,7 +369,12 @@
 		
 		while ((len = read(fd, buf, sizeof(buf))) > 0)
 			if (fwrite(buf, 1, len, ser->f) != len) {
-				ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+				if (errno != EPIPE) {
+					ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
+				} else {
+					ast_debug(3, "Requester closed the connection while downloading '%s'\n", path);
+				}
+				break;
 			}
 
 		close(fd);