]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 165219 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Wed, 17 Dec 2008 20:00:11 +0000 (20:00 +0000)
committerTerry Wilson <twilson@digium.com>
Wed, 17 Dec 2008 20:00:11 +0000 (20:00 +0000)
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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165233 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_phoneprov.c

index ce7d10c71bc0edf23abe72f98532667322232101..2465a8c1038ec3d514e262d7781fa96ac8f46e1b 100644 (file)
@@ -369,7 +369,12 @@ static struct ast_str *phoneprov_callback(struct ast_tcptls_session_instance *se
                
                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);