diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:07:52 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:07:52 +0200 |
commit | 314fb761d144b160d3aeb72840c89e31c4f21a4a (patch) | |
tree | 0794190c7b9f541b3dced0b1f6b15979f447e3e5 /netwerk/protocol/http/HttpBaseChannel.cpp | |
parent | fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5 (diff) | |
parent | 2b9e0ca0bbea04fca6e0fd5079877d355f27c9b6 (diff) | |
download | UXP-2018.09.27.tar UXP-2018.09.27.tar.gz UXP-2018.09.27.tar.lz UXP-2018.09.27.tar.xz UXP-2018.09.27.zip |
Merge branch 'master' into Basilisk-releasev2018.09.27
Diffstat (limited to 'netwerk/protocol/http/HttpBaseChannel.cpp')
-rw-r--r-- | netwerk/protocol/http/HttpBaseChannel.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index c4e764d26..03123ceb0 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1665,13 +1665,7 @@ HttpBaseChannel::SetRequestHeader(const nsACString& aHeader, return NS_ERROR_INVALID_ARG; } - nsHttpAtom atom = nsHttp::ResolveAtom(flatHeader.get()); - if (!atom) { - NS_WARNING("failed to resolve atom"); - return NS_ERROR_NOT_AVAILABLE; - } - - return mRequestHead.SetHeader(atom, flatValue, aMerge); + return mRequestHead.SetHeader(aHeader, flatValue, aMerge); } NS_IMETHODIMP @@ -1688,13 +1682,7 @@ HttpBaseChannel::SetEmptyRequestHeader(const nsACString& aHeader) return NS_ERROR_INVALID_ARG; } - nsHttpAtom atom = nsHttp::ResolveAtom(flatHeader.get()); - if (!atom) { - NS_WARNING("failed to resolve atom"); - return NS_ERROR_NOT_AVAILABLE; - } - - return mRequestHead.SetEmptyHeader(atom); + return mRequestHead.SetEmptyHeader(aHeader); } NS_IMETHODIMP @@ -1750,7 +1738,7 @@ HttpBaseChannel::SetResponseHeader(const nsACString& header, mResponseHeadersModified = true; - return mResponseHead->SetHeader(atom, value, merge); + return mResponseHead->SetHeader(header, value, merge); } NS_IMETHODIMP |