aniani/elinks
0
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-06-30 22:19:29 -04:00
Code

Call decompress_data only for compressed data.

Browse Source 
Hope this is less missleading than before.
This commit is contained in:
witekfl 2013-01-04 16:00:50 +01:00
parent 642e164ec3
commit 6fae43511c
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/protocol/http/http.c
View File

@ -1087,12 +1087,6 @@ decompress_data(struct connection *conn, unsigned char *data, int len,
} }
} }
if (conn->content_encoding == ENCODING_NONE) {
*new_len = len;
if (*length_of_block > 0) *length_of_block -= len;
return data;
}
*new_len = 0; /* new_len must be zero if we would ever return NULL */ *new_len = 0; /* new_len must be zero if we would ever return NULL */
if (!conn->stream) { if (!conn->stream) {
@ -1238,7 +1232,6 @@ read_chunked_http_data(struct connection *conn, struct read_buffer *rb)
} }
} else { } else {
unsigned char *data;
int data_len; int data_len;
int zero = (http->chunk_remaining == CHUNK_ZERO_SIZE); int zero = (http->chunk_remaining == CHUNK_ZERO_SIZE);
int len = zero ? 0 : http->chunk_remaining; int len = zero ? 0 : http->chunk_remaining;
@ -1247,13 +1240,19 @@ read_chunked_http_data(struct connection *conn, struct read_buffer *rb)
int_upper_bound(&len, rb->length); int_upper_bound(&len, rb->length);
conn->received += len; conn->received += len;
data = decompress_data(conn, rb->data, len, &data_len); if (conn->content_encoding == ENCODING_NONE) {
data_len = len;
if (http->chunk_remaining > 0) http->chunk_remaining -= len;
if (add_fragment(conn->cached, conn->from, rb->data, len) == 1)
conn->tries = 0;
} else {
unsigned char *data = decompress_data(conn, rb->data, len, &data_len);
if (add_fragment(conn->cached, conn->from, if (add_fragment(conn->cached, conn->from, data, data_len) == 1)
data, data_len) == 1) conn->tries = 0;
conn->tries = 0;
if (data && data != rb->data) mem_free(data); if (data) mem_free(data);
}
conn->from += data_len; conn->from += data_len;
total_data_len += data_len; total_data_len += data_len;
@ -1298,7 +1297,6 @@ static int
read_normal_http_data(struct connection *conn, struct read_buffer *rb) read_normal_http_data(struct connection *conn, struct read_buffer *rb)
{ {
struct http_connection_info *http = conn->info; struct http_connection_info *http = conn->info;
unsigned char *data;
int data_len; int data_len;
int len = rb->length; int len = rb->length;
@ -1309,12 +1307,19 @@ read_normal_http_data(struct connection *conn, struct read_buffer *rb)
conn->received += len; conn->received += len;
data = decompress_data(conn, rb->data, len, &data_len); if (conn->content_encoding == ENCODING_NONE) {
data_len = len;
if (http->length > 0) http->length -= len;
if (add_fragment(conn->cached, conn->from, rb->data, data_len) == 1)
conn->tries = 0;
} else {
unsigned char *data = decompress_data(conn, rb->data, len, &data_len);
if (add_fragment(conn->cached, conn->from, data, data_len) == 1) if (add_fragment(conn->cached, conn->from, data, data_len) == 1)
conn->tries = 0; conn->tries = 0;
if (data && data != rb->data) mem_free(data); if (data) mem_free(data);
}
conn->from += data_len; conn->from += data_len;