Merged revisions 82278 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 12 Sep 2007 15:12:52 +0000 (15:12 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 12 Sep 2007 15:12:52 +0000 (15:12 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82278 | russell | 2007-09-12 10:11:11 -0500 (Wed, 12 Sep 2007) | 3 lines

revert patch from issue #10553, as someone not using fastagi reported that this
broke their system.

........

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

res/res_agi.c

index d8bca50..01d3d6a 100644 (file)
@@ -1905,25 +1905,10 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi
                                ast_frfree(f);
                        }
                } else if (outfd > -1) {
-                       size_t len = sizeof(buf);
-                       size_t buflen = 0;
-
                        retry = AGI_NANDFS_RETRY;
                        buf[0] = '\0';
 
-                       while (buflen < (len - 1)) {
-                               fgets(buf + buflen, len, readf);
-                               if (feof(readf)) 
-                                       break;
-                               if (ferror(readf) && ((errno != EINTR) && (errno != EAGAIN))) 
-                                       break;
-                               buflen = strlen(buf);
-                               len -= buflen;
-                               if (agidebug)
-                                       ast_verbose( "AGI Rx << temp buffer %s - errno %s\n", buf, strerror(errno));
-                       }
-
-                       if (!buf[0]) {
+                       if (!fgets(buf, sizeof(buf), readf)) {
                                /* Program terminated */
                                if (returnstatus && returnstatus != AST_PBX_KEEPALIVE)
                                        returnstatus = -1;