corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 4 changesets (bug 1660970, bug 1525854, bug 1663657, bug 1645108) for perma failures on test_trr_additional_section.js. CLOSED TREE

Browse Source 
Backed out changeset ad6c2e8af09b (bug 1663657)
Backed out changeset 419e26e3f452 (bug 1525854)
Backed out changeset 55bf856faf33 (bug 1660970)
Backed out changeset c543a3a008fa (bug 1645108)
This commit is contained in:
Razvan Maries
2020-09-15 02:35:05 +03:00
parent 81a9188e26
commit 287a69b58e
29 changed files with 146 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netwerk/protocol/ftp/nsFtpConnectionThread.cpp
View File

@@ -1219,9 +1219,9 @@ nsresult nsFtpState::S_pasv() {
if (sTrans) {
nsresult rv = sTrans->GetPeerAddr(&mServerAddress);
if (NS_SUCCEEDED(rv)) {
if (!mServerAddress.IsIPAddrAny())
if (!IsIPAddrAny(&mServerAddress))
mServerIsIPv6 = (mServerAddress.raw.family == AF_INET6) &&
!mServerAddress.IsIPAddrV4Mapped();
!IsIPAddrV4Mapped(&mServerAddress);
else {
/*
* In case of SOCKS5 remote DNS resolution, we do
@@ -1234,7 +1234,7 @@ nsresult nsFtpState::S_pasv() {
rv = sTrans->GetSelfAddr(&selfAddress);
if (NS_SUCCEEDED(rv))
mServerIsIPv6 = (selfAddress.raw.family == AF_INET6) &&
!selfAddress.IsIPAddrV4Mapped();
!IsIPAddrV4Mapped(&selfAddress);
}
}
}
@@ -1351,9 +1351,9 @@ nsFtpState::R_pasv() {
nsCOMPtr<nsISocketTransport> strans;
nsAutoCString host;
if (!mServerAddress.IsIPAddrAny()) {
if (!IsIPAddrAny(&mServerAddress)) {
char buf[kIPv6CStrBufSize];
mServerAddress.ToStringBuffer(buf, sizeof(buf));
NetAddrToString(&mServerAddress, buf, sizeof(buf));
host.Assign(buf);
} else {
/*