diff --git a/Makefile b/Makefile index 3f94b45b7..2906bbc2d 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,6 @@ TARGETS = $(TARGETS_HTML) \ $(bd)/$(SEMANTICS).iana-methods \ $(bd)/$(SEMANTICS).iana-status-codes \ $(bd)/$(CACHE).iana-headers \ - $(bd)/$(CACHE).iana-warn-codes \ $(bd)/$(CACHE).cache-directives \ httpbis-errata-status.html \ httpbis.abnf @@ -106,9 +105,6 @@ $(bd)/%.iana-methods: %.xml lib/extract-method-defs.xslt $(bd)/%.iana-status-codes: %.xml lib/extract-status-code-defs.xslt $(saxon) $< lib/extract-status-code-defs.xslt > $@ -$(bd)/%.iana-warn-codes: %.xml lib/extract-warn-code-defs.xslt - $(saxon) $< lib/extract-warn-code-defs.xslt > $@ - $(bd)/%.cache-directives: %.xml lib/extract-cache-directives.xslt $(saxon) $< lib/extract-cache-directives.xslt > $@ diff --git a/draft-ietf-httpbis-cache-latest.xml b/draft-ietf-httpbis-cache-latest.xml index 9b8042e2a..6fa373c0c 100644 --- a/draft-ietf-httpbis-cache-latest.xml +++ b/draft-ietf-httpbis-cache-latest.xml @@ -30,7 +30,7 @@ + obsoletes="7234" x:maturity-level="proposed" xmlns:x="http://purl.org/net/xml2rfc/ext" xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'> @@ -431,17 +431,10 @@ the cache complies with the client requirements in . - When combining the new response with one or more stored responses, a - cache &MUST;: - - delete any Warning header fields in the stored response - with warn-code 1xx (see ); - retain any Warning header fields in the stored response - with warn-code 2xx; and, - use other header fields provided in the new response, aside - from Content-Range, to replace all instances of the - corresponding header fields in the stored response. - + When combining the new response with one or more stored responses, a cache + &MUST; use the header fields provided in the new response, aside from + Content-Range, to replace all instances of the + corresponding header fields in the stored response. @@ -722,12 +715,6 @@ expiration value that is no more than some fraction of the interval since that time. A typical setting of this fraction might be 10%. - - When a heuristic is used to calculate freshness lifetime, a cache &SHOULD; - generate a Warning header field with a 113 warn-code (see - ) in the response if its current_age is more than - 24 hours and such a warning is not already present. -