romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-26 15:46:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

TE: do the Connection: header

Browse source 
When TE: is inserted in the request, we must add a "Connection: TE" as
well to be HTTP 1.1 compliant. If a custom Connection: header is passed
in, we must use that and only append TE to it. Test case 1125 verifies
TE: + custom Connection:.
This commit is contained in:
Daniel Stenberg 2011-04-11 16:30:14 +02:00
parent be973b6f91
commit 9d191a6a40
6 changed files with 90 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/http.c
View file

@ -1533,6 +1533,11 @@ CURLcode Curl_add_custom_headers(struct connectdata *conn,
we will force length zero then */
checkprefix("Content-Length", headers->data))
;
else if(conn->allocptr.te &&
/* when asking for Transfer-Encoding, don't pass on a custom
Connection: */
checkprefix("Connection", headers->data))
;
else {
CURLcode result = Curl_add_bufferf(req_buffer, "%s\r\n",
headers->data);
@ -1728,14 +1733,21 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
return CURLE_OUT_OF_MEMORY;
}
#if 0
if(!Curl_checkheaders(data, "TE:")) {
if(Curl_checkheaders(data, "TE:")) {
/* When we insert a TE: header in the request, we must also insert TE in a
Connection: header, so we need to merge the custom provided Connection:
header and prevent the original to get sent */
char *cptr = Curl_checkheaders(data, "Connection:");
Curl_safefree(conn->allocptr.te);
conn->allocptr.te = aprintf("TE: %s\r\n", "gzip");
/* Create the (updated) Connection: header */
conn->allocptr.te = cptr? aprintf("%s, TE\r\n", cptr):
strdup("Connection: TE\r\n");
if(!conn->allocptr.te)
return CURLE_OUT_OF_MEMORY;
}
#endif
ptr = Curl_checkheaders(data, "Transfer-Encoding:");
if(ptr) {