[Asterisk-cvs] asterisk ChangeLog, 1.74.2.31, 1.74.2.32 channel.c, 1.139.2.5, 1.139.2.6 file.c, 1.51.2.2, 1.51.2.3

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv27786

Modified Files:
      Tag: v1-0
	ChangeLog channel.c file.c 
Log Message:
ignore interrupted system calls (bug #3831)


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.74.2.31
retrieving revision 1.74.2.32
diff -u -d -r1.74.2.31 -r1.74.2.32
--- ChangeLog	1 Apr 2005 02:49:21 -0000	1.74.2.31
+++ ChangeLog	1 Apr 2005 03:13:38 -0000	1.74.2.32
@@ -11,6 +11,9 @@
  -- chan_sip
     -- We no longer send a "to" tag on "100 Trying" messages, as it is inappropriate
        to do so.
+ -- res_agi
+    -- A fix has been added to prevent calls from being hung up when more than one
+       call is executing an AGI script calling the GET DATA command.
  -- asterisk.spec
     -- A line was missing for the autosupport script that caused "make rpm" to fail
  -- general

Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.139.2.5
retrieving revision 1.139.2.6
diff -u -d -r1.139.2.5 -r1.139.2.6
--- channel.c	22 Jan 2005 01:44:12 -0000	1.139.2.5
+++ channel.c	1 Apr 2005 03:13:38 -0000	1.139.2.6
@@ -1146,6 +1146,8 @@
 	while(ms) {
 		rchan = ast_waitfor_nandfds(&c, 1, &cmdfd, (cmdfd > -1) ? 1 : 0, NULL, &outfd, &ms);
 		if ((!rchan) && (outfd < 0) && (ms)) { 
+			if (errno == EINTR)
+				continue;
 			ast_log(LOG_WARNING, "Wait failed (%s)\n", strerror(errno));
 			return -1;
 		} else if (outfd > -1) {

Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -d -r1.51.2.2 -r1.51.2.3
--- file.c	7 Feb 2005 04:41:35 -0000	1.51.2.2
+++ file.c	1 Apr 2005 03:13:38 -0000	1.51.2.3
@@ -1070,6 +1070,9 @@
 			ms = 1000;
 		rchan = ast_waitfor_nandfds(&c, 1, &cmdfd, (cmdfd > -1) ? 1 : 0, NULL, &outfd, &ms);
 		if (!rchan && (outfd < 0) && (ms)) {
+			/* Continue */
+			if (errno == EINTR)
+				continue;
 			ast_log(LOG_WARNING, "Wait failed (%s)\n", strerror(errno));
 			return -1;
 		} else if (outfd > -1) {