331 #define NS_CONTENTBLOCKER_CONTRACTID "@mozilla.org/permissions/contentblocker;1" |
331 #define NS_CONTENTBLOCKER_CONTRACTID "@mozilla.org/permissions/contentblocker;1" |
332 |
332 |
333 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js |
333 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js |
334 --- a/modules/libpref/src/init/all.js |
334 --- a/modules/libpref/src/init/all.js |
335 +++ b/modules/libpref/src/init/all.js |
335 +++ b/modules/libpref/src/init/all.js |
336 @@ -842,16 +842,17 @@ pref("network.automatic-ntlm-auth.truste |
336 @@ -853,16 +853,17 @@ pref("network.automatic-ntlm-auth.truste |
337 // response to a NTLM challenge. By default, this is disabled since servers |
337 // response to a NTLM challenge. By default, this is disabled since servers |
338 // should almost never need the LM hash, and the LM hash is what makes NTLM |
338 // should almost never need the LM hash, and the LM hash is what makes NTLM |
339 // authentication less secure. See bug 250691 for further details. |
339 // authentication less secure. See bug 250691 for further details. |
340 // NOTE: automatic-ntlm-auth which leverages the OS-provided NTLM |
340 // NOTE: automatic-ntlm-auth which leverages the OS-provided NTLM |
341 // implementation will not be affected by this preference. |
341 // implementation will not be affected by this preference. |
342 pref("network.ntlm.send-lm-response", false); |
342 pref("network.ntlm.send-lm-response", false); |
343 |
343 |
344 pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign |
344 pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign |
345 +pref("permissions.honorExceptions.image", true); |
345 +pref("permissions.honorExceptions.image", true); |
346 |
346 |
347 #ifndef XP_MACOSX |
|
348 #ifdef XP_UNIX |
|
349 pref("network.proxy.type", 5); |
347 pref("network.proxy.type", 5); |
350 #else |
348 |
351 pref("network.proxy.type", 0); |
349 pref("network.proxy.ftp", ""); |
352 #endif |
350 pref("network.proxy.ftp_port", 0); |
353 #else |
351 pref("network.proxy.gopher", ""); |
354 @@ -869,16 +870,17 @@ pref("network.proxy.ssl_port", |
352 pref("network.proxy.gopher_port", 0); |
|
353 pref("network.proxy.http", ""); |
|
354 @@ -872,16 +873,17 @@ pref("network.proxy.ssl_port", |
355 pref("network.proxy.socks", ""); |
355 pref("network.proxy.socks", ""); |
356 pref("network.proxy.socks_port", 0); |
356 pref("network.proxy.socks_port", 0); |
357 pref("network.proxy.socks_version", 5); |
357 pref("network.proxy.socks_version", 5); |
358 pref("network.proxy.socks_remote_dns", false); |
358 pref("network.proxy.socks_remote_dns", false); |
359 pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1"); |
359 pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1"); |