From e6ca0f1fab2b58eacb21227e16eb9c371507ef86 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 15 Feb 2006 00:38:27 +0000 Subject: Merged revisions 10021,10108 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r10108 | kpfleming | 2006-02-14 18:36:57 -0600 (Tue, 14 Feb 2006) | 2 lines ensure that FastAGI launcher can handle system call interruption (issue #6449) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10109 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_agi.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'res') diff --git a/res/res_agi.c b/res/res_agi.c index ef7576fcd..2b27e745d 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer * @@ -190,17 +190,23 @@ static int launch_netscript(char *agiurl, char *argv[], int *fds, int *efd, int close(s); return -1; } + pfds[0].fd = s; pfds[0].events = POLLOUT; - if (poll(pfds, 1, MAX_AGI_CONNECT) != 1) { - ast_log(LOG_WARNING, "Connect to '%s' failed!\n", agiurl); - close(s); - return -1; + while (poll(pfds, 1, MAX_AGI_CONNECT) != 1) { + if (errno != EINTR) { + ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno)); + close(s); + return -1; + } } - if (write(s, "agi_network: yes\n", strlen("agi_network: yes\n")) < 0) { - ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno)); - close(s); - return -1; + + while (write(s, "agi_network: yes\n", strlen("agi_network: yes\n")) < 0) { + if (errno != EINTR) { + ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno)); + close(s); + return -1; + } } /* If we have a script parameter, relay it to the fastagi server */ -- cgit v1.2.3