summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfraser%netscape.com <devnull@localhost>2002-01-28 23:14:33 +0000
committersfraser%netscape.com <devnull@localhost>2002-01-28 23:14:33 +0000
commit23ac2c882483dc1f57b3b540bfa590de3c242ac3 (patch)
tree5ddfb8279606868aa1c0efbcf150bdab7eaceb54
parentabffd9be648d45fd2d8aed4dd5753db66e876250 (diff)
downloadnspr-hg-23ac2c882483dc1f57b3b540bfa590de3c242ac3.tar.gz
Fix blocker bug 121326 (any SSL transaction causes Mac to freeze) by checking in temporary patch from bug 106188; this reverts Mac to using blocking connects. r=wtc.
-rw-r--r--pr/src/io/prsocket.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/pr/src/io/prsocket.c b/pr/src/io/prsocket.c
index 217b6fd0..57aabf8a 100644
--- a/pr/src/io/prsocket.c
+++ b/pr/src/io/prsocket.c
@@ -347,11 +347,21 @@ static PRStatus PR_CALLBACK SocketConnectContinue(
#elif defined(XP_MAC)
+#if 0
err = _MD_mac_get_nonblocking_connect_error(osfd);
if (err == -1)
return PR_FAILURE;
else
return PR_SUCCESS;
+#else
+ if (out_flags & PR_POLL_EXCEPT) {
+ PR_SetError(PR_CONNECT_REFUSED_ERROR, 0);
+ return PR_FAILURE;
+ }
+
+ PR_ASSERT(out_flags & PR_POLL_WRITE);
+ return PR_SUCCESS;
+#endif
#elif defined(XP_BEOS)