mirror of
https://github.com/classilla/tenfourfox.git
synced 2024-06-10 02:29:43 +00:00
#526: M1493347 M1487098 M1423278
This commit is contained in:
parent
ff9433ee7b
commit
4d34a54ce2
|
@ -164,7 +164,7 @@ NS_IMETHODIMP mozEnglishWordUtils::FindNextWord(const char16_t *word, uint32_t l
|
||||||
|
|
||||||
// before we spend more time looking to see if the word is a url, look for a url identifer
|
// before we spend more time looking to see if the word is a url, look for a url identifer
|
||||||
// and make sure that identifer isn't the last character in the word fragment.
|
// and make sure that identifer isn't the last character in the word fragment.
|
||||||
if ( (*p == ':' || *p == '@' || *p == '.') && p < endbuf - 1) {
|
if ((p < endbuf - 1) && (*p == ':' || *p == '@' || *p == '.')) {
|
||||||
|
|
||||||
// ok, we have a possible url...do more research to find out if we really have one
|
// ok, we have a possible url...do more research to find out if we really have one
|
||||||
// and determine the length of the url so we can skip over it.
|
// and determine the length of the url so we can skip over it.
|
||||||
|
|
|
@ -439,13 +439,11 @@ nsHttpChannelAuthProvider::PrepareForAuthentication(bool proxyAuth)
|
||||||
// We need to remove any Proxy_Authorization header left over from a
|
// We need to remove any Proxy_Authorization header left over from a
|
||||||
// non-request based authentication handshake (e.g., for NTLM auth).
|
// non-request based authentication handshake (e.g., for NTLM auth).
|
||||||
|
|
||||||
nsAutoCString contractId;
|
|
||||||
contractId.Assign(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
|
|
||||||
contractId.Append(mProxyAuthType);
|
|
||||||
|
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
nsCOMPtr<nsIHttpAuthenticator> precedingAuth =
|
nsCOMPtr<nsIHttpAuthenticator> precedingAuth;
|
||||||
do_GetService(contractId.get(), &rv);
|
nsCString proxyAuthType;
|
||||||
|
rv = GetAuthenticator(mProxyAuthType.get(), proxyAuthType,
|
||||||
|
getter_AddRefs(precedingAuth));
|
||||||
if (NS_FAILED(rv))
|
if (NS_FAILED(rv))
|
||||||
return rv;
|
return rv;
|
||||||
|
|
||||||
|
|
|
@ -232,6 +232,7 @@ DataChannelConnection::Destroy()
|
||||||
|
|
||||||
MOZ_ASSERT(mSTS);
|
MOZ_ASSERT(mSTS);
|
||||||
ASSERT_WEBRTC(NS_IsMainThread());
|
ASSERT_WEBRTC(NS_IsMainThread());
|
||||||
|
mListener = nullptr;
|
||||||
// Must do this in Destroy() since we may then delete this object.
|
// Must do this in Destroy() since we may then delete this object.
|
||||||
// Do this before dispatching to create a consistent ordering of calls to
|
// Do this before dispatching to create a consistent ordering of calls to
|
||||||
// the SCTP stack.
|
// the SCTP stack.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user