34969 2010-02-16 01:19:14 -0800 [chromium] expose cache-bypass flag in reload() API 2010-02-17 21:38:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 evan webkit-unassigned commit-queue fishd oldest_to_newest 190626 0 evan 2010-02-16 01:19:14 -0800 [chromium] expose endToEnd flag in reload() API 190627 1 48794 evan 2010-02-16 01:20:05 -0800 Created attachment 48794 Patch 190628 2 evan 2010-02-16 01:21:05 -0800 This patch requires a patch on the Chrome side as well. Advice welcome on the best way to land it. 190629 3 evan 2010-02-16 01:36:54 -0800 Chrome-side change: http://codereview.chromium.org/605026/show 190904 4 fishd 2010-02-16 23:16:25 -0800 I'm not sure that "end to end" is the right name here. reload(false) means send Cache-control: max-age=0, which means "end-to-end validation" reload(true) means send Cache-control: no-cache, which means "end-to-end refetch" Both cases are end-to-end in other words. I think the parameter to FrameLoader::reload is similarly misnamed. This is spelled out in section 14.9.4 of RFC 2616. 190940 5 evan 2010-02-17 02:11:27 -0800 Here's the code in FrameLoader: if (loadType == FrameLoadTypeReload) { request.setCachePolicy(ReloadIgnoringCacheData); request.setHTTPHeaderField("Cache-Control", "max-age=0"); } else if (loadType == FrameLoadTypeReloadFromOrigin) { request.setCachePolicy(ReloadIgnoringCacheData); request.setHTTPHeaderField("Cache-Control", "no-cache"); request.setHTTPHeaderField("Pragma", "no-cache"); endToEnd=true causes the second loadtype: loadWithDocumentLoader(loader.get(), endToEndReload ? FrameLoadTypeReloadFromOrigin : FrameLoadTypeReload, 0); You worried about the effects of using ReloadIgnoringCacheData in the the review: "I'm afraid that if it is also setting ReloadIgnoringCacheData that our disk cache will be evicted even for an otherwise conditional request" but I don't know enough about this code to know what the effects of it are. Here's the text of the RFC: End-to-end reload The request includes a "no-cache" cache-control directive or, for compatibility with HTTP/1.0 clients, "Pragma: no-cache". Field names MUST NOT be included with the no-cache directive in a request. The server MUST NOT use a cached copy when responding to such a request. Specific end-to-end revalidation The request includes a "max-age=0" cache-control directive, which forces each cache along the path to the origin server to revalidate its own entry, if any, with the next cache or server. The initial request includes a cache-validating conditional with the client's current validator. Because "end to end reload" is the wording used in the RFC, I can see where the WebKit name came from. But I agree that it is very confusing. From your other mails I saw these suggestions: LOAD_VALIDATE_CACHE / LOAD_BYPASS_CACHE RELOAD_VALIDATING_CACHE / RELOAD_IGNORING_CACHE I will arbitrarily go with ignoreCache and upload another patch. 190947 6 48876 evan 2010-02-17 02:28:26 -0800 Created attachment 48876 https://bugs.webkit.org/show_bug.cgi?id=34969 191114 7 48918 evan 2010-02-17 11:30:29 -0800 Created attachment 48918 https://bugs.webkit.org/show_bug.cgi?id=34969 191115 8 evan 2010-02-17 11:31:25 -0800 Last patch just adds a default arg to reload(), so that this can be rolled into Chrome without needing to synchronize the change Chrome-side. 191290 9 48918 eric 2010-02-17 16:36:53 -0800 Comment on attachment 48918 https://bugs.webkit.org/show_bug.cgi?id=34969 OK. In FrameLoader it appears to be: void reload(bool endToEndReload = false); 191299 10 fishd 2010-02-17 16:54:23 -0800 r=me too 191396 11 48918 commit-queue 2010-02-17 21:38:33 -0800 Comment on attachment 48918 https://bugs.webkit.org/show_bug.cgi?id=34969 Clearing flags on attachment: 48918 Committed r54928: <http://trac.webkit.org/changeset/54928> 191397 12 commit-queue 2010-02-17 21:38:38 -0800 All reviewed patches have been landed. Closing bug. 48794 2010-02-16 01:20:05 -0800 2010-02-17 02:28:20 -0800 Patch bug-34969-20100216102003.patch text/plain 2504 evan ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDJhYjkyZTEuLmZkNGEyNTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTAyLTE2ICBFdmFuIE1hcnRpbiAgPGV2YW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0g ZXhwb3NlIGVuZFRvRW5kIGZsYWcgaW4gcmVsb2FkKCkgQVBJCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDk2OQorCisgICAgICAgIFRoaXMgZmxhZyBp cyB1c2VkIHRvIGZvcmNlIGEgcGFnZSB0byByZWxvYWQgc3VicmVzb3VyY2VzLgorICAgICAgICAo QWthICJzaGlmdC1yZWxvYWQiLikKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAg ICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUlt cGw6OnJlbG9hZCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAyMDEwLTAyLTE0 ICBWYW5nZWxpcyBLb2trZXZpcyAgPHZhbmdlbGlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYkZyYW1lLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKaW5kZXgg YTU2ZTZjYi4uYzIyOGM4OCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJG cmFtZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaApAQCAtMjQxLDcg KzI0MSw4IEBAIHB1YmxpYzoKICAgICAvLyBOYXZpZ2F0aW9uIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogICAgIC8vIFJlbG9hZCB0 aGUgY3VycmVudCBkb2N1bWVudC4KLSAgICB2aXJ0dWFsIHZvaWQgcmVsb2FkKCkgPSAwOworICAg IC8vIFRydWUgfGVuZFRvRW5kfCBmb3JjZXMgYWxsIHN1YnJlc291cmNlcyB0byBiZSByZWxvYWRl ZCBhcyB3ZWxsLgorICAgIHZpcnR1YWwgdm9pZCByZWxvYWQoYm9vbCBlbmRUb0VuZCkgPSAwOwog CiAgICAgLy8gTG9hZCB0aGUgZ2l2ZW4gVVJMLgogICAgIHZpcnR1YWwgdm9pZCBsb2FkUmVxdWVz dChjb25zdCBXZWJVUkxSZXF1ZXN0JikgPSAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCmluZGV4IDJmOTExZjEuLmVkOTQ1YTkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1w bC5jcHAKQEAgLTcxMywxMiArNzEzLDEzIEBAIGJvb2wgV2ViRnJhbWVJbXBsOjppbnNlcnRTdHls ZVRleHQoCiAgICAgcmV0dXJuIHN1Y2Nlc3M7CiB9CiAKLXZvaWQgV2ViRnJhbWVJbXBsOjpyZWxv YWQoKQordm9pZCBXZWJGcmFtZUltcGw6OnJlbG9hZChib29sIGVuZFRvRW5kKQogewogICAgIG1f ZnJhbWUtPmxvYWRlcigpLT5oaXN0b3J5KCktPnNhdmVEb2N1bWVudEFuZFNjcm9sbFN0YXRlKCk7 CiAKICAgICBzdG9wTG9hZGluZygpOyAgLy8gTWFrZSBzdXJlIGV4aXN0aW5nIGFjdGl2aXR5IHN0 b3BzLgotICAgIG1fZnJhbWUtPmxvYWRlcigpLT5yZWxvYWQoKTsKKworICAgIG1fZnJhbWUtPmxv YWRlcigpLT5yZWxvYWQoZW5kVG9FbmQpOwogfQogCiB2b2lkIFdlYkZyYW1lSW1wbDo6bG9hZFJl cXVlc3QoY29uc3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCkKZGlmZiAtLWdpdCBhL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmggYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1l SW1wbC5oCmluZGV4IGNjYmE2ZDQuLjkyZDBmYTkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuaApAQCAtMTAzLDcgKzEwMyw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHY4OjpMb2NhbDx2 ODo6Q29udGV4dD4gbWFpbldvcmxkU2NyaXB0Q29udGV4dCgpIGNvbnN0OwogI2VuZGlmCiAgICAg dmlydHVhbCBib29sIGluc2VydFN0eWxlVGV4dChjb25zdCBXZWJTdHJpbmcmIGNzcywgY29uc3Qg V2ViU3RyaW5nJiBpZCk7Ci0gICAgdmlydHVhbCB2b2lkIHJlbG9hZCgpOworICAgIHZpcnR1YWwg dm9pZCByZWxvYWQoYm9vbCBlbmRUb0VuZCk7CiAgICAgdmlydHVhbCB2b2lkIGxvYWRSZXF1ZXN0 KGNvbnN0IFdlYlVSTFJlcXVlc3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZEhpc3RvcnlJdGVt KGNvbnN0IFdlYkhpc3RvcnlJdGVtJik7CiAgICAgdmlydHVhbCB2b2lkIGxvYWREYXRhKAo= 48876 2010-02-17 02:28:26 -0800 2010-02-17 11:30:23 -0800 https://bugs.webkit.org/show_bug.cgi?id=34969 bug-34969-20100217112825.patch text/plain 2560 evan ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDRjMjdkZGUuLmUzM2M4YTAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTAyLTE2ICBFdmFuIE1hcnRpbiAgPGV2YW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0g ZXhwb3NlIGNhY2hlLWJ5cGFzcyBmbGFnIGluIHJlbG9hZCgpIEFQSQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ5NjkKKworICAgICAgICBUaGlzIGZs YWcgaXMgdXNlZCB0byBmb3JjZSBhIHJlbG9hZCB0byBpZ25vcmUgY2FjaGVzLgorICAgICAgICAo QWthICJzaGlmdC1yZWxvYWQiLikKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAg ICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUlt cGw6OnJlbG9hZCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAyMDEwLTAyLTE1 ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RnJhbWUuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAppbmRleCBhNTZlNmNi Li5jMDZjOWE4IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgK KysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBAIC0yNDEsNyArMjQxLDkg QEAgcHVibGljOgogICAgIC8vIE5hdmlnYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiAgICAgLy8gUmVsb2FkIHRoZSBjdXJy ZW50IGRvY3VtZW50LgotICAgIHZpcnR1YWwgdm9pZCByZWxvYWQoKSA9IDA7CisgICAgLy8gVHJ1 ZSB8aWdub3JlQ2FjaGV8IGV4cGxpY2l0bHkgYnlwYXNzZXMgY2FjaGVzLgorICAgIC8vIEZhbHNl IHxpZ25vcmVDYWNoZXwgcmV2YWxpZGF0ZXMgYW55IGV4aXN0aW5nIGNhY2hlIGVudHJpZXMuCisg ICAgdmlydHVhbCB2b2lkIHJlbG9hZChib29sIGlnbm9yZUNhY2hlKSA9IDA7CiAKICAgICAvLyBM b2FkIHRoZSBnaXZlbiBVUkwuCiAgICAgdmlydHVhbCB2b2lkIGxvYWRSZXF1ZXN0KGNvbnN0IFdl YlVSTFJlcXVlc3QmKSA9IDA7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZy YW1lSW1wbC5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKaW5kZXgg MmY5MTFmMS4uNjY1ZjZhMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFt ZUltcGwuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAt NzEzLDEyICs3MTMsMTMgQEAgYm9vbCBXZWJGcmFtZUltcGw6Omluc2VydFN0eWxlVGV4dCgKICAg ICByZXR1cm4gc3VjY2VzczsKIH0KIAotdm9pZCBXZWJGcmFtZUltcGw6OnJlbG9hZCgpCit2b2lk IFdlYkZyYW1lSW1wbDo6cmVsb2FkKGJvb2wgaWdub3JlQ2FjaGUpCiB7CiAgICAgbV9mcmFtZS0+ bG9hZGVyKCktPmhpc3RvcnkoKS0+c2F2ZURvY3VtZW50QW5kU2Nyb2xsU3RhdGUoKTsKIAogICAg IHN0b3BMb2FkaW5nKCk7ICAvLyBNYWtlIHN1cmUgZXhpc3RpbmcgYWN0aXZpdHkgc3RvcHMuCi0g ICAgbV9mcmFtZS0+bG9hZGVyKCktPnJlbG9hZCgpOworCisgICAgbV9mcmFtZS0+bG9hZGVyKCkt PnJlbG9hZChpZ25vcmVDYWNoZSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVJbXBsOjpsb2FkUmVxdWVz dChjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0KQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGcmFtZUltcGwuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBs LmgKaW5kZXggY2NiYTZkNC4uNDYwOGUwNSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5o CkBAIC0xMDMsNyArMTAzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdjg6OkxvY2FsPHY4OjpD b250ZXh0PiBtYWluV29ybGRTY3JpcHRDb250ZXh0KCkgY29uc3Q7CiAjZW5kaWYKICAgICB2aXJ0 dWFsIGJvb2wgaW5zZXJ0U3R5bGVUZXh0KGNvbnN0IFdlYlN0cmluZyYgY3NzLCBjb25zdCBXZWJT dHJpbmcmIGlkKTsKLSAgICB2aXJ0dWFsIHZvaWQgcmVsb2FkKCk7CisgICAgdmlydHVhbCB2b2lk IHJlbG9hZChib29sIGlnbm9yZUNhY2hlKTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZFJlcXVlc3Qo Y29uc3QgV2ViVVJMUmVxdWVzdCYpOwogICAgIHZpcnR1YWwgdm9pZCBsb2FkSGlzdG9yeUl0ZW0o Y29uc3QgV2ViSGlzdG9yeUl0ZW0mKTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZERhdGEoCg== 48918 2010-02-17 11:30:29 -0800 2010-02-17 21:38:33 -0800 https://bugs.webkit.org/show_bug.cgi?id=34969 bug-34969-20100217203027.patch text/plain 2568 evan ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDRjMjdkZGUuLmUzM2M4YTAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDEwLTAyLTE2ICBFdmFuIE1hcnRpbiAgPGV2YW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0g ZXhwb3NlIGNhY2hlLWJ5cGFzcyBmbGFnIGluIHJlbG9hZCgpIEFQSQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ5NjkKKworICAgICAgICBUaGlzIGZs YWcgaXMgdXNlZCB0byBmb3JjZSBhIHJlbG9hZCB0byBpZ25vcmUgY2FjaGVzLgorICAgICAgICAo QWthICJzaGlmdC1yZWxvYWQiLikKKworICAgICAgICAqIHB1YmxpYy9XZWJGcmFtZS5oOgorICAg ICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUlt cGw6OnJlbG9hZCk6CisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5oOgorCiAyMDEwLTAyLTE1 ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RnJhbWUuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAppbmRleCBhNTZlNmNi Li5mMTkzYjllIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgK KysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBAIC0yNDEsNyArMjQxLDkg QEAgcHVibGljOgogICAgIC8vIE5hdmlnYXRpb24gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiAgICAgLy8gUmVsb2FkIHRoZSBjdXJy ZW50IGRvY3VtZW50LgotICAgIHZpcnR1YWwgdm9pZCByZWxvYWQoKSA9IDA7CisgICAgLy8gVHJ1 ZSB8aWdub3JlQ2FjaGV8IGV4cGxpY2l0bHkgYnlwYXNzZXMgY2FjaGVzLgorICAgIC8vIEZhbHNl IHxpZ25vcmVDYWNoZXwgcmV2YWxpZGF0ZXMgYW55IGV4aXN0aW5nIGNhY2hlIGVudHJpZXMuCisg ICAgdmlydHVhbCB2b2lkIHJlbG9hZChib29sIGlnbm9yZUNhY2hlID0gZmFsc2UpID0gMDsKIAog ICAgIC8vIExvYWQgdGhlIGdpdmVuIFVSTC4KICAgICB2aXJ0dWFsIHZvaWQgbG9hZFJlcXVlc3Qo Y29uc3QgV2ViVVJMUmVxdWVzdCYpID0gMDsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNw cAppbmRleCAyZjkxMWYxLi42NjVmNmEzIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCkBAIC03MTMsMTIgKzcxMywxMyBAQCBib29sIFdlYkZyYW1lSW1wbDo6aW5zZXJ0U3R5bGVU ZXh0KAogICAgIHJldHVybiBzdWNjZXNzOwogfQogCi12b2lkIFdlYkZyYW1lSW1wbDo6cmVsb2Fk KCkKK3ZvaWQgV2ViRnJhbWVJbXBsOjpyZWxvYWQoYm9vbCBpZ25vcmVDYWNoZSkKIHsKICAgICBt X2ZyYW1lLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5zYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgp OwogCiAgICAgc3RvcExvYWRpbmcoKTsgIC8vIE1ha2Ugc3VyZSBleGlzdGluZyBhY3Rpdml0eSBz dG9wcy4KLSAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+cmVsb2FkKCk7CisKKyAgICBtX2ZyYW1lLT5s b2FkZXIoKS0+cmVsb2FkKGlnbm9yZUNhY2hlKTsKIH0KIAogdm9pZCBXZWJGcmFtZUltcGw6Omxv YWRSZXF1ZXN0KGNvbnN0IFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QpCmRpZmYgLS1naXQgYS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJG cmFtZUltcGwuaAppbmRleCBjY2JhNmQ0Li40NjA4ZTA1IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJh bWVJbXBsLmgKQEAgLTEwMyw3ICsxMDMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2ODo6TG9j YWw8djg6OkNvbnRleHQ+IG1haW5Xb3JsZFNjcmlwdENvbnRleHQoKSBjb25zdDsKICNlbmRpZgog ICAgIHZpcnR1YWwgYm9vbCBpbnNlcnRTdHlsZVRleHQoY29uc3QgV2ViU3RyaW5nJiBjc3MsIGNv bnN0IFdlYlN0cmluZyYgaWQpOwotICAgIHZpcnR1YWwgdm9pZCByZWxvYWQoKTsKKyAgICB2aXJ0 dWFsIHZvaWQgcmVsb2FkKGJvb2wgaWdub3JlQ2FjaGUpOwogICAgIHZpcnR1YWwgdm9pZCBsb2Fk UmVxdWVzdChjb25zdCBXZWJVUkxSZXF1ZXN0Jik7CiAgICAgdmlydHVhbCB2b2lkIGxvYWRIaXN0 b3J5SXRlbShjb25zdCBXZWJIaXN0b3J5SXRlbSYpOwogICAgIHZpcnR1YWwgdm9pZCBsb2FkRGF0 YSgK