From dc2157a0878f3a140fac07b97687b3c3da42616b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 10 Aug 2010 00:56:45 +0200 Subject: parse_remote_port: fix ;type= URL suffix over HTTP proxy Test 563 is enabled now and verifies that the combo FTP type=A URL, CURLOPT_PORT set and proxy work fine. As a bonus I managed to remove the somewhat odd FTP check in parse_remote_port() and instead converted it to a better and more generic 'slash_removed' struct field. Checking the ->protocol field isn't right since when an FTP:// URL is sent over a HTTP proxy, the protocol is HTTP but the URL was handled by the FTP code and thus slash_removed is set TRUE for this case. --- tests/data/DISABLED | 1 - tests/data/test563 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 42c5f8aa1..b6071cbd9 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -2,5 +2,4 @@ # test cases are run by runtests.pl. Just add the plain test case numbers, one # per line. # Lines starting with '#' letters are treated as comments. -563 564 diff --git a/tests/data/test563 b/tests/data/test563 index 5d2d7338b..785152319 100644 --- a/tests/data/test563 +++ b/tests/data/test563 @@ -47,7 +47,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/ # Verify data after the test has been "shot" -GET ftp://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1 +GET FTP://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1 Host: %HOSTIP:%FTPPORT Accept: */* Proxy-Connection: Keep-Alive -- cgit v1.2.3