[svn-commits] tilghman: branch 1.6.0 r115887 - in /branches/1.6.0: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue May 13 13:38:53 2008
New Revision: 115887

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

................
r115886 | tilghman | 2008-05-13 13:38:11 -0500 (Tue, 13 May 2008) | 11 lines

Merged revisions 115884 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115884 | tilghman | 2008-05-13 13:36:13 -0500 (Tue, 13 May 2008) | 3 lines

If the socket dies (read returns 0=EOF), return immediately.
(Closes issue #12637)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/asterisk.c

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

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=115887&r1=115886&r2=115887
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Tue May 13 13:38:53 2008
@@ -2440,7 +2440,7 @@
 			char buf[512] = "", *curline = buf, *nextline;
 			int not_written = 1;
 
-			if (read(ast_consock, buf, sizeof(buf) - 1) < 0) {
+			if (read(ast_consock, buf, sizeof(buf) - 1) <= 0) {
 				break;
 			}