d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly handle being redirected to an FTP URL.

Browse Source 
Also fix a couple of not-so-minor bugs:
 - missing case for HTTP_SEE_OTHER
 - incorrect definition of HTTP_NEED_PROXY_AUTH

PR:		20259
MFC after:	2 weeks
This commit is contained in:
Dag-Erling Smørgrav 2001-12-04 01:12:51 +00:00
parent 89db7b8c6d
commit 6598654546
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=87317
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libfetch/http.c
View File

@ -92,7 +92,7 @@ extern char *__progname; /* XXX not portable */
#define HTTP_MOVED_TEMP 302
#define HTTP_SEE_OTHER 303
#define HTTP_NEED_AUTH 401
#define HTTP_NEED_PROXY_AUTH 403
#define HTTP_NEED_PROXY_AUTH 407
#define HTTP_PROTOCOL_ERROR 999
#define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \
@ -728,6 +728,14 @@ _http_request(struct url *URL, const char *op, struct url_stat *us,
if (!url->port)
url->port = _fetch_default_port(url->scheme);
/* were we redirected to an FTP URL? */
if (purl == NULL && strcmp(url->scheme, SCHEME_FTP) == 0) {
if (strcmp(op, "GET") == 0)
return _ftp_request(url, "RETR", us, purl, flags);
else if (strcmp(op, "HEAD") == 0)
return _ftp_request(url, "STAT", us, purl, flags);
}
/* connect to server or proxy */
if ((fd = _http_connect(url, purl, flags)) == -1)
goto ouch;
@ -799,6 +807,7 @@ _http_request(struct url *URL, const char *op, struct url_stat *us,
break;
case HTTP_MOVED_PERM:
case HTTP_MOVED_TEMP:
case HTTP_SEE_OTHER:
/*
* Not so fine, but we still have to read the headers to
* get the new location.