summaryrefslogtreecommitdiffstats
path: root/net/data
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 17:17:41 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 17:17:41 +0000
commit685f6cbb6e8ac88c41d178490ed18b1aea6cfba1 (patch)
treeac4f9dffdb9db61439525ecf14c525f959849db7 /net/data
parentf439d53c11de91db1fa86a22b156e14b696f8adb (diff)
downloadchromium_src-685f6cbb6e8ac88c41d178490ed18b1aea6cfba1.zip
chromium_src-685f6cbb6e8ac88c41d178490ed18b1aea6cfba1.tar.gz
chromium_src-685f6cbb6e8ac88c41d178490ed18b1aea6cfba1.tar.bz2
FTP: fix compatibility problems with MLSD by removing MLSD support.
Some FTP servers send MLSD listings with no facts, just the file names. This is a valid RFC-3659 listing, but is useless for web browsers. In theory we could check whether a server advertises MLSD support in FEAT response, or use LIST when MLSD only returns file names, but the extra complexity is not worth it. All servers supporting MLSD must also support LIST, so this should not regress compatibility. This change also removes the "HPRC" directory listing parser. Actually, it was just MLSD listing with no facts. BUG=65328, 65584 TEST=net_unittests, also see the bugs Review URL: http://codereview.chromium.org/5669001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/data')
-rw-r--r--net/data/ftp/dir-listing-hprc-12
-rw-r--r--net/data/ftp/dir-listing-hprc-1.expected17
-rw-r--r--net/data/ftp/dir-listing-hprc-24
-rw-r--r--net/data/ftp/dir-listing-hprc-2.expected35
-rw-r--r--net/data/ftp/dir-listing-hprc-33
-rw-r--r--net/data/ftp/dir-listing-hprc-3.expected26
-rw-r--r--net/data/ftp/dir-listing-mlsd-15
-rw-r--r--net/data/ftp/dir-listing-mlsd-1.expected44
-rw-r--r--net/data/ftp/dir-listing-mlsd-21
-rw-r--r--net/data/ftp/dir-listing-mlsd-2.expected8
10 files changed, 0 insertions, 145 deletions
diff --git a/net/data/ftp/dir-listing-hprc-1 b/net/data/ftp/dir-listing-hprc-1
deleted file mode 100644
index ee3504f..0000000
--- a/net/data/ftp/dir-listing-hprc-1
+++ /dev/null
@@ -1,2 +0,0 @@
- .
- ..
diff --git a/net/data/ftp/dir-listing-hprc-1.expected b/net/data/ftp/dir-listing-hprc-1.expected
deleted file mode 100644
index 6259526..0000000
--- a/net/data/ftp/dir-listing-hprc-1.expected
+++ /dev/null
@@ -1,17 +0,0 @@
--
-.
-0
-1994
-11
-15
-12
-45
-
--
-..
-0
-1994
-11
-15
-12
-45
diff --git a/net/data/ftp/dir-listing-hprc-2 b/net/data/ftp/dir-listing-hprc-2
deleted file mode 100644
index 31a8688..0000000
--- a/net/data/ftp/dir-listing-hprc-2
+++ /dev/null
@@ -1,4 +0,0 @@
- .
- ..
- .welcome
- readme
diff --git a/net/data/ftp/dir-listing-hprc-2.expected b/net/data/ftp/dir-listing-hprc-2.expected
deleted file mode 100644
index e597b76..0000000
--- a/net/data/ftp/dir-listing-hprc-2.expected
+++ /dev/null
@@ -1,35 +0,0 @@
--
-.
-0
-1994
-11
-15
-12
-45
-
--
-..
-0
-1994
-11
-15
-12
-45
-
--
-.welcome
-0
-1994
-11
-15
-12
-45
-
--
-readme
-0
-1994
-11
-15
-12
-45
diff --git a/net/data/ftp/dir-listing-hprc-3 b/net/data/ftp/dir-listing-hprc-3
deleted file mode 100644
index 0e2f2d0..0000000
--- a/net/data/ftp/dir-listing-hprc-3
+++ /dev/null
@@ -1,3 +0,0 @@
- .
- ..
- Multi Word File Name.txt
diff --git a/net/data/ftp/dir-listing-hprc-3.expected b/net/data/ftp/dir-listing-hprc-3.expected
deleted file mode 100644
index a71cbd2..0000000
--- a/net/data/ftp/dir-listing-hprc-3.expected
+++ /dev/null
@@ -1,26 +0,0 @@
--
-.
-0
-1994
-11
-15
-12
-45
-
--
-..
-0
-1994
-11
-15
-12
-45
-
--
-Multi Word File Name.txt
-0
-1994
-11
-15
-12
-45
diff --git a/net/data/ftp/dir-listing-mlsd-1 b/net/data/ftp/dir-listing-mlsd-1
deleted file mode 100644
index 9463845..0000000
--- a/net/data/ftp/dir-listing-mlsd-1
+++ /dev/null
@@ -1,5 +0,0 @@
-type=dir;sizd=512;modify=20010414155043;UNIX.mode=0555;unique=6ag5b4e3ff; bin
-type=dir;sizd=512;modify=20010414155237;UNIX.mode=0555;unique=6ag5b4e400; etc
-type=dir;sizd=512;modify=20010705213550;UNIX.mode=0711;unique=6ag5b4e401; hidden
-type=dir;sizd=512;modify=20050422001005;UNIX.mode=0755;unique=100ff03g6164000; j
-type=dir;sizd=512;modify=20031021200128;UNIX.mode=0755;unique=6ag5b4e403; pub
diff --git a/net/data/ftp/dir-listing-mlsd-1.expected b/net/data/ftp/dir-listing-mlsd-1.expected
deleted file mode 100644
index 7720451..0000000
--- a/net/data/ftp/dir-listing-mlsd-1.expected
+++ /dev/null
@@ -1,44 +0,0 @@
-d
-bin
--1
-2001
-4
-14
-15
-50
-
-d
-etc
--1
-2001
-4
-14
-15
-52
-
-d
-hidden
--1
-2001
-7
-5
-21
-35
-
-d
-j
--1
-2005
-4
-22
-0
-10
-
-d
-pub
--1
-2003
-10
-21
-20
-1
diff --git a/net/data/ftp/dir-listing-mlsd-2 b/net/data/ftp/dir-listing-mlsd-2
deleted file mode 100644
index 939638a..0000000
--- a/net/data/ftp/dir-listing-mlsd-2
+++ /dev/null
@@ -1 +0,0 @@
-type=file;size=839;modify=19980908010757;UNIX.mode=0644;unique=6ag5b4e47d; ftpmotd
diff --git a/net/data/ftp/dir-listing-mlsd-2.expected b/net/data/ftp/dir-listing-mlsd-2.expected
deleted file mode 100644
index 33659ea..0000000
--- a/net/data/ftp/dir-listing-mlsd-2.expected
+++ /dev/null
@@ -1,8 +0,0 @@
--
-ftpmotd
-839
-1998
-9
-8
-1
-7