Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit cab101e

Browse files
committed
Bug 1574475 - Remove ftp prefs r=necko-reviewers,dragana
Differential Revision: https://phabricator.services.mozilla.com/D111247
1 parent 824826f commit cab101e

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

modules/libpref/init/all.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,6 @@ pref("javascript.options.dump_stack_on_debuggee_would_run", false);
11941194
pref("javascript.options.dynamicImport", true);
11951195

11961196
// advanced prefs
1197-
pref("advanced.mailftp", false);
11981197
pref("image.animation_mode", "normal");
11991198

12001199
// If this pref is true, prefs in the logging.config branch will be cleared on
@@ -1491,14 +1490,6 @@ pref("network.http.send_window_size", 1024);
14911490
// There is also image.http.accept which works in scope of image.
14921491
pref("network.http.accept", "");
14931492

1494-
// default values for FTP
1495-
// in a DSCP environment this should be 40 (0x28, or AF11), per RFC-4594,
1496-
// Section 4.8 "High-Throughput Data Service Class", and 80 (0x50, or AF22)
1497-
// per Section 4.7 "Low-Latency Data Service Class".
1498-
pref("network.ftp.data.qos", 0);
1499-
pref("network.ftp.control.qos", 0);
1500-
pref("network.ftp.enabled", false);
1501-
15021493
// The max time to spend on xpcom events between two polls in ms.
15031494
pref("network.sts.max_time_for_events_between_two_polls", 100);
15041495

@@ -1762,9 +1753,6 @@ pref("network.dns.offline-localhost", true);
17621753
// A negative value will keep the thread alive forever.
17631754
pref("network.dns.resolver-thread-extra-idle-time-seconds", 60);
17641755

1765-
// Idle timeout for ftp control connections - 5 minute default
1766-
pref("network.ftp.idleConnectionTimeout", 300);
1767-
17681756
// enables the prefetch service (i.e., prefetching of <link rel="next"> and
17691757
// <link rel="prefetch"> URLs).
17701758
pref("network.prefetch-next", true);
@@ -1887,8 +1875,6 @@ pref("network.http.tailing.total-max", 45000);
18871875
// Enable or disable the whole fix from bug 1563538
18881876
pref("network.http.spdy.bug1563538", true);
18891877

1890-
pref("network.proxy.ftp", "");
1891-
pref("network.proxy.ftp_port", 0);
18921878
pref("network.proxy.http", "");
18931879
pref("network.proxy.http_port", 0);
18941880
pref("network.proxy.ssl", "");

netwerk/base/nsIOService.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -867,14 +867,6 @@ static bool UsesExternalProtocolHandler(const char* aScheme) {
867867
return false;
868868
}
869869

870-
// When ftp protocol is disabled, return true if external protocol handler was
871-
// not explicitly disabled by the prererence.
872-
if ("ftp"_ns.Equals(aScheme) &&
873-
!Preferences::GetBool("network.ftp.enabled", true) &&
874-
Preferences::GetBool("network.protocol-handler.external.ftp", true)) {
875-
return true;
876-
}
877-
878870
for (const auto& forcedExternalScheme : gForcedExternalSchemes) {
879871
if (!nsCRT::strcasecmp(forcedExternalScheme, aScheme)) {
880872
return true;

0 commit comments

Comments
 (0)