[asterisk-commits] tilghman: branch 1.6.0 r114197 - in /branches/1.6.0: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Apr 17 07:59:59 2008
New Revision: 114197

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

................
r114196 | tilghman | 2008-04-17 07:59:04 -0500 (Thu, 17 Apr 2008) | 16 lines

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

........
r114195 | tilghman | 2008-04-17 07:56:38 -0500 (Thu, 17 Apr 2008) | 8 lines

Add special case for when the agi cannot be executed, to comply with the documentation that
we return failure in that case.
(closes issue #12462)
 Reported by: fmueller
 Patches: 
       20080416__bug12462.diff.txt uploaded by Corydon76 (license 14)
 Tested by: fmueller

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_agi.c

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

Modified: branches/1.6.0/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_agi.c?view=diff&rev=114197&r1=114196&r2=114197
==============================================================================
--- branches/1.6.0/res/res_agi.c (original)
+++ branches/1.6.0/res/res_agi.c Thu Apr 17 07:59:59 2008
@@ -714,6 +714,8 @@
 		execv(script, argv);
 		/* Can't use ast_log since FD's are closed */
 		fprintf(stdout, "verbose \"Failed to execute '%s': %s\" 2\n", script, strerror(errno));
+		/* Special case to set status of AGI to failure */
+		fprintf(stdout, "failure\n");
 		fflush(stdout);
 		_exit(1);
 	}
@@ -2668,6 +2670,12 @@
 				break;
 			}
 
+			/* Special case for inability to execute child process */
+			if (*buf && strncasecmp(buf, "failure", 7) == 0) {
+				returnstatus = AGI_RESULT_FAILURE;
+				break;
+			}
+
 			/* get rid of trailing newline, if any */
 			if (*buf && buf[strlen(buf) - 1] == '\n')
 				buf[strlen(buf) - 1] = 0;