1291N/AFrom 76e51a6343000165747b39228c0070bbbfa346ba Mon Sep 17 00:00:00 2001

1291N/AFrom: Arvind Umrao <arvind.umrao@oracle.com>

1291N/ADate: Tue, 8 May 2012 11:58:06 +0530

1291N/ASubject: [PATCH] 7162172

1291N/A

1291N/A---

1291N/A Xtranssock.c | 6 +++---

1291N/A 1 files changed, 3 insertions(+), 3 deletions(-)

1291N/A

1291N/Adiff --git Xtranssock.c Xtranssock.c

1291N/A--- Xtranssock.c

1291N/A+++ Xtranssock.c

1291N/A@@ -1770,7 +1770,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)

1291N/A * only affect one of a set of addresses.

1291N/A */

1291N/A

1291N/A- if (olderrno == ECONNREFUSED || olderrno == EINTR

1291N/A+ if (olderrno == ECONNREFUSED

1291N/A #if defined(IPv6) && defined(AF_INET6)

1291N/A || (((addrlist->addr->ai_next != NULL) ||

1291N/A (addrlist->addr != addrlist->firstaddr)) &&

1291N/A@@ -1783,7 +1783,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)

1291N/A #endif

1291N/A )

1291N/A res = TRANS_TRY_CONNECT_AGAIN;

1291N/A- else if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS)

1291N/A+ else if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS || olderrno == EINTR)

1291N/A res = TRANS_IN_PROGRESS;

1291N/A else

1291N/A {

1291N/A@@ -2092,7 +2092,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)

1291N/A if (olderrno == EWOULDBLOCK || olderrno == EINPROGRESS)

1291N/A return TRANS_IN_PROGRESS;

1291N/A else if (olderrno == EINTR)

1291N/A- return TRANS_TRY_CONNECT_AGAIN;

1291N/A+ return TRANS_IN_PROGRESS;

1291N/A else if (olderrno == ENOENT || olderrno == ECONNREFUSED) {

1291N/A /* If opening as abstract socket failed, try again normally */

1291N/A if (abstract) {

1291N/A1.7.3.2

1291N/A