Commit c5d060ca authored by Michael Kaufmann's avatar Michael Kaufmann Committed by Daniel Stenberg
Browse files

HTTP: ignore "Content-Encoding: compress" 

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.
parent 98835eed

lib/http.c

+0 −11
Original line number Diff line number Diff line
@@ -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;
@@ -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]-

lib/http_chunks.c

+0 −1
Original line number Diff line number Diff line
@@ -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. "

lib/transfer.c

+0 −1
Original line number Diff line number Diff line
@@ -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' "

lib/urldata.h

+0 −1
Original line number Diff line number Diff line
@@ -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;