Fix this my way. David had absolutely no call overriding MAINTAINER without

even giving me 24 hours to read his mail and find the bug.
This commit is contained in:
Dag-Erling Smørgrav 2000-10-28 20:53:02 +00:00
parent f18255c68b
commit 7ca2f6ae1f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=67810

View File

@ -887,7 +887,7 @@ fetchXGetFTP(struct url *url, struct url_stat *us, char *flags)
int cd;
/* get the proxy URL, and check if we should use HTTP instead */
if (flags && !strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) {
if (!(flags && strchr(flags, 'd')) && (purl = _ftp_get_proxy()) != NULL) {
if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
return _http_request(url, "GET", us, purl, flags);
} else {
@ -934,7 +934,7 @@ fetchPutFTP(struct url *url, char *flags)
int cd;
/* get the proxy URL, and check if we should use HTTP instead */
if (flags && !strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) {
if (!(flags && strchr(flags, 'd')) && (purl = _ftp_get_proxy()) != NULL) {
if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
/* XXX HTTP PUT is not implemented, so try without the proxy */
purl = NULL;
@ -968,7 +968,7 @@ fetchStatFTP(struct url *url, struct url_stat *us, char *flags)
int cd;
/* get the proxy URL, and check if we should use HTTP instead */
if (flags && !strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) {
if (!(flags && strchr(flags, 'd')) && (purl = _ftp_get_proxy()) != NULL) {
if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) {
FILE *f;