diff --git a/Overview.html b/Overview.html index 8df194767..96a7b9f87 100644 --- a/Overview.html +++ b/Overview.html @@ -3329,12 +3329,29 @@

5.5 HTTP-network

  • Let response be null.

  • -

    If httpRequest's - cache mode is neither - "no-store" nor "reload", and there is a complete - response in the HTTP cache for - httpRequest run these substeps: - +

    If httpRequest's cache mode is + "default", then follow the normal procedures to determine whether the + HTTP cache has a response for httpRequest. + +

    Including taking into account any + `Cache-Control` and `Pragma` + headers. + +

    If there is such a response, then set response + to it. Otherwise, if necessary, modify httpRequest's + header list with revalidation or resume + headers. + + +

    Unfortunately this is vaguer than intended. The HTTP cache specification does not + provide the necessary hooks to make this (or indeed, what follows) crystal clear. + + +

  • +

    Otherwise, if httpRequest's cache mode + is neither "no-store" nor "reload", and there is a + complete response in the HTTP cache for + httpRequest, then run these substeps:

    1. @@ -3347,28 +3364,19 @@

      5.5 HTTP-network header into account.

    2. Otherwise, if httpRequest's - cache mode is "default" and the - response in the HTTP cache for httpRequest does - not require revalidation, then set response to that - response. - - -

    3. Otherwise, if httpRequest's - cache mode is either "default" - or "no-cache", modify httpRequest's - header list with revalidation - headers. + cache mode is "no-cache", then + modify httpRequest's header list with + revalidation headers.

  • Otherwise, if httpRequest's - cache mode is either - "default" or "force-cache", and there is a - partial response in the HTTP cache for - httpRequest, modify httpRequest's + cache mode is "force-cache", and + there is a partial response in the HTTP cache for + httpRequest, then modify httpRequest's header list with resume headers. - +

  • If response is null, run these substeps: diff --git a/Overview.src.html b/Overview.src.html index 06821720a..7acc5e558 100644 --- a/Overview.src.html +++ b/Overview.src.html @@ -3257,12 +3257,29 @@

    HTTP-network-or-cache fetch

  • Let response be null.

  • -

    If httpRequest's - cache mode is neither - "no-store" nor "reload", and there is a complete - response in the HTTP cache for - httpRequest run these substeps: - +

    If httpRequest's cache mode is + "default", then follow the normal procedures to determine whether the + HTTP cache has a response for httpRequest. + +

    Including taking into account any + `Cache-Control` and `Pragma` + headers. + +

    If there is such a response, then set response + to it. Otherwise, if necessary, modify httpRequest's + header list with revalidation or resume + headers. + + +

    Unfortunately this is vaguer than intended. The HTTP cache specification does not + provide the necessary hooks to make this (or indeed, what follows) crystal clear. + + +

  • +

    Otherwise, if httpRequest's cache mode + is neither "no-store" nor "reload", and there is a + complete response in the HTTP cache for + httpRequest, then run these substeps:

    1. @@ -3275,28 +3292,19 @@

      HTTP-network-or-cache fetch

      header into account.

    2. Otherwise, if httpRequest's - cache mode is "default" and the - response in the HTTP cache for httpRequest does - not require revalidation, then set response to that - response. - - -

    3. Otherwise, if httpRequest's - cache mode is either "default" - or "no-cache", modify httpRequest's - header list with revalidation - headers. + cache mode is "no-cache", then + modify httpRequest's header list with + revalidation headers.

  • Otherwise, if httpRequest's - cache mode is either - "default" or "force-cache", and there is a - partial response in the HTTP cache for - httpRequest, modify httpRequest's + cache mode is "force-cache", and + there is a partial response in the HTTP cache for + httpRequest, then modify httpRequest's header list with resume headers. - +

  • If response is null, run these substeps: