diff --git a/embedding/config/basebrowser-installer-win.pkg b/embedding/config/basebrowser-installer-win.pkg index 742830bb459..df3d7bb0279 100644 --- a/embedding/config/basebrowser-installer-win.pkg +++ b/embedding/config/basebrowser-installer-win.pkg @@ -284,10 +284,6 @@ res\fonts\mathfontPUA.properties res\fonts\mathfontSymbol.properties -; p3p -components\p3p.dll -components\p3p.xpt - ; XPInstall res\cmessage.txt diff --git a/embedding/config/basebrowser-mac-macho b/embedding/config/basebrowser-mac-macho index d2ce1ce44e0..a215723c790 100644 --- a/embedding/config/basebrowser-mac-macho +++ b/embedding/config/basebrowser-mac-macho @@ -265,10 +265,6 @@ res/fonts/mathfontPUA.properties res/fonts/mathfontSymbol.properties components/libucvmath.dylib -; p3p -components/libp3p.dylib -components/p3p.xpt - ; svg components/dom_svg.xpt res/svg.css diff --git a/embedding/config/basebrowser-qnx b/embedding/config/basebrowser-qnx index 46d495b7506..f12304e15a9 100644 --- a/embedding/config/basebrowser-qnx +++ b/embedding/config/basebrowser-qnx @@ -267,10 +267,6 @@ res/entityTables/transliterate.properties ;res/fonts/mathfontSymbol.properties ;components/libucvmath.so -; p3p -components/libp3p.so -components/p3p.xpt - ; Effective TLD res/effective_tld_names.dat diff --git a/embedding/config/basebrowser-unix b/embedding/config/basebrowser-unix index a20ef88ba18..547a5b457de 100644 --- a/embedding/config/basebrowser-unix +++ b/embedding/config/basebrowser-unix @@ -270,10 +270,6 @@ res/entityTables/transliterate.properties ;res/fonts/mathfontSymbol.properties ;components/libucvmath.so -; p3p -components/libp3p.so -components/p3p.xpt - ; Effective TLD res/effective_tld_names.dat diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win index d6649d59603..fbdeee4ef90 100644 --- a/embedding/config/basebrowser-win +++ b/embedding/config/basebrowser-win @@ -300,9 +300,5 @@ res\html\gopher-unknown.gif ; res\fonts\mathfontSymbol.properties -; p3p -components\p3p.dll -components\p3p.xpt - ; Effective TLD res\effective_tld_names.dat diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 0fb791635e5..6c91069711e 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -756,7 +756,7 @@ pref("network.proxy.socks_remote_dns", false); pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1"); pref("network.proxy.failover_timeout", 1800); // 30 minutes pref("network.online", true); //online/offline -pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-p3p +pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse pref("network.cookie.disableCookieForMailNews", true); // disable all cookies for mail pref("network.cookie.lifetimePolicy", 0); // accept normally, 1-askBeforeAccepting, 2-acceptForSession,3-acceptForNDays pref("network.cookie.alwaysAcceptSessionCookies", false); @@ -771,11 +771,6 @@ pref("network.proxy.autoconfig_url", ""); pref("network.proxy.autoconfig_retry_interval_min", 5); // 5 seconds pref("network.proxy.autoconfig_retry_interval_max", 300); // 5 minutes -// The following default value is for p3p medium mode. -// See xpfe/components/permissions/content/cookieP3P.xul for the definitions of low/medium/hi -pref("network.cookie.p3p", "ffffaaaa"); -pref("network.cookie.p3plevel", 1); // 0=low, 1=medium, 2=high, 3=custom - pref("converter.html2txt.structs", true); // Output structured phrases (strong, em, code, sub, sup, b, i, u) pref("converter.html2txt.header_strategy", 1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention diff --git a/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst b/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst index 7c4ff714aa1..aead746fc5d 100644 --- a/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst +++ b/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst @@ -503,7 +503,6 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/"); /* Log files that are created after the installer is done, so they can be uninstalled */ logComment("Installing: " + fProgram + ".autoreg"); diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst index 253c6839aff..cfdc10668e0 100644 --- a/xpinstall/packager/mac/browser.jst +++ b/xpinstall/packager/mac/browser.jst @@ -103,7 +103,6 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pippki.jar"), "content/pippki/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pipnss.jar"), "content/pipnss/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/p3p/"); // make an alias to the browser on the desktop var desktopFolder = getFolder("Mac Desktop"); diff --git a/xpinstall/packager/mac/langenus.jst b/xpinstall/packager/mac/langenus.jst index 04499c2ee6b..4aa5f830c43 100644 --- a/xpinstall/packager/mac/langenus.jst +++ b/xpinstall/packager/mac/langenus.jst @@ -68,7 +68,6 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "help/"); registerChrome(chromeType, cf, localeName + "pippki/"); registerChrome(chromeType, cf, localeName + "pipnss/"); - registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, cf, localeName + "global-region/"); registerChrome(chromeType, cf, localeName + "communicator-region/"); diff --git a/xpinstall/packager/os2/browser.jst b/xpinstall/packager/os2/browser.jst index 8f5e5263fa4..fe4a21a4484 100644 --- a/xpinstall/packager/os2/browser.jst +++ b/xpinstall/packager/os2/browser.jst @@ -221,7 +221,6 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/"); /* Log files that are created after the installer is done, so they can be uninstalled */ logComment("Installing: " + fProgram + ".autoreg"); diff --git a/xpinstall/packager/os2/langenus.jst b/xpinstall/packager/os2/langenus.jst index ed5e640b707..b09ad8d4148 100644 --- a/xpinstall/packager/os2/langenus.jst +++ b/xpinstall/packager/os2/langenus.jst @@ -71,7 +71,6 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "help/"); registerChrome(chromeType, cf, localeName + "pippki/"); registerChrome(chromeType, cf, localeName + "pipnss/"); - registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, cf, localeName + "global-region/"); registerChrome(chromeType, cf, localeName + "communicator-region/"); diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2 index 2480cf4ff43..348ed37a611 100644 --- a/xpinstall/packager/packages-os2 +++ b/xpinstall/packager/packages-os2 @@ -323,10 +323,6 @@ bin/ldap60.dll bin/prldap60.dll bin/ldif60.dll -; p3p -bin/components/p3p.xpt -bin/components/p3p.dll - ; classic theme bin/chrome/classic.jar bin/chrome/classic.manifest @@ -537,8 +533,6 @@ bin/chrome/sroaming.jar ;iiextras.dll - I don't know ;iiextras.xpt - I don't know ;MyServce.dll - Sample -;p3p.dll - I don't know -;p3p.xpt - I don't know ;proxytext.xpt - Test ;tdynamic.dll - Test ;xpcomsmp.dll - Sample diff --git a/xpinstall/packager/packages-static-unix b/xpinstall/packager/packages-static-unix index 7d91d6834c7..c43c2b611dc 100644 --- a/xpinstall/packager/packages-static-unix +++ b/xpinstall/packager/packages-static-unix @@ -286,10 +286,6 @@ bin/res/fonts/* bin/res/dtd/* bin/res/effective_tld_names.dat -; p3p -bin/components/p3p.xpt -bin/components/libp3p.so - [mail] bin/components/libmeta_mail.so bin/components/addrbook.xpt diff --git a/xpinstall/packager/packages-static-win b/xpinstall/packager/packages-static-win index c53d35e8f76..8f30bddb788 100644 --- a/xpinstall/packager/packages-static-win +++ b/xpinstall/packager/packages-static-win @@ -220,10 +220,6 @@ bin\components\websrvcs.xpt ; Roaming bin\chrome\sroaming.jar -; p3p -bin\components\p3p.dll -bin\components\p3p.xpt - ; chrome stuff bin\chrome\help.jar bin\chrome\comm.jar diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index aef2e8d26eb..b2fb3b9a974 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -325,10 +325,6 @@ bin/components/mozldap.xpt bin/components/libsroaming.so bin/chrome/sroaming.jar -; p3p -bin/components/p3p.xpt -bin/components/libp3p.so - ; classic theme bin/chrome/classic.jar bin/chrome/classic.manifest diff --git a/xpinstall/packager/unix/browser.jst b/xpinstall/packager/unix/browser.jst index 47703cda9b0..0471fba30b3 100644 --- a/xpinstall/packager/unix/browser.jst +++ b/xpinstall/packager/unix/browser.jst @@ -115,7 +115,6 @@ if (verifyDiskSpace(communicatorFolder, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/p3p/"); if (err==SUCCESS) { diff --git a/xpinstall/packager/unix/langenus.jst b/xpinstall/packager/unix/langenus.jst index f3e0f4367ca..0ad516dde8a 100644 --- a/xpinstall/packager/unix/langenus.jst +++ b/xpinstall/packager/unix/langenus.jst @@ -66,7 +66,6 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "help/"); registerChrome(chromeType, cf, localeName + "pippki/"); registerChrome(chromeType, cf, localeName + "pipnss/"); - registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, cf, localeName + "global-region/"); registerChrome(chromeType, cf, localeName + "communicator-region/"); diff --git a/xpinstall/packager/windows/browser.jst b/xpinstall/packager/windows/browser.jst index e25843c54ac..8fce68c2fa8 100644 --- a/xpinstall/packager/windows/browser.jst +++ b/xpinstall/packager/windows/browser.jst @@ -697,7 +697,6 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/"); - registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/"); // We need to register the psm chrome files. // We're checking to see if they exist first in case diff --git a/xpinstall/packager/windows/langenus.jst b/xpinstall/packager/windows/langenus.jst index 66b6c86643b..80d090afc32 100644 --- a/xpinstall/packager/windows/langenus.jst +++ b/xpinstall/packager/windows/langenus.jst @@ -68,7 +68,6 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "help/"); registerChrome(chromeType, cf, localeName + "pippki/"); registerChrome(chromeType, cf, localeName + "pipnss/"); - registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, cf, localeName + "global-region/"); registerChrome(chromeType, cf, localeName + "communicator-region/");