From: Stefan Fritsch Date: Sat, 12 Feb 2011 12:16:18 +0000 (+0000) Subject: revert r1026746: X-Git-Tag: 2.3.11~72 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e8f78ee92c91e04db8126d2192f3e3d0f2e2a4c;p=apache revert r1026746: If an unknown Content-* header is received for a PUT request, we must not ignore it but reply with 501 per RFC 2616 9.6. PR: 42978 Vetoed by Roy T. Fielding: http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C9A5A8B62-ED16-4BD3-97DA-8475026BB81D@gbiv.com%3E git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070061 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 1b947bf851..e20d33c7fa 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.3.11 + *) mod_dav: Revert change to send 501 error if unknown Content-* header is + received for a PUT request. PR 42978. [Stefan Fritsch] + *) mod_cache: Respect s-maxage as described by RFC2616 14.9.3, which must take precedence if present. PR 35247. [Graham Leggett] diff --git a/STATUS b/STATUS index 2b6f923bb7..bdf60c730d 100644 --- a/STATUS +++ b/STATUS @@ -151,8 +151,8 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * RFC 2616 violations. Closed PRs: 15852, 15857, 15859, 15861, 15864, 15869, 15870, 16120, 16125, 16135, 16136, 16137, 16138, 16139, 16140, 16518, - 16520, 42978, 49825 - Open PRs: 15865, 15866, 15868, 16126, 16133, 16142, 16521 + 16520, 49825 + Open PRs: 15865, 15866, 15868, 16126, 16133, 16142, 16521, 42978 jerenkrantz says: need to decide how many we need to backport and/or if these rise to showstopper status. wrowe suggests: it would be nice to see "MUST" v.s. "SHOULD" v.s. "MAY" diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index ec154cd2b2..42d3abaa75 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -802,30 +802,6 @@ static int dav_parse_range(request_rec *r, return 1; } -static const char *dav_validate_content_headers(request_rec *r) -{ - int i, prefix_len = strlen("content-"); - const apr_array_header_t *arr = apr_table_elts(r->headers_in); - const apr_table_entry_t *elts = (const apr_table_entry_t *)arr->elts; - - for (i = 0; i < arr->nelts; ++i) { - if (elts[i].key == NULL) - continue; - if (strncasecmp(elts[i].key, "content-", prefix_len) == 0 - && strcasecmp(elts[i].key + prefix_len, "length") != 0 - && strcasecmp(elts[i].key + prefix_len, "range") != 0 - /* Content-Location may be ignored per RFC 2616 14.14 */ - && strcasecmp(elts[i].key + prefix_len, "location") != 0 - && strcasecmp(elts[i].key + prefix_len, "type") != 0) - { - /* XXX: content-md5? content-language? content-encoding? */ - return apr_psprintf(r->pool, "Support for %s is not implemented.", - ap_escape_html(r->pool, elts[i].key)); - } - } - return NULL; -} - /* handle the GET method */ static int dav_method_get(request_rec *r) { @@ -973,14 +949,6 @@ static int dav_method_put(request_rec *r) mode = DAV_MODE_WRITE_TRUNC; } - if ((body = dav_validate_content_headers(r)) != NULL) { - /* RFC 2616 9.6: We must not ignore any Content-* headers we do not - * understand. - * XXX: Relax this for HTTP 1.0 requests? - */ - return dav_error_response(r, HTTP_NOT_IMPLEMENTED, body); - } - /* make sure the resource can be modified (if versioning repository) */ if ((err = dav_auto_checkout(r, resource, 0 /* not parent_only */,