Changeset 932

Timestamp:

24/07/10 14:52:23 (12 years ago)

Author:

mnot@…

Message:

Clean up TODOs and prose in "Combining Responses."

File:

• draft-ietf-httpbis/latest/p6-cache.xml (modified) (3 diffs)

draft-ietf-httpbis/latest/p6-cache.xml

@@ -898 +898 @@
   When a cache receives a 304 (Not Modified) response or a 206 (Partial Content) response
   (in this section, the "new" response"), it needs to created an updated response by combining
-  the stored response with the new one, so that the updated response can be used to satisfy the request.
+  the stored response with the new one, so that the updated response can be used to satisfy 
+  the request, and potentially update the cached response.
 </t>
 <t>
   If the new response contains an ETag, it identifies the stored  
   response to use. <cref anchor="TODO-mention-CL">might need language about Content-Location  
-  here</cref>
-</t>
-<t>
-  If the status code is 206 (partial content), both the stored and new  
+  here</cref><cref anchor="TODO-select-for-combine">Shouldn't this be the selected response?</cref>
+</t>
+<t>
+  If the new response's status code is 206 (partial content), both the stored and new  
   responses &MUST; have validators, and those validators &MUST; match using the strong  
   comparison function (see &weak-and-strong;). Otherwise, the  
@@ -915 +916 @@
   <list style="symbols">
     <t>any stored Warning headers with warn-code 1xx (see <xref target="header.warning" />)
-      &MUST; be deleted from the stored response and the updated response.</t>
-    <t>any stored Warning headers with warn-code 2xx &MUST; be retained in the stored
-      response and the updated response.</t>
-    <t>any headers provided in the new response &MUST; replace the corresponding
-      headers from the stored response.</t>
-  </list>
-</t>
-<t>
-  If a header field-name in the new response matches more than one  
-  header in the stored response, all such stored headers &MUST; be replaced.
-</t>
-<t>
-  The updated response can <cref anchor="TODO-is-req">requirement?</cref> be used to replace the  
-  stored response in cache. In the case of a 206 response, the combined  
-  representation &MAY; be stored.
+      &MUST; be deleted.</t>
+    <t>any stored Warning headers with warn-code 2xx &MUST; be retained.</t>
+    <t>any other headers provided in the new response &MUST; replace all instances of 
+          the corresponding headers from the stored response.</t>
+  </list>
+</t>
+<t>
+  The updated response headers &MUST; be used to replace those of the  
+  stored response in cache (unless the stored response is removed from cache). In the 
+  case of a 206 response, the combined representation &MAY; be stored.
 </t>
 </section>
@@ -2491 +2487 @@
       "Allowing heuristic caching for new status codes"
     </t>
+        <t>
+          Clean up TODOs and prose in "Combining Responses."
+        </t>
   </list>
 </t>