Changeset 188468 in webkit


Ignore:
Timestamp:
Aug 14, 2015, 7:08:59 AM (10 years ago)
Author:
Antti Koivisto
Message:

Cover memory cache subresource validation policy with cache tests
​https://bugs.webkit.org/show_bug.cgi?id=147830

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Existing tests under http/tests/cache/disk-cache currently cover disk and XHR memory cache validation behaviors.
They can be extended to cover the regular subresource policy too.

Add window.internals API to disable CachedRawResource validation behavior. This makes XHR validate like
other resources and allows existing tests (that use XHR) to cover normal subresource policy .

Test results reveal some bugs. For example subresources in memory cache don't respect Vary header.

It is generally bad that we have a separate XHR-and-main-resource validation policy in memory cache. Network cache
doesn't have one.

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::clearTestingOverrides):
(WebCore::FrameLoader::applyShouldOpenExternalURLsPolicyToNewDocumentLoader):

  • loader/FrameLoader.h:

(WebCore::FrameLoader::setOverrideCachePolicyForTesting):
(WebCore::FrameLoader::setOverrideResourceLoadPriorityForTesting):
(WebCore::FrameLoader::setStrictRawResourceValidationPolicyDisabledForTesting):
(WebCore::FrameLoader::isStrictRawResourceValidationPolicyDisabledForTesting):
(WebCore::FrameLoader::provisionalLoadErrorBeingHandledURL):

  • loader/cache/CachedRawResource.h:
  • loader/cache/CachedResource.h:

(WebCore::CachedResource::setLoadFinishTime):
(WebCore::CachedResource::loadFinishTime):
(WebCore::CachedResource::canReuse): Deleted.

Made canReuse non-virtual and removed it from the base. Only CachedRawResource has implementation.

  • loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::determineRevalidationPolicy):

  • testing/Internals.cpp:

(WebCore::Internals::setOverrideResourceLoadPriority):
(WebCore::Internals::setStrictRawResourceValidationPolicyDisabled):
(WebCore::Internals::clearMemoryCache):

  • testing/Internals.h:

LayoutTests:

Add another test round using subresource validation policy.

  • http/tests/cache/disk-cache/disk-cache-204-status-code-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-302-status-code-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-307-status-code-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-404-status-code-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-disable-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-media-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-range-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-request-headers-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-validation-attachment-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-validation-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-vary-expected.txt:
  • http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt:
  • http/tests/cache/disk-cache/resources/cache-test.js:

(loadResourcesWithOptions):
(.):
(runTests):

