63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
Index: ./mozilla/security/nss/cmd/httpserv/httpserv.c
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/security/nss/cmd/httpserv/httpserv.c,v
|
|
retrieving revision 1.1
|
|
diff -u -p -r1.1 httpserv.c
|
|
--- ./mozilla/security/nss/cmd/httpserv/httpserv.c 28 Jun 2012 11:11:06 -0000 1.1
|
|
+++ ./mozilla/security/nss/cmd/httpserv/httpserv.c 21 Oct 2012 22:22:10 -0000
|
|
@@ -661,14 +661,18 @@ getBoundListenSocket(unsigned short port
|
|
PRStatus prStatus;
|
|
PRNetAddr addr;
|
|
PRSocketOptionData opt;
|
|
+ PRUint16 socketDomain = PR_AF_INET;
|
|
|
|
- addr.inet.family = PR_AF_INET;
|
|
- addr.inet.ip = PR_INADDR_ANY;
|
|
- addr.inet.port = PR_htons(port);
|
|
+ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
|
|
+ errExit("PR_SetNetAddr");
|
|
+ }
|
|
|
|
- listen_sock = PR_NewTCPSocket();
|
|
+ if (PR_GetEnv("NSS_USE_SDP")) {
|
|
+ socketDomain = PR_AF_INET_SDP;
|
|
+ }
|
|
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
if (listen_sock == NULL) {
|
|
- errExit("PR_NewTCPSocket");
|
|
+ errExit("PR_OpenTCPSocket error");
|
|
}
|
|
|
|
opt.option = PR_SockOpt_Nonblocking;
|
|
Index: ./mozilla/security/nss/cmd/selfserv/selfserv.c
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/security/nss/cmd/selfserv/selfserv.c,v
|
|
retrieving revision 1.102
|
|
diff -u -p -r1.102 selfserv.c
|
|
--- ./mozilla/security/nss/cmd/selfserv/selfserv.c 27 Sep 2012 17:13:34 -0000 1.102
|
|
+++ ./mozilla/security/nss/cmd/selfserv/selfserv.c 21 Oct 2012 22:22:10 -0000
|
|
@@ -1483,14 +1483,18 @@ getBoundListenSocket(unsigned short port
|
|
PRStatus prStatus;
|
|
PRNetAddr addr;
|
|
PRSocketOptionData opt;
|
|
+ PRUint16 socketDomain = PR_AF_INET;
|
|
|
|
- addr.inet.family = PR_AF_INET;
|
|
- addr.inet.ip = PR_INADDR_ANY;
|
|
- addr.inet.port = PR_htons(port);
|
|
+ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
|
|
+ errExit("PR_SetNetAddr");
|
|
+ }
|
|
|
|
- listen_sock = PR_NewTCPSocket();
|
|
+ if (PR_GetEnv("NSS_USE_SDP")) {
|
|
+ socketDomain = PR_AF_INET_SDP;
|
|
+ }
|
|
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
if (listen_sock == NULL) {
|
|
- errExit("PR_NewTCPSocket");
|
|
+ errExit("PR_OpenTCPSocket error");
|
|
}
|
|
|
|
opt.option = PR_SockOpt_Nonblocking;
|