summaryrefslogtreecommitdiffstats
path: root/xpcom/ds/nsObserverService.cpp
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
commitfbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /xpcom/ds/nsObserverService.cpp
parentReleasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
downloadfirefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz
firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom/ds/nsObserverService.cpp')
-rw-r--r--xpcom/ds/nsObserverService.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp
index e0fd430cd4..882d867474 100644
--- a/xpcom/ds/nsObserverService.cpp
+++ b/xpcom/ds/nsObserverService.cpp
@@ -180,13 +180,14 @@ nsresult nsObserverService::EnsureValidCall() const {
}
nsresult nsObserverService::FilterHttpOnTopics(const char* aTopic) {
- // Specifically allow http-on-opening-request and http-on-stop-request in the
- // child process; see bug 1269765.
+ // Specifically allow some http-on-* observer notifications in the child
+ // process.
if (mozilla::net::IsNeckoChild() && !strncmp(aTopic, "http-on-", 8) &&
+ strcmp(aTopic, "http-on-before-stop-request") &&
strcmp(aTopic, "http-on-failed-opening-request") &&
+ strcmp(aTopic, "http-on-image-cache-response") &&
strcmp(aTopic, "http-on-opening-request") &&
- strcmp(aTopic, "http-on-stop-request") &&
- strcmp(aTopic, "http-on-image-cache-response")) {
+ strcmp(aTopic, "http-on-stop-request")) {
nsCOMPtr<nsIConsoleService> console(
do_GetService(NS_CONSOLESERVICE_CONTRACTID));
nsCOMPtr<nsIScriptError> error(