Skip to content

Commit

Permalink
HTTP: ignore "Content-Encoding: compress"
Browse files Browse the repository at this point in the history
Currently, libcurl rejects responses with "Content-Encoding: compress"
when CURLOPT_ACCEPT_ENCODING is set to "". I think that libcurl should
treat the Content-Encoding "compress" the same as other
Content-Encodings that it does not support, e.g. "bzip2". That means
just ignoring it.
  • Loading branch information
mkauf authored and bagder committed Jul 24, 2015
1 parent 98835ee commit c5d060c
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 14 deletions.
11 changes: 0 additions & 11 deletions lib/http.c
Original file line number Diff line number Diff line change
Expand Up @@ -3582,14 +3582,6 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
k->auto_decoding = GZIP;
start += 6;
}
else if(checkprefix("compress", start)) {
k->auto_decoding = COMPRESS;
start += 8;
}
else if(checkprefix("x-compress", start)) {
k->auto_decoding = COMPRESS;
start += 10;
}
else
/* unknown! */
break;
Expand Down Expand Up @@ -3622,9 +3614,6 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
else if(checkprefix("gzip", start)
|| checkprefix("x-gzip", start))
k->auto_decoding = GZIP;
else if(checkprefix("compress", start)
|| checkprefix("x-compress", start))
k->auto_decoding = COMPRESS;
}
else if(checkprefix("Content-Range:", k->p)) {
/* Content-Range: bytes [num]-
Expand Down
1 change: 0 additions & 1 deletion lib/http_chunks.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
(ssize_t)piece);
break;

case COMPRESS:
default:
failf (conn->data,
"Unrecognized content encoding type. "
Expand Down
1 change: 0 additions & 1 deletion lib/transfer.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,6 @@ static CURLcode readwrite_data(struct SessionHandle *data,
result = Curl_unencode_gzip_write(conn, k, nread);
break;

case COMPRESS:
default:
failf (data, "Unrecognized content encoding type. "
"libcurl understands `identity', `deflate' and `gzip' "
Expand Down
1 change: 0 additions & 1 deletion lib/urldata.h
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ struct SingleRequest {
#define IDENTITY 0 /* No encoding */
#define DEFLATE 1 /* zlib deflate [RFC 1950 & 1951] */
#define GZIP 2 /* gzip algorithm [RFC 1952] */
#define COMPRESS 3 /* Not handled, added for completeness */

#ifdef HAVE_LIBZ
zlibInitState zlib_init; /* possible zlib init state;
Expand Down

0 comments on commit c5d060c

Please sign in to comment.