3 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index ba8ecd13d..834ebdd31 100755
--- a/CHANGES
+++ b/CHANGES
@@ -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
diff --git a/channel.c b/channel.c
index d5fe12988..1ddfecf8d 100755
--- a/channel.c
+++ b/channel.c
@@ -1146,6 +1146,8 @@ char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd
 	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) {
diff --git a/file.c b/file.c
index a1a563c7a..a91edc2c6 100755
--- a/file.c
+++ b/file.c
@@ -1070,6 +1070,9 @@ char ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int
 			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) {