Commit 2646af10 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

allow a custom "Accept-Encoding:" header override the internally set one 

that gets set with CURLOPT_ENCODING
parent 7261b455

lib/http.c

+9 −0
Original line number Diff line number Diff line
@@ -1325,6 +1325,15 @@ CURLcode Curl_http(struct connectdata *conn) 
  if(data->set.cookie && !checkheaders(data, "Cookie:"))

    addcookies = data->set.cookie;



  if(!checkheaders(data, "Accept-Encoding:") &&

     data->set.encoding) {

    Curl_safefree(conn->allocptr.accept_encoding);

    conn->allocptr.accept_encoding =

      aprintf("Accept-Encoding: %s\015\012", data->set.encoding);

    if(!conn->allocptr.accept_encoding)

      return CURLE_OUT_OF_MEMORY;

  }



  if(!conn->bits.upload_chunky && (httpreq != HTTPREQ_GET)) {

    /* not a chunky transfer yet, but data is to be sent */

    ptr = checkheaders(data, "Transfer-Encoding:");

lib/url.c

+0 −8
Original line number Diff line number Diff line
@@ -3348,14 +3348,6 @@ static CURLcode SetupConnection(struct connectdata *conn, 
    }

  }



  if(data->set.encoding) {

    Curl_safefree(conn->allocptr.accept_encoding);

    conn->allocptr.accept_encoding =

      aprintf("Accept-Encoding: %s\015\012", data->set.encoding);

    if(!conn->allocptr.accept_encoding)

      return CURLE_OUT_OF_MEMORY;

  }



  conn->bytecount = 0;

  conn->headerbytecount = 0;