automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31224 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_agi.c b/res/res_agi.c
index 14713fcc25cc1e20df6c86471517f58b44409774..ddfabb3574b090e5bce39f6d84963ff093d46345 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -140,6 +140,7 @@ static int launch_netscript(char *agiurl, char *argv[], int *fds, int *efd, int
        struct sockaddr_in sin;
        struct hostent *hp;
        struct ast_hostent ahp;
+       int res;
 
        host = ast_strdupa(agiurl + 6); /* Remove agi:// */
        if (!host)
@@ -192,9 +193,13 @@ static int launch_netscript(char *agiurl, char *argv[], int *fds, int *efd, int
 
        pfds[0].fd = s;
        pfds[0].events = POLLOUT;
-       while (poll(pfds, 1, MAX_AGI_CONNECT) != 1) {
+       while ((res = poll(pfds, 1, MAX_AGI_CONNECT)) != 1) {
                if (errno != EINTR) {
-                       ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno));
+                       if (!res) {
+                               ast_log(LOG_WARNING, "FastAGI connection to '%s' timed out after MAX_AGI_CONNECT (%d) milliseconds.\n",
+                                       agiurl, MAX_AGI_CONNECT);
+                       } else
+                               ast_log(LOG_WARNING, "Connect to '%s' failed: %s\n", agiurl, strerror(errno));
                        close(s);
                        return -1;
                }