45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
diff -up ./nss/cmd/httpserv/httpserv.c.539183 ./nss/cmd/httpserv/httpserv.c
|
|
--- ./nss/cmd/httpserv/httpserv.c.539183 2015-11-08 21:12:59.000000000 -0800
|
|
+++ ./nss/cmd/httpserv/httpserv.c 2015-11-12 13:28:01.574855325 -0800
|
|
@@ -938,13 +938,13 @@ getBoundListenSocket(unsigned short port
|
|
PRNetAddr addr;
|
|
PRSocketOptionData opt;
|
|
|
|
- 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();
|
|
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
if (listen_sock == NULL) {
|
|
- errExit("PR_NewTCPSocket");
|
|
+ errExit("PR_OpenTCPSocket error");
|
|
}
|
|
|
|
opt.option = PR_SockOpt_Nonblocking;
|
|
diff -up ./nss/cmd/selfserv/selfserv.c.539183 ./nss/cmd/selfserv/selfserv.c
|
|
--- ./nss/cmd/selfserv/selfserv.c.539183 2015-11-08 21:12:59.000000000 -0800
|
|
+++ ./nss/cmd/selfserv/selfserv.c 2015-11-12 13:26:40.498345875 -0800
|
|
@@ -1707,13 +1707,13 @@ getBoundListenSocket(unsigned short port
|
|
PRNetAddr addr;
|
|
PRSocketOptionData opt;
|
|
|
|
- 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();
|
|
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
if (listen_sock == NULL) {
|
|
- errExit("PR_NewTCPSocket");
|
|
+ errExit("PR_OpenTCPSocket error");
|
|
}
|
|
|
|
opt.option = PR_SockOpt_Nonblocking;
|