diff options
| -rw-r--r-- | lib/http.c | 22 | ||||
| -rw-r--r-- | lib/http_chunks.c | 4 | ||||
| -rw-r--r-- | lib/transfer.c | 4 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/lib/http.c b/lib/http.c index 6b14fab19..c442eebab 100644 --- a/lib/http.c +++ b/lib/http.c @@ -3169,32 +3169,32 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data, start += 7; } - if(k->content_encoding) + if(k->auto_decoding) /* TODO: we only support the first mentioned compression for now */ break; if(checkprefix("identity", start)) { - k->content_encoding = IDENTITY; + k->auto_decoding = IDENTITY; start += 8; } else if(checkprefix("deflate", start)) { - k->content_encoding = DEFLATE; + k->auto_decoding = DEFLATE; start += 7; } else if(checkprefix("gzip", start)) { - k->content_encoding = GZIP; + k->auto_decoding = GZIP; start += 4; } else if(checkprefix("x-gzip", start)) { - k->content_encoding = GZIP; + k->auto_decoding = GZIP; start += 6; } else if(checkprefix("compress", start)) { - k->content_encoding = COMPRESS; + k->auto_decoding = COMPRESS; start += 8; } else if(checkprefix("x-compress", start)) { - k->content_encoding = COMPRESS; + k->auto_decoding = COMPRESS; start += 10; } else @@ -3222,15 +3222,15 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data, /* Record the content-encoding for later use */ if(checkprefix("identity", start)) - k->content_encoding = IDENTITY; + k->auto_decoding = IDENTITY; else if(checkprefix("deflate", start)) - k->content_encoding = DEFLATE; + k->auto_decoding = DEFLATE; else if(checkprefix("gzip", start) || checkprefix("x-gzip", start)) - k->content_encoding = GZIP; + k->auto_decoding = GZIP; else if(checkprefix("compress", start) || checkprefix("x-compress", start)) - k->content_encoding = COMPRESS; + k->auto_decoding = COMPRESS; } else if(checkprefix("Content-Range:", k->p)) { /* Content-Range: bytes [num]- diff --git a/lib/http_chunks.c b/lib/http_chunks.c index 56d8248ff..e955b945e 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -209,7 +209,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn, /* Write the data portion available */ #ifdef HAVE_LIBZ switch (conn->data->set.http_ce_skip? - IDENTITY : data->req.content_encoding) { + IDENTITY : data->req.auto_decoding) { case IDENTITY: #endif if(!k->ignorebody) { diff --git a/lib/transfer.c b/lib/transfer.c index 065c7341f..960056c1d 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -714,12 +714,12 @@ static CURLcode readwrite_data(struct SessionHandle *data, encodings handled here. */ #ifdef HAVE_LIBZ switch (conn->data->set.http_ce_skip ? - IDENTITY : k->content_encoding) { + IDENTITY : k->auto_decoding) { case IDENTITY: #endif /* This is the default when the server sends no Content-Encoding header. See Curl_readwrite_init; the - memset() call initializes k->content_encoding to zero. */ + memset() call initializes k->auto_decoding to zero. */ if(!k->ignorebody) { #ifndef CURL_DISABLE_POP3 diff --git a/lib/urldata.h b/lib/urldata.h index f2fb279d4..33933b3e1 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -582,7 +582,7 @@ struct SingleRequest { struct timeval start100; /* time stamp to wait for the 100 code from */ enum expect100 exp100; /* expect 100 continue state */ - int content_encoding; /* What content encoding. sec 3.5, RFC2616. */ + int auto_decoding; /* What content encoding. sec 3.5, RFC2616. */ #define IDENTITY 0 /* No encoding */ #define DEFLATE 1 /* zlib deflate [RFC 1950 & 1951] */ |