diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2018-03-23 22:50:52 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-03-23 22:50:52 +0300 |
| commit | 43d9c4737bc4f70a3d3d4460a0d6896c360e77a9 (patch) | |
| tree | a219e83c19ca5ce0c182dd779e0d24e315b8bf39 /data | |
| parent | bc25029b580d23935c9f94afb015f21e113e04e8 (diff) | |
Imports FtpWebRequest from CoreFX (#7644)
Contributes to #7682
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=12850
FtpWebRequest used to work incorrectly with sub directories.
Let's say we have a following FTP structure
```
myserver
├── file1
└── subdir
└── file2
└── file3
```
Old behavior:
### 1) For `ftp://myserver/subdir/` printed:
```
file2
file3
```
Expected:
```
file2
file3
```
### 2) For `ftp://myserver/subdir` printed:
```
file1
subdir
```
Expected:
```
subdir/file2
subdir/file3
```
### 3) For `ftp://myserver/subdir/file2` printed:
```
file2
file3
```
Expected:
```
file2
```
With the fix in this PR it works as expected (matches netfx and netcore behaviors).
Diffstat (limited to 'data')
| -rw-r--r-- | data/net_2_0/machine.config | 2 | ||||
| -rw-r--r-- | data/net_2_0/machine.jvm.config | 2 | ||||
| -rw-r--r-- | data/net_4_0/machine.config | 2 | ||||
| -rw-r--r-- | data/net_4_5/machine.config | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config index 2f8090f0288..2577c81dd92 100644 --- a/data/net_2_0/machine.config +++ b/data/net_2_0/machine.config @@ -116,7 +116,7 @@ <add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </webRequestModules> </system.net> diff --git a/data/net_2_0/machine.jvm.config b/data/net_2_0/machine.jvm.config index 64433b4af09..e0dbedc63c2 100644 --- a/data/net_2_0/machine.jvm.config +++ b/data/net_2_0/machine.jvm.config @@ -132,7 +132,7 @@ <add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </webRequestModules> <settings> <ipv6 enabled="false"/> diff --git a/data/net_4_0/machine.config b/data/net_4_0/machine.config index 30bc2105f3a..f3b71c43c53 100644 --- a/data/net_4_0/machine.config +++ b/data/net_4_0/machine.config @@ -133,7 +133,7 @@ <add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </webRequestModules> </system.net> diff --git a/data/net_4_5/machine.config b/data/net_4_5/machine.config index d17369394e3..455709536f8 100644 --- a/data/net_4_5/machine.config +++ b/data/net_4_5/machine.config @@ -136,7 +136,7 @@ <add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </webRequestModules> </system.net> |