diff options
| author | cls%seawood.org <devnull@localhost> | 1999-09-12 01:09:31 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 1999-09-12 01:09:31 +0000 |
| commit | f9ceca4479b8a27e28bce060ddafa0596852b64a (patch) | |
| tree | fc6fc0e58f98d084b89d8ed14654d1c0d60cc9c4 | |
| parent | 90dcf45ae414f7c6dd3e72b4c2593b1af41f36be (diff) | |
| download | nspr-hg-unlabeled-3.19.22.tar.gz | |
Merged changes made to HEAD branch.unlabeled-3.19.22
| -rw-r--r-- | pr/src/io/prsocket.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pr/src/io/prsocket.c b/pr/src/io/prsocket.c index 548f9215..2f599d8a 100644 --- a/pr/src/io/prsocket.c +++ b/pr/src/io/prsocket.c @@ -1191,7 +1191,11 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto) } #ifdef HAVE_SOCKET_KEEPALIVE /* "Keep-alive" packets are specific to TCP. */ - if (domain == AF_INET && type == SOCK_STREAM) { + if ((domain == AF_INET +#if defined(_PR_INET6) + || domain == AF_INET6 +#endif + ) && type == SOCK_STREAM) { if (setsockopt(osfd, (int)SOL_SOCKET, SO_KEEPALIVE, #ifdef XP_OS2_VACPP (char *)&one, sizeof(one) ) < 0) { |