Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

landing patch for bug 205726 "DNS rewrite" r=dougt sr=bryner

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@146796 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2003-09-11 20:32:33 +00:00
parent 7d72508a46
commit f95b2ef09c
39 changed files with 2170 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
View File

@@ -1199,7 +1199,8 @@ static void InitNSSMethods()
}
nsresult
nsSSLIOLayerNewSocket(const char *host,
nsSSLIOLayerNewSocket(PRInt32 family,
const char *host,
PRInt32 port,
const char *proxyHost,
PRInt32 proxyPort,
@@ -1217,10 +1218,10 @@ nsSSLIOLayerNewSocket(const char *host,
firstTime = PR_FALSE;
}
PRFileDesc* sock = PR_OpenTCPSocket(PR_AF_INET6);
PRFileDesc* sock = PR_OpenTCPSocket(family);
if (!sock) return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = nsSSLIOLayerAddToSocket(host, port, proxyHost, proxyPort,
nsresult rv = nsSSLIOLayerAddToSocket(family, host, port, proxyHost, proxyPort,
sock, info, forSTARTTLS);
if (NS_FAILED(rv)) {
PR_Close(sock);
@@ -2326,7 +2327,8 @@ nsSSLIOLayerSetOptions(PRFileDesc *fd, PRBool forSTARTTLS,
}
nsresult
nsSSLIOLayerAddToSocket(const char* host,
nsSSLIOLayerAddToSocket(PRInt32 family,
const char* host,
PRInt32 port,
const char* proxyHost,
PRInt32 proxyPort,