☠☠ backed out by 86d9fdfe93b3 ☠ ☠ | |
author | Josh Matthews <josh@joshmatthews.net> |
Thu, 10 Jan 2013 21:58:52 +0100 | |
changeset 118463 | 4fb3f83287fb7ebbe315985dc7a9d09641a686dc |
parent 118462 | b99c87fb77d33c6bb40262680a7b86aabf71cfd1 |
child 118464 | d932f2172ce2dbbea666c9612d78833ffcdcfba0 |
push id | 24166 |
push user | Ms2ger@gmail.com |
push date | Fri, 11 Jan 2013 13:57:41 +0000 |
treeherder | mozilla-central@63c4b0f66a0c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jduell |
bugs | 829043 |
milestone | 21.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
netwerk/protocol/ftp/FTPChannelParent.cpp | file | annotate | diff | comparison | revisions | |
netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp | file | annotate | diff | comparison | revisions |
--- a/netwerk/protocol/ftp/FTPChannelParent.cpp +++ b/netwerk/protocol/ftp/FTPChannelParent.cpp @@ -88,16 +88,20 @@ FTPChannelParent::RecvAsyncOpen(const UR return SendFailedAsyncOpen(rv); mChannel = static_cast<nsFtpChannel*>(chan.get()); if (mPBOverride != kPBOverride_Unset) { mChannel->SetPrivate(mPBOverride == kPBOverride_Private ? true : false); } + rv = mChannel->SetNotificationCallbacks(this); + if (NS_FAILED(rv)) + return SendFailedAsyncOpen(rv); + nsCOMPtr<nsIInputStream> upload = DeserializeInputStream(aUploadStream); if (upload) { // contentType and contentLength are ignored rv = mChannel->SetUploadStream(upload, EmptyCString(), 0); if (NS_FAILED(rv)) return SendFailedAsyncOpen(rv); }
--- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp +++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp @@ -117,16 +117,20 @@ WyciwygChannelParent::RecvAsyncOpen(cons } if (!mLoadContext && loadContext.IsPrivateBitValid()) { nsCOMPtr<nsIPrivateBrowsingChannel> pbChannel = do_QueryInterface(mChannel); if (pbChannel) pbChannel->SetPrivate(loadContext.mUsePrivateBrowsing); } + rv = mChannel->SetNotificationCallbacks(this); + if (NS_FAILED(rv)) + return SendCancelEarly(rv); + rv = mChannel->AsyncOpen(this, nullptr); if (NS_FAILED(rv)) return SendCancelEarly(rv); return true; } bool