mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
fixes bug 268480 "###!!! ASSERTION: cannot set user:pass on no-auth url: 'Error', file r:/mozilla/netwerk/base/src/nsStandardURL.cpp, line 1121" r+sr=bzbarsky
This commit is contained in:
parent
4dc9eba112
commit
e3a8f35807
@ -1121,6 +1121,8 @@ nsStandardURL::SetUserPass(const nsACString &input)
|
||||
LOG(("nsStandardURL::SetUserPass [userpass=%s]\n", userpass.get()));
|
||||
|
||||
if (mURLType == URLTYPE_NO_AUTHORITY) {
|
||||
if (userpass.IsEmpty())
|
||||
return NS_OK;
|
||||
NS_ERROR("cannot set user:pass on no-auth url");
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
@ -1218,6 +1220,8 @@ nsStandardURL::SetUsername(const nsACString &input)
|
||||
LOG(("nsStandardURL::SetUsername [username=%s]\n", username.get()));
|
||||
|
||||
if (mURLType == URLTYPE_NO_AUTHORITY) {
|
||||
if (username.IsEmpty())
|
||||
return NS_OK;
|
||||
NS_ERROR("cannot set username on no-auth url");
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
@ -1261,6 +1265,8 @@ nsStandardURL::SetPassword(const nsACString &input)
|
||||
LOG(("nsStandardURL::SetPassword [password=%s]\n", password.get()));
|
||||
|
||||
if (mURLType == URLTYPE_NO_AUTHORITY) {
|
||||
if (password.IsEmpty())
|
||||
return NS_OK;
|
||||
NS_ERROR("cannot set password on no-auth url");
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
@ -1327,6 +1333,8 @@ nsStandardURL::SetHost(const nsACString &input)
|
||||
LOG(("nsStandardURL::SetHost [host=%s]\n", host));
|
||||
|
||||
if (mURLType == URLTYPE_NO_AUTHORITY) {
|
||||
if (flat.IsEmpty())
|
||||
return NS_OK;
|
||||
NS_ERROR("cannot set host on no-auth url");
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
@ -1388,6 +1396,11 @@ nsStandardURL::SetPort(PRInt32 port)
|
||||
if ((port == mPort) || (mPort == -1 && port == mDefaultPort))
|
||||
return NS_OK;
|
||||
|
||||
if (mURLType == URLTYPE_NO_AUTHORITY) {
|
||||
NS_ERROR("cannot set port on no-auth url");
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
|
||||
InvalidateCache();
|
||||
|
||||
if (mPort == -1) {
|
||||
|
Loading…
Reference in New Issue
Block a user