emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/fetch/http.c: ignore headers after CONNECT response

Browse Source
This commit is contained in:
Duncaen 2019-04-08 13:16:53 +02:00
parent c1a64ba86e
commit 07ec982b07
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/fetch/http.c
View File

@ -721,6 +721,8 @@ http_connect(struct url *URL, struct url *purl, const char *flags, int *cached)
{ {
struct url *curl; struct url *curl;
conn_t *conn; conn_t *conn;
const char *p;
hdr_t h;
int af, verbose; int af, verbose;
#ifdef TCP_NOPUSH #ifdef TCP_NOPUSH
int val; int val;
@ -759,10 +761,25 @@ http_connect(struct url *URL, struct url *purl, const char *flags, int *cached)
http_cmd(conn, "\r\n"); http_cmd(conn, "\r\n");
if (http_get_reply(conn) != HTTP_OK) { if (http_get_reply(conn) != HTTP_OK) {
http_seterr(conn->err);
fetch_close(conn); fetch_close(conn);
return (NULL); return (NULL);
} }
http_get_reply(conn); /* Read and discard the rest of the proxy response */
do {
switch ((h = http_next_header(conn, &p))) {
case hdr_syserror:
fetch_syserr();
fetch_close(conn);
return (NULL);
case hdr_error:
http_seterr(HTTP_PROTOCOL_ERROR);
fetch_close(conn);
return (NULL);
default:
/* ignore */ ;
}
} while (h > hdr_end);
} }
if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 && if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
fetch_ssl(conn, URL, verbose) == -1) { fetch_ssl(conn, URL, verbose) == -1) {