src/usr.bin/ftp/fetch.c - diff

Return to fetch.c CVS log

Up to [local] / src / usr.bin / ftp

Diff for /src/usr.bin/ftp/fetch.c between version 1.123 and 1.124

version 1.123, 2014/07/05 09:20:54

version 1.124, 2014/07/11 03:31:52

Line 884

ftp_printf(fin, ssl, "GET %s HTTP/1.0\r\n"

"Proxy-Authorization: Basic %s%s\r\n%s\r\n\r\n",

epath, credentials, buf ? buf : "",

HTTP_USER_AGENT);

httpuseragent);

else

ftp_printf(fin, ssl, "GET %s HTTP/1.0\r\n%s%s\r\n\r\n",

epath, buf ? buf : "", HTTP_USER_AGENT);

epath, buf ? buf : "", httpuseragent);

} else {

#ifndef SMALL

Line 945

ftp_printf(fin, ssl, ":%s", port);

#endif /* !SMALL */

ftp_printf(fin, ssl, "\r\n%s%s\r\n\r\n",

buf ? buf : "", HTTP_USER_AGENT);

buf ? buf : "", httpuseragent);

if (verbose)

fprintf(ttyout, "\n");

}

Line 1284

char *cp, *url, *host, *dir, *file, *portnum;

char *username, *pass, *pathstart;

char *ftpproxy, *httpproxy;

#ifndef SMALL

char *uagent = NULL;

#endif /* !SMALL */

int rval, xargc;

volatile int argpos;

int dirhasglob, filehasglob, oautologin;

Line 1304

Line 1307

if ((httpproxy = getenv(HTTP_PROXY)) != NULL && *httpproxy == '\0')

httpproxy = NULL;

if (httpuseragent == NULL)

httpuseragent = HTTP_USER_AGENT;

#ifndef SMALL

else

uagent = httpuseragent;

#endif /* !SMALL */

* Loop through as long as there's files to fetch.

Line 1580

Line 1590

}

if (connected && rval != -1)

disconnect(0, NULL);

#ifndef SMALL

free(uagent);

#endif /* !SMALL */

return (rval);

}