From 45b343b016595bf4210276ccff67d4084d1d0b1a Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 10 Mar 2014 13:04:03 +0000 Subject: [PATCH] Merge r1524192, r1524770, r1527925, r1541270, r1541368 from trunk: Update rationale draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions between TE and content-length in the same req/resp. PR 55616 (add missing APLOGNO), part 1 Wrap at 80 still, here at httpd project Use a distinguishing APLOGNO for unk t-e with read-until-close behavior Submitted by: jim, kbrand, wrowe, wrowe Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575934 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 10 ---------- modules/http/http_filters.c | 27 ++++++++++++++++----------- server/protocol.c | 36 ++++++++++++++++++++++++++++++------ 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/CHANGES b/CHANGES index 6175ad40c8..470af87ef6 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,9 @@ Changes with Apache 2.4.8 Log only cookies with a value assignment. [William Rowe, Ruediger Pluem, Jim Jagielski] + *) core: draft-ietf-httpbis-p1-messaging-23 corrections regarding + TE/CL conflicts. [Yann Ylavic , Jim Jagielski] + *) mod_dir: Add DirectoryCheckHandler to allow a 2.2-like behavior, skipping execution when a handler is already set. PR53929. [Eric Covener] diff --git a/STATUS b/STATUS index 77bf8db5ea..a0b936a8a3 100644 --- a/STATUS +++ b/STATUS @@ -98,16 +98,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * protocol: draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions - between TE and content-length in the same req/resp. - trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1524192 - https://svn.apache.org/viewvc?view=revision&revision=1524770 - https://svn.apache.org/viewvc?view=revision&revision=1527925 - https://svn.apache.org/viewvc?view=revision&revision=1541270 - https://svn.apache.org/viewvc?view=revision&revision=1541368 - 2.4.x patch (plus CHANGES entry above): - http://people.apache.org/~wrowe/httpd-2.4-r1524192-r1524770-TE-CL-v2.patch - +1: ylavic, wrowe, rpluem PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index 564303c1c3..2a0a979d5f 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -276,25 +276,30 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, lenp = apr_table_get(f->r->headers_in, "Content-Length"); if (tenc) { - if (!strcasecmp(tenc, "chunked")) { + if (strcasecmp(tenc, "chunked") == 0 /* fast path */ + || ap_find_last_token(f->r->pool, tenc, "chunked")) { ctx->state = BODY_CHUNK; } - /* test lenp, because it gives another case we can handle */ - else if (!lenp) { - /* Something that isn't in HTTP, unless some future - * edition defines new transfer encodings, is unsupported. + else if (f->r->proxyreq == PROXYREQ_RESPONSE) { + /* http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-23 + * Section 3.3.3.3: "If a Transfer-Encoding header field is + * present in a response and the chunked transfer coding is not + * the final encoding, the message body length is determined by + * reading the connection until it is closed by the server." */ + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, APLOGNO(02555) + "Unknown Transfer-Encoding: %s;" + " using read-until-close", tenc); + tenc = NULL; + } + else { ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, APLOGNO(01585) "Unknown Transfer-Encoding: %s", tenc); return bail_out_on_error(ctx, f, HTTP_NOT_IMPLEMENTED); } - else { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r, APLOGNO(01586) - "Unknown Transfer-Encoding: %s; using Content-Length", tenc); - tenc = NULL; - } + lenp = NULL; } - if (lenp && !tenc) { + if (lenp) { char *endstr; ctx->state = BODY_LENGTH; diff --git a/server/protocol.c b/server/protocol.c index 341fe32b19..bf915a0ab9 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -997,6 +997,8 @@ request_rec *ap_read_request(conn_rec *conn) } if (!r->assbackwards) { + const char *tenc; + ap_get_mime_headers_core(r, tmp_bb); if (r->status != HTTP_OK) { ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00567) @@ -1008,12 +1010,34 @@ request_rec *ap_read_request(conn_rec *conn) goto traceout; } - if (apr_table_get(r->headers_in, "Transfer-Encoding") - && apr_table_get(r->headers_in, "Content-Length")) { - /* 2616 section 4.4, point 3: "if both Transfer-Encoding - * and Content-Length are received, the latter MUST be - * ignored"; so unset it here to prevent any confusion - * later. */ + tenc = apr_table_get(r->headers_in, "Transfer-Encoding"); + if (tenc) { + /* http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-23 + * Section 3.3.3.3: "If a Transfer-Encoding header field is + * present in a request and the chunked transfer coding is not + * the final encoding ...; the server MUST respond with the 400 + * (Bad Request) status code and then close the connection". + */ + if (!(strcasecmp(tenc, "chunked") == 0 /* fast path */ + || ap_find_last_token(r->pool, tenc, "chunked"))) { + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02539) + "client sent unknown Transfer-Encoding " + "(%s): %s", tenc, r->uri); + r->status = HTTP_BAD_REQUEST; + conn->keepalive = AP_CONN_CLOSE; + ap_send_error_response(r, 0); + ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r); + ap_run_log_transaction(r); + apr_brigade_destroy(tmp_bb); + goto traceout; + } + + /* http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-23 + * Section 3.3.3.3: "If a message is received with both a + * Transfer-Encoding and a Content-Length header field, the + * Transfer-Encoding overrides the Content-Length. ... A sender + * MUST remove the received Content-Length field". + */ apr_table_unset(r->headers_in, "Content-Length"); } } -- 2.50.1