From 66fae1d81013a2321e7d607a426f834a01b847ce Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 18 Jul 2019 17:52:46 +0200 Subject: Implement a threadsafe & revised version of http2PushedStream. --- netwerk/protocol/http/nsHttpChannel.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'netwerk/protocol/http/nsHttpChannel.h') diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index 0038e1f71..defd710c3 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -126,7 +126,7 @@ public: const nsID& aChannelId, nsContentPolicyType aContentPolicyType) override; - nsresult OnPush(const nsACString &uri, Http2PushedStream *pushedStream); + nsresult OnPush(const nsACString &uri, Http2PushedStreamWrapper *pushedStream); static bool IsRedirectStatus(uint32_t status); @@ -448,7 +448,7 @@ private: nsresult OpenCacheInputStream(nsICacheEntry* cacheEntry, bool startBuffering, bool checkingAppCacheEntry); - void SetPushedStream(Http2PushedStream *stream); + void SetPushedStream(Http2PushedStreamWrapper *stream); void SetDoNotTrack(); @@ -578,9 +578,10 @@ private: nsTArray mRedirectFuncStack; // Needed for accurate DNS timing - RefPtr mDNSPrefetch; + RefPtr mDNSPrefetch; - Http2PushedStream *mPushedStream; + RefPtr mPushedStream; + // True if the channel's principal was found on a phishing, malware, or // tracking (if tracking protection is enabled) blocklist bool mLocalBlocklist; -- cgit v1.2.3 From 91de3341df7e08094e17a34053b8e21c89ab02a7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 21 Jul 2019 21:30:26 +0200 Subject: Revert "Implement a threadsafe & revised version of http2PushedStream." Backed out because of gcc build failures. This reverts commit 66fae1d81013a2321e7d607a426f834a01b847ce. --- netwerk/protocol/http/nsHttpChannel.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'netwerk/protocol/http/nsHttpChannel.h') diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index defd710c3..0038e1f71 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -126,7 +126,7 @@ public: const nsID& aChannelId, nsContentPolicyType aContentPolicyType) override; - nsresult OnPush(const nsACString &uri, Http2PushedStreamWrapper *pushedStream); + nsresult OnPush(const nsACString &uri, Http2PushedStream *pushedStream); static bool IsRedirectStatus(uint32_t status); @@ -448,7 +448,7 @@ private: nsresult OpenCacheInputStream(nsICacheEntry* cacheEntry, bool startBuffering, bool checkingAppCacheEntry); - void SetPushedStream(Http2PushedStreamWrapper *stream); + void SetPushedStream(Http2PushedStream *stream); void SetDoNotTrack(); @@ -578,10 +578,9 @@ private: nsTArray mRedirectFuncStack; // Needed for accurate DNS timing - RefPtr mDNSPrefetch; + RefPtr mDNSPrefetch; - RefPtr mPushedStream; - + Http2PushedStream *mPushedStream; // True if the channel's principal was found on a phishing, malware, or // tracking (if tracking protection is enabled) blocklist bool mLocalBlocklist; -- cgit v1.2.3 From 17a4b4f6db96b04a62e54146d637b0e10a80acfa Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 21 Jul 2019 23:05:59 +0200 Subject: Implement a threadsafe & revised version of http2PushedStream. This re-applies the patch for this with added typename declaration. --- netwerk/protocol/http/nsHttpChannel.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'netwerk/protocol/http/nsHttpChannel.h') diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index 0038e1f71..defd710c3 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -126,7 +126,7 @@ public: const nsID& aChannelId, nsContentPolicyType aContentPolicyType) override; - nsresult OnPush(const nsACString &uri, Http2PushedStream *pushedStream); + nsresult OnPush(const nsACString &uri, Http2PushedStreamWrapper *pushedStream); static bool IsRedirectStatus(uint32_t status); @@ -448,7 +448,7 @@ private: nsresult OpenCacheInputStream(nsICacheEntry* cacheEntry, bool startBuffering, bool checkingAppCacheEntry); - void SetPushedStream(Http2PushedStream *stream); + void SetPushedStream(Http2PushedStreamWrapper *stream); void SetDoNotTrack(); @@ -578,9 +578,10 @@ private: nsTArray mRedirectFuncStack; // Needed for accurate DNS timing - RefPtr mDNSPrefetch; + RefPtr mDNSPrefetch; - Http2PushedStream *mPushedStream; + RefPtr mPushedStream; + // True if the channel's principal was found on a phishing, malware, or // tracking (if tracking protection is enabled) blocklist bool mLocalBlocklist; -- cgit v1.2.3