Location:
trunk
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r188426 r188468  
     12015-08-13  Antti Koivisto  <antti@apple.com>
     2
     3        Cover memory cache subresource validation policy with cache tests
     4        https://bugs.webkit.org/show_bug.cgi?id=147830
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Add another test round using subresource validation policy.
     9
     10        * http/tests/cache/disk-cache/disk-cache-204-status-code-expected.txt:
     11        * http/tests/cache/disk-cache/disk-cache-302-status-code-expected.txt:
     12        * http/tests/cache/disk-cache/disk-cache-307-status-code-expected.txt:
     13        * http/tests/cache/disk-cache/disk-cache-404-status-code-expected.txt:
     14        * http/tests/cache/disk-cache/disk-cache-disable-expected.txt:
     15        * http/tests/cache/disk-cache/disk-cache-media-expected.txt:
     16        * http/tests/cache/disk-cache/disk-cache-range-expected.txt:
     17        * http/tests/cache/disk-cache/disk-cache-request-headers-expected.txt:
     18        * http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.txt:
     19        * http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header-expected.txt:
     20        * http/tests/cache/disk-cache/disk-cache-validation-attachment-expected.txt:
     21        * http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt:
     22        * http/tests/cache/disk-cache/disk-cache-validation-expected.txt:
     23        * http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt:
     24        * http/tests/cache/disk-cache/disk-cache-vary-expected.txt:
     25        * http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt:
     26        * http/tests/cache/disk-cache/resources/cache-test.js:
     27        (loadResourcesWithOptions):
     28        (.):
     29        (runTests):
     30
    1312015-08-13  Joseph Pecoraro  <pecoraro@apple.com>
    232

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-204-status-code-expected.txt

    r188211 r188468  
    2626response source: Memory cache
    2727
     28--------Testing loads through memory cache (subresource behavior)--------
     29response headers: {"Status":"204","Cache-control":"max-age=0"}
     30response source: Network
     31
     32response headers: {"Status":"204","Cache-control":"max-age=100"}
     33response source: Memory cache
     34
     35response headers: {"Status":"204","Last-Modified":"now(-1000)"}
     36response source: Memory cache
     37
    2838PASS successfullyParsed is true
    2939

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-302-status-code-expected.txt

    r188211 r188468  
    2020response source: Network
    2121
     22--------Testing loads through memory cache (subresource behavior)--------
     23response headers: {"Status":"302","Location":"/","Cache-control":"max-age=0"}
     24response source: Network
     25
     26response headers: {"Status":"302","Location":"/","Cache-control":"max-age=100"}
     27response source: Network
     28
    2229PASS successfullyParsed is true
    2330

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-307-status-code-expected.txt

    r188211 r188468  
    4444response source: Memory cache
    4545
     46--------Testing loads through memory cache (subresource behavior)--------
     47response headers: {"Status":"307"}
     48response source: Network
     49
     50response headers: {"Status":"307","Cache-control":"max-age=0"}
     51response source: Network
     52
     53response headers: {"Status":"307","Cache-control":"max-age=100"}
     54response source: Memory cache
     55
     56response headers: {"Status":"307","Expires":"now(0)"}
     57response source: Network
     58
     59response headers: {"Status":"307","Expires":"now(100)"}
     60response source: Memory cache
     61
     62response headers: {"Status":"307","Last-Modified":"now(-1000)"}
     63response source: Memory cache
     64
    4665PASS successfullyParsed is true
    4766

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-404-status-code-expected.txt

    r188211 r188468  
    2626response source: Memory cache
    2727
     28--------Testing loads through memory cache (subresource behavior)--------
     29response headers: {"Status":"404","Cache-control":"max-age=0"}
     30response source: Network
     31
     32response headers: {"Status":"404","Cache-control":"max-age=100"}
     33response source: Memory cache
     34
     35response headers: {"Status":"404","Last-Modified":"now(-1000)"}
     36response source: Memory cache
     37
    2838PASS successfullyParsed is true
    2939

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-disable-expected.txt

    r188211 r188468  
    1313response source: Memory cache
    1414
     15--------Testing loads through memory cache (subresource behavior)--------
     16response headers: {"Cache-control":"max-age=100"}
     17response source: Memory cache
     18
    1519Disabling cache
    1620--------Testing loads from disk cache--------
    … …  
    1923
    2024--------Testing loads through memory cache (XHR behavior)--------
     25response headers: {"Cache-control":"max-age=100"}
     26response source: Memory cache
     27
     28--------Testing loads through memory cache (subresource behavior)--------
    2129response headers: {"Cache-control":"max-age=100"}
    2230response source: Memory cache
    … …  
    3139response source: Memory cache
    3240
     41--------Testing loads through memory cache (subresource behavior)--------
     42response headers: {"Cache-control":"max-age=100"}
     43response source: Memory cache
     44
    3345PASS successfullyParsed is true
    3446

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-media-expected.txt

    r188211 r188468  
    4444response source: Memory cache
    4545
     46--------Testing loads through memory cache (subresource behavior)--------
     47response headers: {"Cache-control":"max-age=0","Content-Type":"text/plain"}
     48response source: Network
     49
     50response headers: {"Cache-control":"max-age=100","Content-Type":"text/plain"}
     51response source: Memory cache
     52
     53response headers: {"Cache-control":"max-age=0","Content-Type":"video/mp4"}
     54response source: Network
     55
     56response headers: {"Cache-control":"max-age=100","Content-Type":"video/mp4"}
     57response source: Memory cache
     58
     59response headers: {"Cache-control":"max-age=0","Content-Type":"audio/mp4"}
     60response source: Network
     61
     62response headers: {"Cache-control":"max-age=100","Content-Type":"audio/mp4"}
     63response source: Memory cache
     64
    4665PASS successfullyParsed is true
    4766

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-range-expected.txt

    r188211 r188468  
    5454response status: 416
    5555
     56--------Testing loads through memory cache (subresource behavior)--------
     57response headers: {"Cache-control":"max-age=100"}
     58response source: Memory cache
     59response status: 200
     60
     61response headers: {"Cache-control":"max-age=0"}
     62response source: Network
     63response status: 200
     64
     65response headers: {"Cache-control":"max-age=100","Range":"bytes=2-4"}
     66response source: Memory cache
     67response status: 206
     68
     69response headers: {"Cache-control":"max-age=0","Range":"bytes=2-4"}
     70response source: Network
     71response status: 206
     72
     73response headers: {"Cache-control":"max-age=100","Range":"bytes=5-7"}
     74response source: Memory cache
     75response status: 416
     76
     77response headers: {"Cache-control":"max-age=0","Range":"bytes=5-7"}
     78response source: Network
     79response status: 416
     80
    5681PASS successfullyParsed is true
    5782

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-request-headers-expected.txt

    r188211 r188468  
    196196response source: Memory cache
    197197
     198--------Testing loads through memory cache (subresource behavior)--------
     199response headers: {"Cache-control":"max-age=0"}
     200response source: Network
     201
     202response headers: {"Cache-control":"max-age=100"}
     203response source: Memory cache
     204
     205response headers: {"Cache-control":"max-age=0"}
     206request headers: {"Cache-control":"no-cache"}
     207response source: Network
     208
     209response headers: {"Cache-control":"max-age=100"}
     210request headers: {"Cache-control":"no-cache"}
     211response source: Memory cache
     212
     213response headers: {"Cache-control":"max-age=0"}
     214request headers: {"Cache-control":"no-store"}
     215response source: Network
     216
     217response headers: {"Cache-control":"max-age=100"}
     218request headers: {"Cache-control":"no-store"}
     219response source: Memory cache
     220
     221response headers: {"Cache-control":"max-age=0"}
     222request headers: {"Cache-control":"no-cache, no-store"}
     223response source: Network
     224
     225response headers: {"Cache-control":"max-age=100"}
     226request headers: {"Cache-control":"no-cache, no-store"}
     227response source: Memory cache
     228
     229response headers: {"Cache-control":"max-age=0"}
     230request headers: {"Cache-control":"max-age=0"}
     231response source: Network
     232
     233response headers: {"Cache-control":"max-age=100"}
     234request headers: {"Cache-control":"max-age=0"}
     235response source: Memory cache
     236
     237response headers: {"Cache-control":"max-age=0"}
     238request headers: {"Cache-control":"no-cache, max-age=0"}
     239response source: Network
     240
     241response headers: {"Cache-control":"max-age=100"}
     242request headers: {"Cache-control":"no-cache, max-age=0"}
     243response source: Memory cache
     244
     245response headers: {"Cache-control":"max-age=0"}
     246request headers: {"Cache-control":"no-store, max-age=0"}
     247response source: Network
     248
     249response headers: {"Cache-control":"max-age=100"}
     250request headers: {"Cache-control":"no-store, max-age=0"}
     251response source: Memory cache
     252
     253response headers: {"Cache-control":"max-age=0"}
     254request headers: {"Cache-control":"no-cache, no-store, max-age=0"}
     255response source: Network
     256
     257response headers: {"Cache-control":"max-age=100"}
     258request headers: {"Cache-control":"no-cache, no-store, max-age=0"}
     259response source: Memory cache
     260
     261response headers: {"Cache-control":"max-age=0"}
     262request headers: {"Cache-control":"max-age=100"}
     263response source: Network
     264
     265response headers: {"Cache-control":"max-age=100"}
     266request headers: {"Cache-control":"max-age=100"}
     267response source: Memory cache
     268
     269response headers: {"Cache-control":"max-age=0"}
     270request headers: {"Cache-control":"no-cache, max-age=100"}
     271response source: Network
     272
     273response headers: {"Cache-control":"max-age=100"}
     274request headers: {"Cache-control":"no-cache, max-age=100"}
     275response source: Memory cache
     276
     277response headers: {"Cache-control":"max-age=0"}
     278request headers: {"Cache-control":"no-store, max-age=100"}
     279response source: Network
     280
     281response headers: {"Cache-control":"max-age=100"}
     282request headers: {"Cache-control":"no-store, max-age=100"}
     283response source: Memory cache
     284
     285response headers: {"Cache-control":"max-age=0"}
     286request headers: {"Cache-control":"no-cache, no-store, max-age=100"}
     287response source: Network
     288
     289response headers: {"Cache-control":"max-age=100"}
     290request headers: {"Cache-control":"no-cache, no-store, max-age=100"}
     291response source: Memory cache
     292
    198293PASS successfullyParsed is true
    199294

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-request-max-stale-expected.txt

    r188211 r188468  
    296296response source: Network
    297297
     298--------Testing loads through memory cache (subresource behavior)--------
     299response headers: {"Cache-control":"max-age=0","ETag":"match"}
     300request headers: {"Cache-control":"max-stale=0"}
     301response source: Memory cache after validation
     302
     303response headers: {"Cache-control":"max-age=100"}
     304request headers: {"Cache-control":"max-stale=0"}
     305response source: Memory cache
     306
     307response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     308request headers: {"Cache-control":"max-stale=0"}
     309response source: Memory cache after validation
     310
     311response headers: {"Cache-control":"max-age=100","Age":"200"}
     312request headers: {"Cache-control":"max-stale=0"}
     313response source: Network
     314
     315response headers: {"Cache-control":"max-age=0","ETag":"match"}
     316request headers: {"Cache-control":"max-stale"}
     317response source: Memory cache after validation
     318
     319response headers: {"Cache-control":"max-age=100"}
     320request headers: {"Cache-control":"max-stale"}
     321response source: Memory cache
     322
     323response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     324request headers: {"Cache-control":"max-stale"}
     325response source: Memory cache after validation
     326
     327response headers: {"Cache-control":"max-age=100","Age":"200"}
     328request headers: {"Cache-control":"max-stale"}
     329response source: Disk cache
     330
     331response headers: {"Cache-control":"max-age=0","ETag":"match"}
     332request headers: {"Cache-control":"max-stale=100"}
     333response source: Memory cache after validation
     334
     335response headers: {"Cache-control":"max-age=100"}
     336request headers: {"Cache-control":"max-stale=100"}
     337response source: Memory cache
     338
     339response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     340request headers: {"Cache-control":"max-stale=100"}
     341response source: Memory cache after validation
     342
     343response headers: {"Cache-control":"max-age=100","Age":"200"}
     344request headers: {"Cache-control":"max-stale=100"}
     345response source: Network
     346
     347response headers: {"Cache-control":"max-age=0","ETag":"match"}
     348request headers: {"Cache-control":"max-stale=0, max-age=0"}
     349response source: Memory cache after validation
     350
     351response headers: {"Cache-control":"max-age=100"}
     352request headers: {"Cache-control":"max-stale=0, max-age=0"}
     353response source: Memory cache
     354
     355response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     356request headers: {"Cache-control":"max-stale=0, max-age=0"}
     357response source: Memory cache after validation
     358
     359response headers: {"Cache-control":"max-age=100","Age":"200"}
     360request headers: {"Cache-control":"max-stale=0, max-age=0"}
     361response source: Network
     362
     363response headers: {"Cache-control":"max-age=0","ETag":"match"}
     364request headers: {"Cache-control":"max-stale, max-age=0"}
     365response source: Memory cache after validation
     366
     367response headers: {"Cache-control":"max-age=100"}
     368request headers: {"Cache-control":"max-stale, max-age=0"}
     369response source: Memory cache
     370
     371response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     372request headers: {"Cache-control":"max-stale, max-age=0"}
     373response source: Memory cache after validation
     374
     375response headers: {"Cache-control":"max-age=100","Age":"200"}
     376request headers: {"Cache-control":"max-stale, max-age=0"}
     377response source: Network
     378
     379response headers: {"Cache-control":"max-age=0","ETag":"match"}
     380request headers: {"Cache-control":"max-stale=100, max-age=0"}
     381response source: Memory cache after validation
     382
     383response headers: {"Cache-control":"max-age=100"}
     384request headers: {"Cache-control":"max-stale=100, max-age=0"}
     385response source: Memory cache
     386
     387response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     388request headers: {"Cache-control":"max-stale=100, max-age=0"}
     389response source: Memory cache after validation
     390
     391response headers: {"Cache-control":"max-age=100","Age":"200"}
     392request headers: {"Cache-control":"max-stale=100, max-age=0"}
     393response source: Network
     394
     395response headers: {"Cache-control":"max-age=0","ETag":"match"}
     396request headers: {"Cache-control":"max-stale=0, max-age=100"}
     397response source: Memory cache after validation
     398
     399response headers: {"Cache-control":"max-age=100"}
     400request headers: {"Cache-control":"max-stale=0, max-age=100"}
     401response source: Memory cache
     402
     403response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     404request headers: {"Cache-control":"max-stale=0, max-age=100"}
     405response source: Memory cache after validation
     406
     407response headers: {"Cache-control":"max-age=100","Age":"200"}
     408request headers: {"Cache-control":"max-stale=0, max-age=100"}
     409response source: Network
     410
     411response headers: {"Cache-control":"max-age=0","ETag":"match"}
     412request headers: {"Cache-control":"max-stale, max-age=100"}
     413response source: Memory cache after validation
     414
     415response headers: {"Cache-control":"max-age=100"}
     416request headers: {"Cache-control":"max-stale, max-age=100"}
     417response source: Memory cache
     418
     419response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     420request headers: {"Cache-control":"max-stale, max-age=100"}
     421response source: Memory cache after validation
     422
     423response headers: {"Cache-control":"max-age=100","Age":"200"}
     424request headers: {"Cache-control":"max-stale, max-age=100"}
     425response source: Disk cache
     426
     427response headers: {"Cache-control":"max-age=0","ETag":"match"}
     428request headers: {"Cache-control":"max-stale=100, max-age=100"}
     429response source: Memory cache after validation
     430
     431response headers: {"Cache-control":"max-age=100"}
     432request headers: {"Cache-control":"max-stale=100, max-age=100"}
     433response source: Memory cache
     434
     435response headers: {"Cache-control":"max-age=0","ETag":"match","Age":"200"}
     436request headers: {"Cache-control":"max-stale=100, max-age=100"}
     437response source: Memory cache after validation
     438
     439response headers: {"Cache-control":"max-age=100","Age":"200"}
     440request headers: {"Cache-control":"max-stale=100, max-age=100"}
     441response source: Network
     442
    298443PASS successfullyParsed is true
    299444

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-revalidation-new-expire-header-expected.txt

    r188211 r188468  
    1515response source: Memory cache after validation
    1616
     17--------Testing loads through memory cache (subresource behavior)--------
     18response headers: {"Expires":"now(0)","ETag":"match"}
     19response's 'Expires' header is overriden by future date in 304 response
     20response source: Memory cache after validation
     21
    1722304 response included an 'Expires' header in the future, so we should not need to revalidate this time.
    1823--------Testing loads from disk cache--------
    … …  
    2631response source: Memory cache
    2732
     33--------Testing loads through memory cache (subresource behavior)--------
     34response headers: {"Expires":"now(0)","ETag":"match"}
     35response's 'Expires' header is overriden by future date in 304 response
     36response source: Memory cache
     37
    2838PASS successfullyParsed is true
    2939

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-attachment-expected.txt

    r188211 r188468  
    4444response source: Memory cache
    4545
     46--------Testing loads through memory cache (subresource behavior)--------
     47response headers: undefined
     48response source: Network
     49
     50response headers: {"Cache-control":"max-age=0"}
     51response source: Network
     52
     53response headers: {"Cache-control":"max-age=100"}
     54response source: Memory cache
     55
     56response headers: {"Content-Disposition":"attachment; filename=\"f.txt\""}
     57response source: Network
     58
     59response headers: {"Cache-control":"max-age=0","Content-Disposition":"attachment; filename=\"f.txt\""}
     60response source: Network
     61
     62response headers: {"Cache-control":"max-age=100","Content-Disposition":"attachment; filename=\"f.txt\""}
     63response source: Memory cache
     64
    4665PASS successfullyParsed is true
    4766

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-back-navigation-policy-expected.txt

    r188211 r188468  
    332332response source: Network
    333333
     334--------Testing loads through memory cache (subresource behavior)--------
     335response headers: undefined
     336response source: Network
     337
     338response headers: {"Cache-control":"max-age=0"}
     339response source: Network
     340
     341response headers: {"Cache-control":"max-age=100"}
     342response source: Memory cache
     343
     344response headers: {"Cache-control":"no-store"}
     345response source: Network
     346
     347response headers: {"Cache-control":"max-age=0, no-store"}
     348response source: Network
     349
     350response headers: {"Cache-control":"max-age=100, no-store"}
     351response source: Network
     352
     353response headers: {"Cache-control":"no-cache"}
     354response source: Network
     355
     356response headers: {"Cache-control":"max-age=0, no-cache"}
     357response source: Network
     358
     359response headers: {"Cache-control":"max-age=100, no-cache"}
     360response source: Network
     361
     362response headers: {"ETag":"match"}
     363response source: Memory cache after validation
     364
     365response headers: {"Cache-control":"max-age=0","ETag":"match"}
     366response source: Memory cache after validation
     367
     368response headers: {"Cache-control":"max-age=100","ETag":"match"}
     369response source: Memory cache
     370
     371response headers: {"Cache-control":"no-store","ETag":"match"}
     372response source: Network
     373
     374response headers: {"Cache-control":"max-age=0, no-store","ETag":"match"}
     375response source: Network
     376
     377response headers: {"Cache-control":"max-age=100, no-store","ETag":"match"}
     378response source: Network
     379
     380response headers: {"Cache-control":"no-cache","ETag":"match"}
     381response source: Memory cache after validation
     382
     383response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match"}
     384response source: Memory cache after validation
     385
     386response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match"}
     387response source: Memory cache after validation
     388
     389response headers: {"ETag":"nomatch"}
     390response source: Network
     391
     392response headers: {"Cache-control":"max-age=0","ETag":"nomatch"}
     393response source: Network
     394
     395response headers: {"Cache-control":"max-age=100","ETag":"nomatch"}
     396response source: Memory cache
     397
     398response headers: {"Cache-control":"no-store","ETag":"nomatch"}
     399response source: Network
     400
     401response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch"}
     402response source: Network
     403
     404response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch"}
     405response source: Network
     406
     407response headers: {"Cache-control":"no-cache","ETag":"nomatch"}
     408response source: Network
     409
     410response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch"}
     411response source: Network
     412
     413response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch"}
     414response source: Network
     415
     416response headers: {"Cache-control":"must-revalidate"}
     417response source: Network
     418
     419response headers: {"Cache-control":"max-age=0, must-revalidate"}
     420response source: Network
     421
     422response headers: {"Cache-control":"max-age=100, must-revalidate"}
     423response source: Memory cache
     424
     425response headers: {"Cache-control":"no-store, must-revalidate"}
     426response source: Network
     427
     428response headers: {"Cache-control":"max-age=0, no-store, must-revalidate"}
     429response source: Network
     430
     431response headers: {"Cache-control":"max-age=100, no-store, must-revalidate"}
     432response source: Network
     433
     434response headers: {"Cache-control":"no-cache, must-revalidate"}
     435response source: Network
     436
     437response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate"}
     438response source: Network
     439
     440response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate"}
     441response source: Network
     442
     443response headers: {"ETag":"match","Cache-control":"must-revalidate"}
     444response source: Memory cache after validation
     445
     446response headers: {"Cache-control":"max-age=0, must-revalidate","ETag":"match"}
     447response source: Memory cache after validation
     448
     449response headers: {"Cache-control":"max-age=100, must-revalidate","ETag":"match"}
     450response source: Memory cache
     451
     452response headers: {"Cache-control":"no-store, must-revalidate","ETag":"match"}
     453response source: Network
     454
     455response headers: {"Cache-control":"max-age=0, no-store, must-revalidate","ETag":"match"}
     456response source: Network
     457
     458response headers: {"Cache-control":"max-age=100, no-store, must-revalidate","ETag":"match"}
     459response source: Network
     460
     461response headers: {"Cache-control":"no-cache, must-revalidate","ETag":"match"}
     462response source: Memory cache after validation
     463
     464response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate","ETag":"match"}
     465response source: Memory cache after validation
     466
     467response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate","ETag":"match"}
     468response source: Memory cache after validation
     469
     470response headers: {"ETag":"nomatch","Cache-control":"must-revalidate"}
     471response source: Network
     472
     473response headers: {"Cache-control":"max-age=0, must-revalidate","ETag":"nomatch"}
     474response source: Network
     475
     476response headers: {"Cache-control":"max-age=100, must-revalidate","ETag":"nomatch"}
     477response source: Memory cache
     478
     479response headers: {"Cache-control":"no-store, must-revalidate","ETag":"nomatch"}
     480response source: Network
     481
     482response headers: {"Cache-control":"max-age=0, no-store, must-revalidate","ETag":"nomatch"}
     483response source: Network
     484
     485response headers: {"Cache-control":"max-age=100, no-store, must-revalidate","ETag":"nomatch"}
     486response source: Network
     487
     488response headers: {"Cache-control":"no-cache, must-revalidate","ETag":"nomatch"}
     489response source: Network
     490
     491response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate","ETag":"nomatch"}
     492response source: Network
     493
     494response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate","ETag":"nomatch"}
     495response source: Network
     496
    334497Testing high priority resources
    335498
    … …  
    660823response source: Network
    661824
     825--------Testing loads through memory cache (subresource behavior)--------
     826response headers: undefined
     827response source: Disk cache
     828
     829response headers: {"Cache-control":"max-age=0"}
     830response source: Disk cache
     831
     832response headers: {"Cache-control":"max-age=100"}
     833response source: Memory cache
     834
     835response headers: {"Cache-control":"no-store"}
     836response source: Network
     837
     838response headers: {"Cache-control":"max-age=0, no-store"}
     839response source: Network
     840
     841response headers: {"Cache-control":"max-age=100, no-store"}
     842response source: Network
     843
     844response headers: {"Cache-control":"no-cache"}
     845response source: Disk cache
     846
     847response headers: {"Cache-control":"max-age=0, no-cache"}
     848response source: Disk cache
     849
     850response headers: {"Cache-control":"max-age=100, no-cache"}
     851response source: Disk cache
     852
     853response headers: {"ETag":"match"}
     854response source: Memory cache after validation
     855
     856response headers: {"Cache-control":"max-age=0","ETag":"match"}
     857response source: Memory cache after validation
     858
     859response headers: {"Cache-control":"max-age=100","ETag":"match"}
     860response source: Memory cache
     861
     862response headers: {"Cache-control":"no-store","ETag":"match"}
     863response source: Network
     864
     865response headers: {"Cache-control":"max-age=0, no-store","ETag":"match"}
     866response source: Network
     867
     868response headers: {"Cache-control":"max-age=100, no-store","ETag":"match"}
     869response source: Network
     870
     871response headers: {"Cache-control":"no-cache","ETag":"match"}
     872response source: Memory cache after validation
     873
     874response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match"}
     875response source: Memory cache after validation
     876
     877response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match"}
     878response source: Memory cache after validation
     879
     880response headers: {"ETag":"nomatch"}
     881response source: Network
     882
     883response headers: {"Cache-control":"max-age=0","ETag":"nomatch"}
     884response source: Network
     885
     886response headers: {"Cache-control":"max-age=100","ETag":"nomatch"}
     887response source: Memory cache
     888
     889response headers: {"Cache-control":"no-store","ETag":"nomatch"}
     890response source: Network
     891
     892response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch"}
     893response source: Network
     894
     895response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch"}
     896response source: Network
     897
     898response headers: {"Cache-control":"no-cache","ETag":"nomatch"}
     899response source: Network
     900
     901response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch"}
     902response source: Network
     903
     904response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch"}
     905response source: Network
     906
     907response headers: {"Cache-control":"must-revalidate"}
     908response source: Disk cache
     909
     910response headers: {"Cache-control":"max-age=0, must-revalidate"}
     911response source: Disk cache
     912
     913response headers: {"Cache-control":"max-age=100, must-revalidate"}
     914response source: Memory cache
     915
     916response headers: {"Cache-control":"no-store, must-revalidate"}
     917response source: Network
     918
     919response headers: {"Cache-control":"max-age=0, no-store, must-revalidate"}
     920response source: Network
     921
     922response headers: {"Cache-control":"max-age=100, no-store, must-revalidate"}
     923response source: Network
     924
     925response headers: {"Cache-control":"no-cache, must-revalidate"}
     926response source: Disk cache
     927
     928response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate"}
     929response source: Disk cache
     930
     931response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate"}
     932response source: Disk cache
     933
     934response headers: {"ETag":"match","Cache-control":"must-revalidate"}
     935response source: Memory cache after validation
     936
     937response headers: {"Cache-control":"max-age=0, must-revalidate","ETag":"match"}
     938response source: Memory cache after validation
     939
     940response headers: {"Cache-control":"max-age=100, must-revalidate","ETag":"match"}
     941response source: Memory cache
     942
     943response headers: {"Cache-control":"no-store, must-revalidate","ETag":"match"}
     944response source: Network
     945
     946response headers: {"Cache-control":"max-age=0, no-store, must-revalidate","ETag":"match"}
     947response source: Network
     948
     949response headers: {"Cache-control":"max-age=100, no-store, must-revalidate","ETag":"match"}
     950response source: Network
     951
     952response headers: {"Cache-control":"no-cache, must-revalidate","ETag":"match"}
     953response source: Memory cache after validation
     954
     955response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate","ETag":"match"}
     956response source: Memory cache after validation
     957
     958response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate","ETag":"match"}
     959response source: Memory cache after validation
     960
     961response headers: {"ETag":"nomatch","Cache-control":"must-revalidate"}
     962response source: Network
     963
     964response headers: {"Cache-control":"max-age=0, must-revalidate","ETag":"nomatch"}
     965response source: Network
     966
     967response headers: {"Cache-control":"max-age=100, must-revalidate","ETag":"nomatch"}
     968response source: Memory cache
     969
     970response headers: {"Cache-control":"no-store, must-revalidate","ETag":"nomatch"}
     971response source: Network
     972
     973response headers: {"Cache-control":"max-age=0, no-store, must-revalidate","ETag":"nomatch"}
     974response source: Network
     975
     976response headers: {"Cache-control":"max-age=100, no-store, must-revalidate","ETag":"nomatch"}
     977response source: Network
     978
     979response headers: {"Cache-control":"no-cache, must-revalidate","ETag":"nomatch"}
     980response source: Network
     981
     982response headers: {"Cache-control":"max-age=0, no-cache, must-revalidate","ETag":"nomatch"}
     983response source: Network
     984
     985response headers: {"Cache-control":"max-age=100, no-cache, must-revalidate","ETag":"nomatch"}
     986response source: Network
     987
    662988PASS successfullyParsed is true
    663989

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-expected.txt

    r188214 r188468  
    494494response source: Network
    495495
     496--------Testing loads through memory cache (subresource behavior)--------
     497response headers: undefined
     498response source: Network
     499
     500response headers: {"Cache-control":"max-age=0"}
     501response source: Network
     502
     503response headers: {"Cache-control":"max-age=100"}
     504response source: Memory cache
     505
     506response headers: {"Expires":"now(0)"}
     507response source: Network
     508
     509response headers: {"Cache-control":"max-age=0","Expires":"now(0)"}
     510response source: Network
     511
     512response headers: {"Cache-control":"max-age=100","Expires":"now(0)"}
     513response source: Memory cache
     514
     515response headers: {"Expires":"now(100)"}
     516response source: Memory cache
     517
     518response headers: {"Cache-control":"max-age=0","Expires":"now(100)"}
     519response source: Network
     520
     521response headers: {"Cache-control":"max-age=100","Expires":"now(100)"}
     522response source: Memory cache
     523
     524response headers: {"Cache-control":"no-store"}
     525response source: Network
     526
     527response headers: {"Cache-control":"max-age=0, no-store"}
     528response source: Network
     529
     530response headers: {"Cache-control":"max-age=100, no-store"}
     531response source: Network
     532
     533response headers: {"Expires":"now(0)","Cache-control":"no-store"}
     534response source: Network
     535
     536response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)"}
     537response source: Network
     538
     539response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)"}
     540response source: Network
     541
     542response headers: {"Expires":"now(100)","Cache-control":"no-store"}
     543response source: Network
     544
     545response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)"}
     546response source: Network
     547
     548response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)"}
     549response source: Network
     550
     551response headers: {"Cache-control":"no-cache"}
     552response source: Network
     553
     554response headers: {"Cache-control":"max-age=0, no-cache"}
     555response source: Network
     556
     557response headers: {"Cache-control":"max-age=100, no-cache"}
     558response source: Network
     559
     560response headers: {"Expires":"now(0)","Cache-control":"no-cache"}
     561response source: Network
     562
     563response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)"}
     564response source: Network
     565
     566response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)"}
     567response source: Network
     568
     569response headers: {"Expires":"now(100)","Cache-control":"no-cache"}
     570response source: Network
     571
     572response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)"}
     573response source: Network
     574
     575response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)"}
     576response source: Network
     577
     578response headers: {"ETag":"match"}
     579response source: Memory cache after validation
     580
     581response headers: {"Cache-control":"max-age=0","ETag":"match"}
     582response source: Memory cache after validation
     583
     584response headers: {"Cache-control":"max-age=100","ETag":"match"}
     585response source: Memory cache
     586
     587response headers: {"Expires":"now(0)","ETag":"match"}
     588response source: Memory cache after validation
     589
     590response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"match"}
     591response source: Memory cache after validation
     592
     593response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"match"}
     594response source: Memory cache
     595
     596response headers: {"Expires":"now(100)","ETag":"match"}
     597response source: Memory cache
     598
     599response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"match"}
     600response source: Memory cache after validation
     601
     602response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"match"}
     603response source: Memory cache
     604
     605response headers: {"Cache-control":"no-store","ETag":"match"}
     606response source: Network
     607
     608response headers: {"Cache-control":"max-age=0, no-store","ETag":"match"}
     609response source: Network
     610
     611response headers: {"Cache-control":"max-age=100, no-store","ETag":"match"}
     612response source: Network
     613
     614response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"match"}
     615response source: Network
     616
     617response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"match"}
     618response source: Network
     619
     620response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"match"}
     621response source: Network
     622
     623response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"match"}
     624response source: Network
     625
     626response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"match"}
     627response source: Network
     628
     629response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"match"}
     630response source: Network
     631
     632response headers: {"Cache-control":"no-cache","ETag":"match"}
     633response source: Memory cache after validation
     634
     635response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match"}
     636response source: Memory cache after validation
     637
     638response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match"}
     639response source: Memory cache after validation
     640
     641response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"match"}
     642response source: Memory cache after validation
     643
     644response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"match"}
     645response source: Memory cache after validation
     646
     647response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"match"}
     648response source: Memory cache after validation
     649
     650response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"match"}
     651response source: Memory cache after validation
     652
     653response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"match"}
     654response source: Memory cache after validation
     655
     656response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"match"}
     657response source: Memory cache after validation
     658
     659response headers: {"ETag":"nomatch"}
     660response source: Network
     661
     662response headers: {"Cache-control":"max-age=0","ETag":"nomatch"}
     663response source: Network
     664
     665response headers: {"Cache-control":"max-age=100","ETag":"nomatch"}
     666response source: Memory cache
     667
     668response headers: {"Expires":"now(0)","ETag":"nomatch"}
     669response source: Network
     670
     671response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"nomatch"}
     672response source: Network
     673
     674response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"nomatch"}
     675response source: Memory cache
     676
     677response headers: {"Expires":"now(100)","ETag":"nomatch"}
     678response source: Memory cache
     679
     680response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"nomatch"}
     681response source: Network
     682
     683response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"nomatch"}
     684response source: Memory cache
     685
     686response headers: {"Cache-control":"no-store","ETag":"nomatch"}
     687response source: Network
     688
     689response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch"}
     690response source: Network
     691
     692response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch"}
     693response source: Network
     694
     695response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"nomatch"}
     696response source: Network
     697
     698response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"nomatch"}
     699response source: Network
     700
     701response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"nomatch"}
     702response source: Network
     703
     704response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"nomatch"}
     705response source: Network
     706
     707response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"nomatch"}
     708response source: Network
     709
     710response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"nomatch"}
     711response source: Network
     712
     713response headers: {"Cache-control":"no-cache","ETag":"nomatch"}
     714response source: Network
     715
     716response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch"}
     717response source: Network
     718
     719response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch"}
     720response source: Network
     721
     722response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"nomatch"}
     723response source: Network
     724
     725response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"nomatch"}
     726response source: Network
     727
     728response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"nomatch"}
     729response source: Network
     730
     731response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"nomatch"}
     732response source: Network
     733
     734response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"nomatch"}
     735response source: Network
     736
     737response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"nomatch"}
     738response source: Network
     739
    496740PASS successfullyParsed is true
    497741

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-validation-no-body-expected.txt

    r188216 r188468  
    494494response source: Network
    495495
     496--------Testing loads through memory cache (subresource behavior)--------
     497response headers: undefined
     498response source: Network
     499
     500response headers: {"Cache-control":"max-age=0"}
     501response source: Network
     502
     503response headers: {"Cache-control":"max-age=100"}
     504response source: Memory cache
     505
     506response headers: {"Expires":"now(0)"}
     507response source: Network
     508
     509response headers: {"Cache-control":"max-age=0","Expires":"now(0)"}
     510response source: Network
     511
     512response headers: {"Cache-control":"max-age=100","Expires":"now(0)"}
     513response source: Memory cache
     514
     515response headers: {"Expires":"now(100)"}
     516response source: Memory cache
     517
     518response headers: {"Cache-control":"max-age=0","Expires":"now(100)"}
     519response source: Network
     520
     521response headers: {"Cache-control":"max-age=100","Expires":"now(100)"}
     522response source: Memory cache
     523
     524response headers: {"Cache-control":"no-store"}
     525response source: Network
     526
     527response headers: {"Cache-control":"max-age=0, no-store"}
     528response source: Network
     529
     530response headers: {"Cache-control":"max-age=100, no-store"}
     531response source: Network
     532
     533response headers: {"Expires":"now(0)","Cache-control":"no-store"}
     534response source: Network
     535
     536response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)"}
     537response source: Network
     538
     539response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)"}
     540response source: Network
     541
     542response headers: {"Expires":"now(100)","Cache-control":"no-store"}
     543response source: Network
     544
     545response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)"}
     546response source: Network
     547
     548response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)"}
     549response source: Network
     550
     551response headers: {"Cache-control":"no-cache"}
     552response source: Network
     553
     554response headers: {"Cache-control":"max-age=0, no-cache"}
     555response source: Network
     556
     557response headers: {"Cache-control":"max-age=100, no-cache"}
     558response source: Network
     559
     560response headers: {"Expires":"now(0)","Cache-control":"no-cache"}
     561response source: Network
     562
     563response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)"}
     564response source: Network
     565
     566response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)"}
     567response source: Network
     568
     569response headers: {"Expires":"now(100)","Cache-control":"no-cache"}
     570response source: Network
     571
     572response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)"}
     573response source: Network
     574
     575response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)"}
     576response source: Network
     577
     578response headers: {"ETag":"match"}
     579response source: Memory cache after validation
     580
     581response headers: {"Cache-control":"max-age=0","ETag":"match"}
     582response source: Memory cache after validation
     583
     584response headers: {"Cache-control":"max-age=100","ETag":"match"}
     585response source: Memory cache
     586
     587response headers: {"Expires":"now(0)","ETag":"match"}
     588response source: Memory cache after validation
     589
     590response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"match"}
     591response source: Memory cache after validation
     592
     593response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"match"}
     594response source: Memory cache
     595
     596response headers: {"Expires":"now(100)","ETag":"match"}
     597response source: Memory cache
     598
     599response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"match"}
     600response source: Memory cache after validation
     601
     602response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"match"}
     603response source: Memory cache
     604
     605response headers: {"Cache-control":"no-store","ETag":"match"}
     606response source: Network
     607
     608response headers: {"Cache-control":"max-age=0, no-store","ETag":"match"}
     609response source: Network
     610
     611response headers: {"Cache-control":"max-age=100, no-store","ETag":"match"}
     612response source: Network
     613
     614response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"match"}
     615response source: Network
     616
     617response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"match"}
     618response source: Network
     619
     620response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"match"}
     621response source: Network
     622
     623response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"match"}
     624response source: Network
     625
     626response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"match"}
     627response source: Network
     628
     629response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"match"}
     630response source: Network
     631
     632response headers: {"Cache-control":"no-cache","ETag":"match"}
     633response source: Memory cache after validation
     634
     635response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match"}
     636response source: Memory cache after validation
     637
     638response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match"}
     639response source: Memory cache after validation
     640
     641response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"match"}
     642response source: Memory cache after validation
     643
     644response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"match"}
     645response source: Memory cache after validation
     646
     647response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"match"}
     648response source: Memory cache after validation
     649
     650response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"match"}
     651response source: Memory cache after validation
     652
     653response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"match"}
     654response source: Memory cache after validation
     655
     656response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"match"}
     657response source: Memory cache after validation
     658
     659response headers: {"ETag":"nomatch"}
     660response source: Network
     661
     662response headers: {"Cache-control":"max-age=0","ETag":"nomatch"}
     663response source: Network
     664
     665response headers: {"Cache-control":"max-age=100","ETag":"nomatch"}
     666response source: Memory cache
     667
     668response headers: {"Expires":"now(0)","ETag":"nomatch"}
     669response source: Network
     670
     671response headers: {"Cache-control":"max-age=0","Expires":"now(0)","ETag":"nomatch"}
     672response source: Network
     673
     674response headers: {"Cache-control":"max-age=100","Expires":"now(0)","ETag":"nomatch"}
     675response source: Memory cache
     676
     677response headers: {"Expires":"now(100)","ETag":"nomatch"}
     678response source: Memory cache
     679
     680response headers: {"Cache-control":"max-age=0","Expires":"now(100)","ETag":"nomatch"}
     681response source: Network
     682
     683response headers: {"Cache-control":"max-age=100","Expires":"now(100)","ETag":"nomatch"}
     684response source: Memory cache
     685
     686response headers: {"Cache-control":"no-store","ETag":"nomatch"}
     687response source: Network
     688
     689response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch"}
     690response source: Network
     691
     692response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch"}
     693response source: Network
     694
     695response headers: {"Expires":"now(0)","Cache-control":"no-store","ETag":"nomatch"}
     696response source: Network
     697
     698response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(0)","ETag":"nomatch"}
     699response source: Network
     700
     701response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(0)","ETag":"nomatch"}
     702response source: Network
     703
     704response headers: {"Expires":"now(100)","Cache-control":"no-store","ETag":"nomatch"}
     705response source: Network
     706
     707response headers: {"Cache-control":"max-age=0, no-store","Expires":"now(100)","ETag":"nomatch"}
     708response source: Network
     709
     710response headers: {"Cache-control":"max-age=100, no-store","Expires":"now(100)","ETag":"nomatch"}
     711response source: Network
     712
     713response headers: {"Cache-control":"no-cache","ETag":"nomatch"}
     714response source: Network
     715
     716response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch"}
     717response source: Network
     718
     719response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch"}
     720response source: Network
     721
     722response headers: {"Expires":"now(0)","Cache-control":"no-cache","ETag":"nomatch"}
     723response source: Network
     724
     725response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(0)","ETag":"nomatch"}
     726response source: Network
     727
     728response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(0)","ETag":"nomatch"}
     729response source: Network
     730
     731response headers: {"Expires":"now(100)","Cache-control":"no-cache","ETag":"nomatch"}
     732response source: Network
     733
     734response headers: {"Cache-control":"max-age=0, no-cache","Expires":"now(100)","ETag":"nomatch"}
     735response source: Network
     736
     737response headers: {"Cache-control":"max-age=100, no-cache","Expires":"now(100)","ETag":"nomatch"}
     738response source: Network
     739
    496740PASS successfullyParsed is true
    497741

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-expected.txt

    r188214 r188468  
    440440response source: Network
    441441
     442--------Testing loads through memory cache (subresource behavior)--------
     443response headers: {"Vary":"Accept-Language"}
     444request headers: {"Accept-Language":"en"}
     445response source: Network
     446
     447response headers: {"Cache-control":"max-age=0","Vary":"Accept-Language"}
     448request headers: {"Accept-Language":"en"}
     449response source: Network
     450
     451response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
     452request headers: {"Accept-Language":"en"}
     453response source: Memory cache
     454
     455response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
     456request headers: {"Accept-Language":"en"}
     457response source: Network
     458
     459response headers: {"Cache-control":"max-age=0, no-store","Vary":"Accept-Language"}
     460request headers: {"Accept-Language":"en"}
     461response source: Network
     462
     463response headers: {"Cache-control":"max-age=100, no-store","Vary":"Accept-Language"}
     464request headers: {"Accept-Language":"en"}
     465response source: Network
     466
     467response headers: {"Cache-control":"no-cache","Vary":"Accept-Language"}
     468request headers: {"Accept-Language":"en"}
     469response source: Network
     470
     471response headers: {"Cache-control":"max-age=0, no-cache","Vary":"Accept-Language"}
     472request headers: {"Accept-Language":"en"}
     473response source: Network
     474
     475response headers: {"Cache-control":"max-age=100, no-cache","Vary":"Accept-Language"}
     476request headers: {"Accept-Language":"en"}
     477response source: Network
     478
     479response headers: {"ETag":"match","Vary":"Accept-Language"}
     480request headers: {"Accept-Language":"en"}
     481response source: Memory cache after validation
     482
     483response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
     484request headers: {"Accept-Language":"en"}
     485response source: Memory cache after validation
     486
     487response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
     488request headers: {"Accept-Language":"en"}
     489response source: Memory cache
     490
     491response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
     492request headers: {"Accept-Language":"en"}
     493response source: Network
     494
     495response headers: {"Cache-control":"max-age=0, no-store","ETag":"match","Vary":"Accept-Language"}
     496request headers: {"Accept-Language":"en"}
     497response source: Network
     498
     499response headers: {"Cache-control":"max-age=100, no-store","ETag":"match","Vary":"Accept-Language"}
     500request headers: {"Accept-Language":"en"}
     501response source: Network
     502
     503response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
     504request headers: {"Accept-Language":"en"}
     505response source: Memory cache after validation
     506
     507response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
     508request headers: {"Accept-Language":"en"}
     509response source: Memory cache after validation
     510
     511response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
     512request headers: {"Accept-Language":"en"}
     513response source: Memory cache after validation
     514
     515response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
     516request headers: {"Accept-Language":"en"}
     517response source: Network
     518
     519response headers: {"Cache-control":"max-age=0","ETag":"nomatch","Vary":"Accept-Language"}
     520request headers: {"Accept-Language":"en"}
     521response source: Network
     522
     523response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
     524request headers: {"Accept-Language":"en"}
     525response source: Memory cache
     526
     527response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
     528request headers: {"Accept-Language":"en"}
     529response source: Network
     530
     531response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     532request headers: {"Accept-Language":"en"}
     533response source: Network
     534
     535response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     536request headers: {"Accept-Language":"en"}
     537response source: Network
     538
     539response headers: {"Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     540request headers: {"Accept-Language":"en"}
     541response source: Network
     542
     543response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     544request headers: {"Accept-Language":"en"}
     545response source: Network
     546
     547response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     548request headers: {"Accept-Language":"en"}
     549response source: Network
     550
     551response headers: {"Vary":"Accept-Language"}
     552request headers: {"Accept-Language":"unique()"}
     553response source: Network
     554
     555response headers: {"Cache-control":"max-age=0","Vary":"Accept-Language"}
     556request headers: {"Accept-Language":"unique()"}
     557response source: Network
     558
     559response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
     560request headers: {"Accept-Language":"unique()"}
     561response source: Memory cache
     562
     563response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
     564request headers: {"Accept-Language":"unique()"}
     565response source: Network
     566
     567response headers: {"Cache-control":"max-age=0, no-store","Vary":"Accept-Language"}
     568request headers: {"Accept-Language":"unique()"}
     569response source: Network
     570
     571response headers: {"Cache-control":"max-age=100, no-store","Vary":"Accept-Language"}
     572request headers: {"Accept-Language":"unique()"}
     573response source: Network
     574
     575response headers: {"Cache-control":"no-cache","Vary":"Accept-Language"}
     576request headers: {"Accept-Language":"unique()"}
     577response source: Network
     578
     579response headers: {"Cache-control":"max-age=0, no-cache","Vary":"Accept-Language"}
     580request headers: {"Accept-Language":"unique()"}
     581response source: Network
     582
     583response headers: {"Cache-control":"max-age=100, no-cache","Vary":"Accept-Language"}
     584request headers: {"Accept-Language":"unique()"}
     585response source: Network
     586
     587response headers: {"ETag":"match","Vary":"Accept-Language"}
     588request headers: {"Accept-Language":"unique()"}
     589response source: Memory cache after validation
     590
     591response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
     592request headers: {"Accept-Language":"unique()"}
     593response source: Memory cache after validation
     594
     595response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
     596request headers: {"Accept-Language":"unique()"}
     597response source: Memory cache
     598
     599response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
     600request headers: {"Accept-Language":"unique()"}
     601response source: Network
     602
     603response headers: {"Cache-control":"max-age=0, no-store","ETag":"match","Vary":"Accept-Language"}
     604request headers: {"Accept-Language":"unique()"}
     605response source: Network
     606
     607response headers: {"Cache-control":"max-age=100, no-store","ETag":"match","Vary":"Accept-Language"}
     608request headers: {"Accept-Language":"unique()"}
     609response source: Network
     610
     611response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
     612request headers: {"Accept-Language":"unique()"}
     613response source: Memory cache after validation
     614
     615response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
     616request headers: {"Accept-Language":"unique()"}
     617response source: Memory cache after validation
     618
     619response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
     620request headers: {"Accept-Language":"unique()"}
     621response source: Memory cache after validation
     622
     623response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
     624request headers: {"Accept-Language":"unique()"}
     625response source: Network
     626
     627response headers: {"Cache-control":"max-age=0","ETag":"nomatch","Vary":"Accept-Language"}
     628request headers: {"Accept-Language":"unique()"}
     629response source: Network
     630
     631response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
     632request headers: {"Accept-Language":"unique()"}
     633response source: Memory cache
     634
     635response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
     636request headers: {"Accept-Language":"unique()"}
     637response source: Network
     638
     639response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     640request headers: {"Accept-Language":"unique()"}
     641response source: Network
     642
     643response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     644request headers: {"Accept-Language":"unique()"}
     645response source: Network
     646
     647response headers: {"Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     648request headers: {"Accept-Language":"unique()"}
     649response source: Network
     650
     651response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     652request headers: {"Accept-Language":"unique()"}
     653response source: Network
     654
     655response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     656request headers: {"Accept-Language":"unique()"}
     657response source: Network
     658
    442659PASS successfullyParsed is true
    443660

  • trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-no-body-expected.txt

    r188216 r188468  
    440440response source: Network
    441441
     442--------Testing loads through memory cache (subresource behavior)--------
     443response headers: {"Vary":"Accept-Language"}
     444request headers: {"Accept-Language":"en"}
     445response source: Network
     446
     447response headers: {"Cache-control":"max-age=0","Vary":"Accept-Language"}
     448request headers: {"Accept-Language":"en"}
     449response source: Network
     450
     451response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
     452request headers: {"Accept-Language":"en"}
     453response source: Memory cache
     454
     455response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
     456request headers: {"Accept-Language":"en"}
     457response source: Network
     458
     459response headers: {"Cache-control":"max-age=0, no-store","Vary":"Accept-Language"}
     460request headers: {"Accept-Language":"en"}
     461response source: Network
     462
     463response headers: {"Cache-control":"max-age=100, no-store","Vary":"Accept-Language"}
     464request headers: {"Accept-Language":"en"}
     465response source: Network
     466
     467response headers: {"Cache-control":"no-cache","Vary":"Accept-Language"}
     468request headers: {"Accept-Language":"en"}
     469response source: Network
     470
     471response headers: {"Cache-control":"max-age=0, no-cache","Vary":"Accept-Language"}
     472request headers: {"Accept-Language":"en"}
     473response source: Network
     474
     475response headers: {"Cache-control":"max-age=100, no-cache","Vary":"Accept-Language"}
     476request headers: {"Accept-Language":"en"}
     477response source: Network
     478
     479response headers: {"ETag":"match","Vary":"Accept-Language"}
     480request headers: {"Accept-Language":"en"}
     481response source: Memory cache after validation
     482
     483response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
     484request headers: {"Accept-Language":"en"}
     485response source: Memory cache after validation
     486
     487response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
     488request headers: {"Accept-Language":"en"}
     489response source: Memory cache
     490
     491response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
     492request headers: {"Accept-Language":"en"}
     493response source: Network
     494
     495response headers: {"Cache-control":"max-age=0, no-store","ETag":"match","Vary":"Accept-Language"}
     496request headers: {"Accept-Language":"en"}
     497response source: Network
     498
     499response headers: {"Cache-control":"max-age=100, no-store","ETag":"match","Vary":"Accept-Language"}
     500request headers: {"Accept-Language":"en"}
     501response source: Network
     502
     503response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
     504request headers: {"Accept-Language":"en"}
     505response source: Memory cache after validation
     506
     507response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
     508request headers: {"Accept-Language":"en"}
     509response source: Memory cache after validation
     510
     511response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
     512request headers: {"Accept-Language":"en"}
     513response source: Memory cache after validation
     514
     515response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
     516request headers: {"Accept-Language":"en"}
     517response source: Network
     518
     519response headers: {"Cache-control":"max-age=0","ETag":"nomatch","Vary":"Accept-Language"}
     520request headers: {"Accept-Language":"en"}
     521response source: Network
     522
     523response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
     524request headers: {"Accept-Language":"en"}
     525response source: Memory cache
     526
     527response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
     528request headers: {"Accept-Language":"en"}
     529response source: Network
     530
     531response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     532request headers: {"Accept-Language":"en"}
     533response source: Network
     534
     535response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     536request headers: {"Accept-Language":"en"}
     537response source: Network
     538
     539response headers: {"Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     540request headers: {"Accept-Language":"en"}
     541response source: Network
     542
     543response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     544request headers: {"Accept-Language":"en"}
     545response source: Network
     546
     547response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     548request headers: {"Accept-Language":"en"}
     549response source: Network
     550
     551response headers: {"Vary":"Accept-Language"}
     552request headers: {"Accept-Language":"unique()"}
     553response source: Network
     554
     555response headers: {"Cache-control":"max-age=0","Vary":"Accept-Language"}
     556request headers: {"Accept-Language":"unique()"}
     557response source: Network
     558
     559response headers: {"Cache-control":"max-age=100","Vary":"Accept-Language"}
     560request headers: {"Accept-Language":"unique()"}
     561response source: Memory cache
     562
     563response headers: {"Cache-control":"no-store","Vary":"Accept-Language"}
     564request headers: {"Accept-Language":"unique()"}
     565response source: Network
     566
     567response headers: {"Cache-control":"max-age=0, no-store","Vary":"Accept-Language"}
     568request headers: {"Accept-Language":"unique()"}
     569response source: Network
     570
     571response headers: {"Cache-control":"max-age=100, no-store","Vary":"Accept-Language"}
     572request headers: {"Accept-Language":"unique()"}
     573response source: Network
     574
     575response headers: {"Cache-control":"no-cache","Vary":"Accept-Language"}
     576request headers: {"Accept-Language":"unique()"}
     577response source: Network
     578
     579response headers: {"Cache-control":"max-age=0, no-cache","Vary":"Accept-Language"}
     580request headers: {"Accept-Language":"unique()"}
     581response source: Network
     582
     583response headers: {"Cache-control":"max-age=100, no-cache","Vary":"Accept-Language"}
     584request headers: {"Accept-Language":"unique()"}
     585response source: Network
     586
     587response headers: {"ETag":"match","Vary":"Accept-Language"}
     588request headers: {"Accept-Language":"unique()"}
     589response source: Memory cache after validation
     590
     591response headers: {"Cache-control":"max-age=0","ETag":"match","Vary":"Accept-Language"}
     592request headers: {"Accept-Language":"unique()"}
     593response source: Memory cache after validation
     594
     595response headers: {"Cache-control":"max-age=100","ETag":"match","Vary":"Accept-Language"}
     596request headers: {"Accept-Language":"unique()"}
     597response source: Memory cache
     598
     599response headers: {"Cache-control":"no-store","ETag":"match","Vary":"Accept-Language"}
     600request headers: {"Accept-Language":"unique()"}
     601response source: Network
     602
     603response headers: {"Cache-control":"max-age=0, no-store","ETag":"match","Vary":"Accept-Language"}
     604request headers: {"Accept-Language":"unique()"}
     605response source: Network
     606
     607response headers: {"Cache-control":"max-age=100, no-store","ETag":"match","Vary":"Accept-Language"}
     608request headers: {"Accept-Language":"unique()"}
     609response source: Network
     610
     611response headers: {"Cache-control":"no-cache","ETag":"match","Vary":"Accept-Language"}
     612request headers: {"Accept-Language":"unique()"}
     613response source: Memory cache after validation
     614
     615response headers: {"Cache-control":"max-age=0, no-cache","ETag":"match","Vary":"Accept-Language"}
     616request headers: {"Accept-Language":"unique()"}
     617response source: Memory cache after validation
     618
     619response headers: {"Cache-control":"max-age=100, no-cache","ETag":"match","Vary":"Accept-Language"}
     620request headers: {"Accept-Language":"unique()"}
     621response source: Memory cache after validation
     622
     623response headers: {"ETag":"nomatch","Vary":"Accept-Language"}
     624request headers: {"Accept-Language":"unique()"}
     625response source: Network
     626
     627response headers: {"Cache-control":"max-age=0","ETag":"nomatch","Vary":"Accept-Language"}
     628request headers: {"Accept-Language":"unique()"}
     629response source: Network
     630
     631response headers: {"Cache-control":"max-age=100","ETag":"nomatch","Vary":"Accept-Language"}
     632request headers: {"Accept-Language":"unique()"}
     633response source: Memory cache
     634
     635response headers: {"Cache-control":"no-store","ETag":"nomatch","Vary":"Accept-Language"}
     636request headers: {"Accept-Language":"unique()"}
     637response source: Network
     638
     639response headers: {"Cache-control":"max-age=0, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     640request headers: {"Accept-Language":"unique()"}
     641response source: Network
     642
     643response headers: {"Cache-control":"max-age=100, no-store","ETag":"nomatch","Vary":"Accept-Language"}
     644request headers: {"Accept-Language":"unique()"}
     645response source: Network
     646
     647response headers: {"Cache-control":"no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     648request headers: {"Accept-Language":"unique()"}
     649response source: Network
     650
     651response headers: {"Cache-control":"max-age=0, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     652request headers: {"Accept-Language":"unique()"}
     653response source: Network
     654
     655response headers: {"Cache-control":"max-age=100, no-cache","ETag":"nomatch","Vary":"Accept-Language"}
     656request headers: {"Accept-Language":"unique()"}
     657response source: Network
     658
    442659PASS successfullyParsed is true
    443660

  • trunk/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js

    r188211 r188468  
    7474    if (options["ClearMemoryCache"])
    7575        internals.clearMemoryCache();
     76    internals.setStrictRawResourceValidationPolicyDisabled(options["SubresourceValidationPolicy"]);
    7677
    7778    var pendingCount = tests.length;
    … …  
    116117                loadResourcesWithOptions(tests, { }, function () {
    117118                    printResults(tests);
    118                     if (completionHandler)
    119                         completionHandler();
    120                     else
    121                         finishJSTest();
     119                    debug("--------Testing loads through memory cache (subresource behavior)--------");
     120                    loadResourcesWithOptions(tests, { "SubresourceValidationPolicy": true }, function () {
     121                        printResults(tests);
     122                        if (completionHandler)
     123                            completionHandler();
     124                        else
     125                            finishJSTest();
     126                    });
    122127                });
    123128            });

  • trunk/Source/WebCore/ChangeLog

    r188443 r188468  
     12015-08-13  Antti Koivisto  <antti@apple.com>
     2
     3        Cover memory cache subresource validation policy with cache tests
     4        https://bugs.webkit.org/show_bug.cgi?id=147830
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Existing tests under http/tests/cache/disk-cache currently cover disk and XHR memory cache validation behaviors.
     9        They can be extended to cover the regular subresource policy too.
     10
     11        Add window.internals API to disable CachedRawResource validation behavior. This makes XHR validate like
     12        other resources and allows existing tests (that use XHR) to cover normal subresource policy .
     13
     14        Test results reveal some bugs. For example subresources in memory cache don't respect Vary header.
     15
     16        It is generally bad that we have a separate XHR-and-main-resource validation policy in memory cache. Network cache
     17        doesn't have one.
     18
     19        * loader/FrameLoader.cpp:
     20        (WebCore::FrameLoader::clearTestingOverrides):
     21        (WebCore::FrameLoader::applyShouldOpenExternalURLsPolicyToNewDocumentLoader):
     22        * loader/FrameLoader.h:
     23        (WebCore::FrameLoader::setOverrideCachePolicyForTesting):
     24        (WebCore::FrameLoader::setOverrideResourceLoadPriorityForTesting):
     25        (WebCore::FrameLoader::setStrictRawResourceValidationPolicyDisabledForTesting):
     26        (WebCore::FrameLoader::isStrictRawResourceValidationPolicyDisabledForTesting):
     27        (WebCore::FrameLoader::provisionalLoadErrorBeingHandledURL):
     28        * loader/cache/CachedRawResource.h:
     29        * loader/cache/CachedResource.h:
     30        (WebCore::CachedResource::setLoadFinishTime):
     31        (WebCore::CachedResource::loadFinishTime):
     32        (WebCore::CachedResource::canReuse): Deleted.
     33
     34            Made canReuse non-virtual and removed it from the base. Only CachedRawResource has implementation.
     35
     36        * loader/cache/CachedResourceLoader.cpp:
     37        (WebCore::CachedResourceLoader::determineRevalidationPolicy):
     38        * testing/Internals.cpp:
     39        (WebCore::Internals::setOverrideResourceLoadPriority):
     40        (WebCore::Internals::setStrictRawResourceValidationPolicyDisabled):
     41        (WebCore::Internals::clearMemoryCache):
     42        * testing/Internals.h:
     43
    1442015-08-13  Tim Horton  <timothy_horton@apple.com>
    245

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r188386 r188468  
    34683468    m_overrideCachePolicyForTesting = Nullopt;
    34693469    m_overrideResourceLoadPriorityForTesting = Nullopt;
     3470    m_isStrictRawResourceValidationPolicyDisabledForTesting = false;
    34703471}
    34713472

  • trunk/Source/WebCore/loader/FrameLoader.h

    r186005 r188468  
    286286    void setOverrideCachePolicyForTesting(ResourceRequestCachePolicy policy) { m_overrideCachePolicyForTesting = policy; }
    287287    void setOverrideResourceLoadPriorityForTesting(ResourceLoadPriority priority) { m_overrideResourceLoadPriorityForTesting = priority; }
     288    void setStrictRawResourceValidationPolicyDisabledForTesting(bool disabled) { m_isStrictRawResourceValidationPolicyDisabledForTesting = disabled; }
     289    bool isStrictRawResourceValidationPolicyDisabledForTesting() { return m_isStrictRawResourceValidationPolicyDisabledForTesting; }
     290
    288291    WEBCORE_EXPORT void clearTestingOverrides();
    289292
    … …  
    443446    Optional<ResourceRequestCachePolicy> m_overrideCachePolicyForTesting;
    444447    Optional<ResourceLoadPriority> m_overrideResourceLoadPriorityForTesting;
     448    bool m_isStrictRawResourceValidationPolicyDisabledForTesting { false };
    445449
    446450    URL m_previousURL;

  • trunk/Source/WebCore/loader/cache/CachedRawResource.h

    r184069 r188468  
    4747    void clear();
    4848
     49    bool canReuse(const ResourceRequest&) const;
     50
    4951private:
    5052    virtual void didAddClient(CachedResourceClient*) override;
    … …  
    6264    virtual void switchClientsToRevalidatedResource() override;
    6365    virtual bool mayTryReplaceEncodedData() const override { return m_allowEncodedDataReplacement; }
    64 
    65     virtual bool canReuse(const ResourceRequest&) const override;
    6666
    6767    const char* calculateIncrementalDataChunk(SharedBuffer*, unsigned& incrementalDataLength);

  • trunk/Source/WebCore/loader/cache/CachedResource.h

    r188358 r188468  
    253253    double loadFinishTime() const { return m_loadFinishTime; }
    254254
    255     virtual bool canReuse(const ResourceRequest&) const { return true; }
    256 
    257255#if USE(FOUNDATION) || USE(SOUP)
    258256    WEBCORE_EXPORT void tryReplaceEncodedData(SharedBuffer&);

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r188358 r188468  
    697697    }
    698698
    699     if (!existingResource->canReuse(request))
    700         return Reload;
     699    // FIXME: We should use the same cache policy for all resource types. The raw resource policy is overly strict
     700    //        while the normal subresource policy is too loose.
     701    if (existingResource->isMainOrRawResource()) {
     702        bool strictPolicyDisabled = frame()->loader().isStrictRawResourceValidationPolicyDisabledForTesting();
     703        bool canReuseRawResource = strictPolicyDisabled || downcast<CachedRawResource>(*existingResource).canReuse(request);
     704        if (!canReuseRawResource)
     705            return Reload;
     706    }
    701707
    702708    // Conditional requests should have failed canReuse check.

  • trunk/Source/WebCore/testing/Internals.cpp

    r188348 r188468  
    515515}
    516516
     517void Internals::setStrictRawResourceValidationPolicyDisabled(bool disabled)
     518{
     519    frame()->loader().setStrictRawResourceValidationPolicyDisabledForTesting(disabled);
     520}
     521
    517522void Internals::clearMemoryCache()
    518523{

  • trunk/Source/WebCore/testing/Internals.h

    r187588 r188468  
    9898    void setOverrideCachePolicy(const String&);
    9999    void setOverrideResourceLoadPriority(const String&);
     100    void setStrictRawResourceValidationPolicyDisabled(bool);
    100101
    101102    void clearMemoryCache();

  • trunk/Source/WebCore/testing/Internals.idl

    r187588 r188468  
    7979    void setOverrideCachePolicy(CachePolicy policy);
    8080    void setOverrideResourceLoadPriority(ResourceLoadPriority priority);
     81    void setStrictRawResourceValidationPolicyDisabled(boolean disabled);
    8182
    8283    void clearPageCache();
Note: See TracChangeset for help on using the changeset viewer.