Bugzilla bug #51406: PR_GetConnectStatus should not invoke the new
authorwtc%netscape.com
Sun, 10 Dec 2000 02:33:59 +0000
changeset 1630 98b647e4b06041838825c82232e3ed6d84a26e2a
parent 1628 08dd9bd6d6379e01464e66118d19bddf14942060
child 1631 cbc912013c80bc7f69c89da2b26650000f1307b9
push idunknown
push userunknown
push dateunknown
bugs51406
Bugzilla bug #51406: PR_GetConnectStatus should not invoke the new 'connectcontinue' method, which is not present in the PRIOMethods table of NSPR 4.0. Modified Files: prsocket.c ptio.c
pr/src/io/prsocket.c
pr/src/pthreads/ptio.c
--- a/pr/src/io/prsocket.c
+++ b/pr/src/io/prsocket.c
@@ -374,17 +374,17 @@ PR_IMPLEMENT(PRStatus) PR_GetConnectStat
 {
     /* Find the NSPR layer and invoke its connectcontinue method */
     PRFileDesc *bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
 
     if (NULL == bottom) {
         PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
         return PR_FAILURE;
     }
-    return bottom->methods->connectcontinue(bottom, pd->out_flags);
+    return SocketConnectContinue(bottom, pd->out_flags);
 }
 
 static PRFileDesc* PR_CALLBACK SocketAccept(PRFileDesc *fd, PRNetAddr *addr,
 PRIntervalTime timeout)
 {
 	PRInt32 osfd;
 	PRFileDesc *fd2;
 	PRUint32 al;
--- a/pr/src/pthreads/ptio.c
+++ b/pr/src/pthreads/ptio.c
@@ -1398,17 +1398,17 @@ PR_IMPLEMENT(PRStatus) PR_GetConnectStat
     /* Find the NSPR layer and invoke its connectcontinue method */
     PRFileDesc *bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
 
     if (NULL == bottom)
     {
         PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
         return PR_FAILURE;
     }
-    return bottom->methods->connectcontinue(bottom, pd->out_flags);
+    return pt_ConnectContinue(bottom, pd->out_flags);
 }  /* PR_GetConnectStatus */
 
 static PRFileDesc* pt_Accept(
     PRFileDesc *fd, PRNetAddr *addr, PRIntervalTime timeout)
 {
     PRFileDesc *newfd = NULL;
     PRIntn syserrno, osfd = -1;
     pt_SockLen addr_len = sizeof(PRNetAddr);