Bug 683967 - Disable child side aborts on parent hang. r=bsmedberg
authorJim Mathies <jmathies@mozilla.com>
Thu, 05 Jan 2012 06:47:41 -0600
changeset 83801 5413ba3ed406e2caa85af69d3ace66fd45ae8d27
parent 83800 4795500b7c1d62f7659c9cd2e0c26e8b7a705bd4
child 83802 8d341b0d890400c803281415dc0bccd0c687c52e
push id21794
push userjmathies@mozilla.com
push dateThu, 05 Jan 2012 12:48:14 +0000
treeherdermozilla-central@5413ba3ed406 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs683967
milestone12.0a1
first release with
nightly linux32
5413ba3ed406 / 12.0a1 / 20120105083933 / files
nightly linux64
5413ba3ed406 / 12.0a1 / 20120105083933 / files
nightly mac
5413ba3ed406 / 12.0a1 / 20120105083933 / files
nightly win32
5413ba3ed406 / 12.0a1 / 20120105083933 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 683967 - Disable child side aborts on parent hang. r=bsmedberg
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1482,18 +1482,18 @@ pref("hangmonitor.timeout", 0);
 pref("plugins.click_to_play", false);
 
 #ifndef DEBUG
 // How long a plugin is allowed to process a synchronous IPC message
 // before we consider it "hung".
 pref("dom.ipc.plugins.timeoutSecs", 25);
 // How long a plugin process will wait for a response from the parent
 // to a synchronous request before terminating itself. After this
-// point the child assumes the parent is hung.
-pref("dom.ipc.plugins.parentTimeoutSecs", 15);
+// point the child assumes the parent is hung. Currently disabled.
+pref("dom.ipc.plugins.parentTimeoutSecs", 0);
 // How long a plugin launch is allowed to take before
 // we consider it failed.
 pref("dom.ipc.plugins.processLaunchTimeoutSecs", 25);
 #else
 // No timeout in DEBUG builds
 pref("dom.ipc.plugins.timeoutSecs", 0);
 pref("dom.ipc.plugins.processLaunchTimeoutSecs", 0);
 pref("dom.ipc.plugins.parentTimeoutSecs", 0);