Bug 705365 - shorten the plugin hang timeout so that it is shorter than the main process hang timeout, presumptive-r=jimm feedback=asa
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 25 Nov 2011 22:48:53 -0500
changeset 81581 6f079f13c06a6f4d4c545e23d354d7966dd61e47
parent 81580 2729a78cd35e2f1644a8fe1ccd6122c7decb7cd3
child 81605 c58bad0b4640797f19541cc367d8ee0871457b71
push idunknown
push userunknown
push dateunknown
bugs705365
milestone11.0a1
Bug 705365 - shorten the plugin hang timeout so that it is shorter than the main process hang timeout, presumptive-r=jimm feedback=asa
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1477,24 +1477,24 @@ pref("hangmonitor.timeout", 30);
 #else
 pref("hangmonitor.timeout", 0);
 #endif
 #endif
 
 #ifndef DEBUG
 // How long a plugin is allowed to process a synchronous IPC message
 // before we consider it "hung".
-pref("dom.ipc.plugins.timeoutSecs", 45);
+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);
 // How long a plugin launch is allowed to take before
 // we consider it failed.
-pref("dom.ipc.plugins.processLaunchTimeoutSecs", 45);
+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);
 #endif
 
 // Disable oopp for standard java. They run their own process isolation (which