diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2012-02-16 02:47:54 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-02-16 02:47:54 +0100 |
| commit | 212cb6c2dcb419aaa6c848406136ec05e98c8632 (patch) | |
| tree | 3c6f8cc25cde8781809bfeb92ebcadac341b1af4 /modules/http | |
| parent | e072a2dd866b7cb9f14319b80326a4e7fd16fcdf (diff) | |
| download | apache2-212cb6c2dcb419aaa6c848406136ec05e98c8632.tar.gz | |
Import upstream release candidate 2.4.1upstream/2.4.1
Diffstat (limited to 'modules/http')
| -rw-r--r-- | modules/http/http_filters.c | 2 | ||||
| -rw-r--r-- | modules/http/mod_mime.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index 500b5cf2..c04e97d7 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -631,7 +631,7 @@ static long get_chunk_size(char *b) chunkbits -= 4; ++b; } - if (apr_isxdigit(*b) && (chunkbits <= 0)) { + if (apr_isxdigit(*b)) { /* overflow */ return -1; } diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c index 9e445544..f92119b6 100644 --- a/modules/http/mod_mime.c +++ b/modules/http/mod_mime.c @@ -895,7 +895,7 @@ static int find_ct(request_rec *r) * setting redundant filters. 2, we insert these in the types * config hook, which may be too early (dunno.) */ - if (exinfo->input_filters && r->proxyreq == PROXYREQ_NONE) { + if (exinfo->input_filters) { const char *filter, *filters = exinfo->input_filters; while (*filters && (filter = ap_getword(r->pool, &filters, ';'))) { @@ -905,7 +905,7 @@ static int find_ct(request_rec *r) found = 1; } } - if (exinfo->output_filters && r->proxyreq == PROXYREQ_NONE) { + if (exinfo->output_filters) { const char *filter, *filters = exinfo->output_filters; while (*filters && (filter = ap_getword(r->pool, &filters, ';'))) { |