145700 2015-06-05 10:12:38 -0700 Disable the CFNetwork cache in the web process 2015-06-09 03:07:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca cgarcia clopez commit-queue ossy oldest_to_newest 1099838 0 andersca 2015-06-05 10:12:38 -0700 Disable the CFNetwork cache in the web process 1099839 1 254359 andersca 2015-06-05 10:13:10 -0700 Created attachment 254359 Patch 1099840 2 254359 ggaren 2015-06-05 10:14:49 -0700 Comment on attachment 254359 Patch r=me 1099842 3 254359 koivisto 2015-06-05 10:15:55 -0700 Comment on attachment 254359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254359&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp:83 > + printf("cache path is %s\n", networkCachePath.utf8().data()); :| 1099846 4 andersca 2015-06-05 10:20:08 -0700 Committed r185251: <http://trac.webkit.org/changeset/185251> 1099855 5 clopez 2015-06-05 10:48:46 -0700 (In reply to comment #4) > Committed r185251: <http://trac.webkit.org/changeset/185251> This broke the GTK build. ../../Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp:142:73: error: no member named 'diskCacheDirectory' in 'WebKit::WebProcessCreationParameters' WebCore::SoupNetworkSession::defaultSession().clearCache(parameters.diskCacheDirectory); ~~~~~~~~~~ ^ ../../Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp:144:73: error: no member named 'diskCacheDirectory' in 'WebKit::WebProcessCreationParameters' String diskCachePath = WebCore::pathByAppendingComponent(parameters.diskCacheDirectory, "webkit"); ~~~~~~~~~~ ^ 1100175 6 cgarcia 2015-06-07 03:54:35 -0700 This not only disabled the CFNetwork cache, but also the soup cache, because it removed the disk cache directory from the web process creation parameters. We can bring it back as soup only parameters, though. We will eventually disable it too, but I don't think we are ready. 254359 2015-06-05 10:13:10 -0700 2015-06-05 10:14:49 -0700 Patch bug-145700-20150605101248.patch text/plain 14674 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTUxNDU2OWU0YTFjZTQ1 NTllZDk1MDI3YmYwZDdjNTNhYjQ4NmY5ZC4uMDU5MDZkOTZmOTExMWQzMTM5OGNkOWU0MjY1MWQ2 ZWE5ZWQ1Y2ZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE1LTA2LTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgRGlzYWJsZSB0aGUg Q0ZOZXR3b3JrIGNhY2hlIGluIHRoZSB3ZWIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NzAwCisgICAgICAgIHJkYXI6Ly9wcm9ibGVt LzIwMjQzMzQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpvcGVuKToKKyAgICAgICAgKiBTaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMp OiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzOjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nl c3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9y bUluaXRpYWxpemVXZWJQcm9jZXNzKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6Y3JlYXRl TmV3V2ViUHJvY2Vzcyk6IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6V2ViUHJvY2Vzcyk6IERlbGV0ZWQu CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKTogRGVs ZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzczo6cGxhdGZvcm1DbGVhclJlc291cmNlQ2FjaGVzKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3M6OnBsYXRmb3JtU2V0Q2FjaGVNb2RlbCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtVGVybWluYXRlKTogRGVsZXRlZC4KKworMjAxNS0w Ni0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIENv bnNvbGlkYXRlIGRlZmF1bHQgd2Vic2l0ZSBkYXRhIGRpcmVjdG9yeSBjb21wdXRhdGlvbnMKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTY5OAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGVTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0b3JhZ2UuY3BwCmluZGV4IDFlYTA3ZDgwYzM0OWE0NTNlODY1ZWIzYmJmZjk3MzA4 NjM5NjJlYzAuLjFlY2ViNWM4MzNjN2FjYTE4YTM3ODUzNDA5MDMyNzNlMTljY2M1ZjcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0 b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0b3JhZ2UuY3BwCkBAIC04MCw2ICs4MCw4IEBAIHN0ZDo6dW5pcXVlX3B0cjxTdG9y YWdlPiBTdG9yYWdlOjpvcGVuKGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoKQogICAgIEFTU0VSVChS dW5Mb29wOjppc01haW4oKSk7CiAKICAgICBTdHJpbmcgbmV0d29ya0NhY2hlUGF0aCA9IFdlYkNv cmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChjYWNoZVBhdGgsIG5ldHdvcmtDYWNoZVN1YmRp cmVjdG9yeSk7CisgICAgcHJpbnRmKCJjYWNoZSBwYXRoIGlzICVzXG4iLCBuZXR3b3JrQ2FjaGVQ YXRoLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgaWYgKCFXZWJDb3JlOjptYWtlQWxsRGlyZWN0b3Jp ZXMobmV0d29ya0NhY2hlUGF0aCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJldHVy biBzdGQ6OnVuaXF1ZV9wdHI8U3RvcmFnZT4obmV3IFN0b3JhZ2UobmV0d29ya0NhY2hlUGF0aCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuY3BwCmluZGV4IGRkODNmNzMwZGQ3OWEzYmQ2MjNiMTQwMjIwYzRkMGI2NTMxNmRi ZjguLmE3Mjc3NzRhM2JmMTBlYjQ0M2I5MjUyM2EzYzM3ZWExNDMxZDgwZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5j cHAKQEAgLTQwLDggKzQwLDYgQEAgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6V2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycygpCiAgICAgLCBzaG91bGRVc2VGb250U21vb3RoaW5nKHRy dWUpCiAgICAgLCBkZWZhdWx0UmVxdWVzdFRpbWVvdXRJbnRlcnZhbChJTlRfTUFYKQogI2lmIFBM QVRGT1JNKENPQ09BKQotICAgICwgbnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5KDApCi0gICAgLCBu c1VSTENhY2hlRGlza0NhcGFjaXR5KDApCiAgICAgLCBzaG91bGRFbmFibGVLZXJuaW5nQW5kTGln YXR1cmVzQnlEZWZhdWx0KGZhbHNlKQogICAgICwgc2hvdWxkRW5hYmxlSklUKGZhbHNlKQogICAg ICwgc2hvdWxkRW5hYmxlRlRMSklUKGZhbHNlKQpAQCAtNzEsOCArNjksNiBAQCB2b2lkIFdlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5j b2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnlFeHRl bnNpb25IYW5kbGU7CiAgICAgZW5jb2RlciA8PCB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsKICAg ICBlbmNvZGVyIDw8IHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAg IGVuY29kZXIgPDwgZGlza0NhY2hlRGlyZWN0b3J5OwotICAgIGVuY29kZXIgPDwgZGlza0NhY2hl RGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogI2lmIEVOQUJMRShTRUNDT01QX0ZJTFRFUlMpCiAg ICAgZW5jb2RlciA8PCBjb29raWVTdG9yYWdlRGlyZWN0b3J5OwogI2VuZGlmCkBAIC0xMjIsOCAr MTE4LDYgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpB cmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAg ZW5jb2RlciA8PCBwcmVzZW50ZXJBcHBsaWNhdGlvblBpZDsKICAgICBlbmNvZGVyIDw8IGFjY2Vz c2liaWxpdHlFbmhhbmNlZFVzZXJJbnRlcmZhY2VFbmFibGVkOwotICAgIGVuY29kZXIgPDwgbnNV UkxDYWNoZU1lbW9yeUNhcGFjaXR5OwotICAgIGVuY29kZXIgPDwgbnNVUkxDYWNoZURpc2tDYXBh Y2l0eTsKICAgICBlbmNvZGVyIDw8IGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdQb3J0OwogICAgIGVu Y29kZXIgPDwgdWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoOwogICAgIGVuY29kZXIgPDwgdWlQ cm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoRXh0ZW5zaW9uSGFuZGxlOwpAQCAtMTc4LDEwICsxNzIs NiBAQCBib29sIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3Vt ZW50RGVjb2RlciYgZGVjb2RlciwgV2ViUHJvYwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5RXh0 ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3RvcnkpKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9y eUV4dGVuc2lvbkhhbmRsZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKICNpZiBFTkFCTEUoU0VD Q09NUF9GSUxURVJTKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5jb29raWVT dG9yYWdlRGlyZWN0b3J5KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjY4LDEwICsyNTgs NiBAQCBib29sIFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3Vt ZW50RGVjb2RlciYgZGVjb2RlciwgV2ViUHJvYwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmFjY2Vzc2liaWxpdHlFbmhhbmNlZFVzZXJJ bnRlcmZhY2VFbmFibGVkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5Q2FwYWNpdHkpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLm5zVVJMQ2Fj aGVEaXNrQ2FwYWNpdHkpKQotICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVy LmRlY29kZShwYXJhbWV0ZXJzLmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdQb3J0KSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy51aVByb2Nl c3NCdW5kbGVSZXNvdXJjZVBhdGgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVk L1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggNGYzYmM2ZmYwMzg4NmVkYjBjNDAz OTBkMjkyMGRmMmU4OWRmODU5ZS4uYjBjMGIzMmNlMzNmMDQ5MWMwNDVlMDVjMjg4MGFmZWYwYjU4 NTQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycy5oCkBAIC03Miw4ICs3Miw2IEBAIHN0cnVjdCBXZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzIHsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgYXBwbGljYXRpb25D YWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VE aXJlY3Rvcnk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHdlYlNRTERhdGFiYXNlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIFN0cmluZyBkaXNrQ2FjaGVEaXJlY3Rvcnk7Ci0g ICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGRpc2tDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhh bmRsZTsKICNpZiBFTkFCTEUoU0VDQ09NUF9GSUxURVJTKQogICAgIFN0cmluZyBjb29raWVTdG9y YWdlRGlyZWN0b3J5OwogI2VuZGlmCkBAIC0xMzgsOSArMTM2LDYgQEAgc3RydWN0IFdlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMgewogCiAgICAgYm9vbCBhY2Nlc3NpYmlsaXR5RW5oYW5jZWRV c2VySW50ZXJmYWNlRW5hYmxlZDsKIAotICAgIHVpbnQ2NF90IG5zVVJMQ2FjaGVNZW1vcnlDYXBh Y2l0eTsKLSAgICB1aW50NjRfdCBuc1VSTENhY2hlRGlza0NhcGFjaXR5OwotCiAgICAgV2ViQ29y ZTo6TWFjaFNlbmRSaWdodCBhY2NlbGVyYXRlZENvbXBvc2l0aW5nUG9ydDsKIAogICAgIFN0cmlu ZyB1aVByb2Nlc3NCdW5kbGVSZXNvdXJjZVBhdGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCmluZGV4IGRlNzY5MjVjMGQ3 OTgyODgxNjM5OWIxZTBlNDgwOTA3YWQzOTg3MjkuLjJlMzFiZDk5MGFmMmIxZTI5YmIyMmJlMDU0 ZmVkYjBjNzM4ZTQ5MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2Nv YS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCkBAIC0xNzQsMTAgKzE3NCw2IEBAIHZvaWQgV2Vi UHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycyYKICAgICBwYXJhbWV0ZXJzLmFjY2Vzc2liaWxpdHlFbmhhbmNlZFVzZXJJ bnRlcmZhY2VFbmFibGVkID0gZmFsc2U7CiAjZW5kaWYKIAotICAgIE5TVVJMQ2FjaGUgKnVybENh Y2hlID0gW05TVVJMQ2FjaGUgc2hhcmVkVVJMQ2FjaGVdOwotICAgIHBhcmFtZXRlcnMubnNVUkxD YWNoZU1lbW9yeUNhcGFjaXR5ID0gW3VybENhY2hlIG1lbW9yeUNhcGFjaXR5XTsKLSAgICBwYXJh bWV0ZXJzLm5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHkgPSBbdXJsQ2FjaGUgZGlza0NhcGFjaXR5XTsK LQogICAgIHBhcmFtZXRlcnMuc2hvdWxkRW5hYmxlS2VybmluZ0FuZExpZ2F0dXJlc0J5RGVmYXVs dCA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6V2Vi S2l0S2VybmluZ0FuZExpZ2F0dXJlc0VuYWJsZWRCeURlZmF1bHREZWZhdWx0c0tleV07CiAgICAg cGFyYW1ldGVycy5zaG91bGRFbmFibGVKSVQgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNl ckRlZmF1bHRzXSBib29sRm9yS2V5OldlYktpdEpTQ0pJVEVuYWJsZWREZWZhdWx0c0tleV07CiAg ICAgcGFyYW1ldGVycy5zaG91bGRFbmFibGVGVExKSVQgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5k YXJkVXNlckRlZmF1bHRzXSBib29sRm9yS2V5OldlYktpdEpTQ0ZUTEpJVEVuYWJsZWREZWZhdWx0 c0tleV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bv b2wuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRl eCAzYzlkZWYyZmQxYWY2ZTEyOTE5OGQ3ZDJkNWZjMWQzZDFhNGM4YTBlLi4xMDA0NWUyNTg5YjAz MTNlMTRkZDZkYzliY2UxYWFmZDM1MGJiNzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTYxNywxMCArNjE3LDYgQEAgV2ViUHJvY2Vzc1Byb3h5 JiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTmV3V2ViUHJvY2VzcygpCiAgICAgaWYgKCFwYXJhbWV0 ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5LmlzRW1wdHkoKSkKICAgICAgICAgU2FuZGJveEV4 dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMud2Vi U1FMRGF0YWJhc2VEaXJlY3RvcnksIHBhcmFtZXRlcnMud2ViU1FMRGF0YWJhc2VEaXJlY3RvcnlF eHRlbnNpb25IYW5kbGUpOwogCi0gICAgcGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3RvcnkgPSBk aXNrQ2FjaGVEaXJlY3RvcnkoKTsKLSAgICBpZiAoIXBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0 b3J5LmlzRW1wdHkoKSkKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9y UmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5LCBwYXJhbWV0 ZXJzLmRpc2tDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7Ci0KICNpZiBFTkFCTEUoU0VD Q09NUF9GSUxURVJTKQogICAgIHBhcmFtZXRlcnMuY29va2llU3RvcmFnZURpcmVjdG9yeSA9IHRo aXMtPmNvb2tpZVN0b3JhZ2VEaXJlY3RvcnkoKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggMDY5ZWIxZjQwZjI3NDhkNGVhNGU1MGQxYzRhOWIz OTg2YTFhMjU5ZC4uOGMwNjY0OGJlYzgwODM5ZmYxNzQyMTZmZmI0MGQxNTQ0ZDc1NTE3NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC0xNTcsMTAgKzE1Nyw2 IEBAIFdlYlByb2Nlc3M6OldlYlByb2Nlc3MoKQogICAgICwgbV9pbkRpZENsb3NlKGZhbHNlKQog ICAgICwgbV9oYXNTZXRDYWNoZU1vZGVsKGZhbHNlKQogICAgICwgbV9jYWNoZU1vZGVsKENhY2hl TW9kZWxEb2N1bWVudFZpZXdlcikKLSAgICAsIG1fZGlza0NhY2hlSXNEaXNhYmxlZEZvclRlc3Rp bmcoZmFsc2UpCi0jaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgLCBtX2NsZWFyUmVzb3VyY2VDYWNo ZXNEaXNwYXRjaEdyb3VwKDApCi0jZW5kaWYKICAgICAsIG1fZnVsbEtleWJvYXJkQWNjZXNzRW5h YmxlZChmYWxzZSkKICAgICAsIG1fdGV4dENoZWNrZXJTdGF0ZSgpCiAgICAgLCBtX2ljb25EYXRh YmFzZVByb3h5KG5ldyBXZWJJY29uRGF0YWJhc2VQcm94eSh0aGlzKSkKQEAgLTMwMCw3ICsyOTYs NiBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIGlmICghcGFyYW1ldGVycy5hcHBsaWNh dGlvbkNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKICAgICAgICAgQXBwbGljYXRpb25DYWNoZVN0 b3JhZ2U6OnNpbmdsZXRvbigpLnNldENhY2hlRGlyZWN0b3J5KHBhcmFtZXRlcnMuYXBwbGljYXRp b25DYWNoZURpcmVjdG9yeSk7CiAKLSAgICBtX2Rpc2tDYWNoZUlzRGlzYWJsZWRGb3JUZXN0aW5n ID0gcGFyYW1ldGVycy5zaG91bGRVc2VUZXN0aW5nTmV0d29ya1Nlc3Npb247CiAgICAgc2V0Q2Fj aGVNb2RlbChzdGF0aWNfY2FzdDx1aW50MzJfdD4ocGFyYW1ldGVycy5jYWNoZU1vZGVsKSk7CiAK ICAgICBpZiAoIXBhcmFtZXRlcnMubGFuZ3VhZ2VzLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLmgKaW5kZXggZTgyNDFlMzdjNGM2NDZiMDA4MmVjNDdiMGU4NTc0 NGViYjk1YTRlMy4uZmVlOWEwZjI3ZTNmMDc4ZTBiZDU1MTczNDExMWMyMGVkNzdjZTMxMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKQEAgLTMzOCwxMiArMzM4LDEwIEBA IHByaXZhdGU6CiAKICAgICBib29sIG1faGFzU2V0Q2FjaGVNb2RlbDsKICAgICBDYWNoZU1vZGVs IG1fY2FjaGVNb2RlbDsKLSAgICBib29sIG1fZGlza0NhY2hlSXNEaXNhYmxlZEZvclRlc3Rpbmc7 CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0IG1fY29t cG9zaXRpbmdSZW5kZXJTZXJ2ZXJQb3J0OwogICAgIHBpZF90IG1fcHJlc2VudGVyQXBwbGljYXRp b25QaWQ7Ci0gICAgZGlzcGF0Y2hfZ3JvdXBfdCBtX2NsZWFyUmVzb3VyY2VDYWNoZXNEaXNwYXRj aEdyb3VwOwogI2VuZGlmCiAKICAgICBib29sIG1fZnVsbEtleWJvYXJkQWNjZXNzRW5hYmxlZDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv Y29hLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2Eu bW0KaW5kZXggNzZlMjc0NWYyNzAzNTU3OTA4MmIzM2FlMGVmNjdmZjJkMzYyMWU1MC4uZDNlNmRk MzJhOWJjNGIxMTUwY2ZkZmNjNDVkNWU4YzUwZTVmYzM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KQEAgLTk4LDI5ICs5OCwx MSBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtU2V0Q2FjaGVNb2RlbChDYWNoZU1vZGVsIGNh Y2hlTW9kZWwpCiAgICAgbWVtb3J5Q2FjaGUuc2V0Q2FwYWNpdGllcyhjYWNoZU1pbkRlYWRDYXBh Y2l0eSwgY2FjaGVNYXhEZWFkQ2FwYWNpdHksIGNhY2hlVG90YWxDYXBhY2l0eSk7CiAgICAgbWVt b3J5Q2FjaGUuc2V0RGVhZERlY29kZWREYXRhRGVsZXRpb25JbnRlcnZhbChkZWFkRGVjb2RlZERh dGFEZWxldGlvbkludGVydmFsKTsKICAgICBQYWdlQ2FjaGU6OnNpbmdsZXRvbigpLnNldE1heFNp emUocGFnZUNhY2hlU2l6ZSk7Ci0KLSAgICBOU1VSTENhY2hlICpuc3VybENhY2hlID0gW05TVVJM Q2FjaGUgc2hhcmVkVVJMQ2FjaGVdOwotCi0gICAgW25zdXJsQ2FjaGUgc2V0TWVtb3J5Q2FwYWNp dHk6dXJsQ2FjaGVNZW1vcnlDYXBhY2l0eV07Ci0gICAgaWYgKCFtX2Rpc2tDYWNoZUlzRGlzYWJs ZWRGb3JUZXN0aW5nKQotICAgICAgICBbbnN1cmxDYWNoZSBzZXREaXNrQ2FwYWNpdHk6c3RkOjpt YXg8dW5zaWduZWQgbG9uZz4odXJsQ2FjaGVEaXNrQ2FwYWNpdHksIFtuc3VybENhY2hlIGRpc2tD YXBhY2l0eV0pXTsgLy8gRG9uJ3Qgc2hyaW5rIGEgYmlnIGRpc2sgY2FjaGUsIHNpbmNlIHRoYXQg d291bGQgY2F1c2UgY2h1cm4uCiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1DbGVhclJl c291cmNlQ2FjaGVzKFJlc291cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNUb0NsZWFyKQogewotICAg IGlmIChjYWNoZXNUb0NsZWFyID09IEluTWVtb3J5UmVzb3VyY2VDYWNoZXNPbmx5KQotICAgICAg ICByZXR1cm47Ci0KLSAgICAvLyBJZiB3ZSdyZSB1c2luZyB0aGUgbmV0d29yayBwcm9jZXNzIHRo ZW4gaXQgaXMgdGhlIG9ubHkgb25lIHRoYXQgbmVlZHMgdG8gY2xlYXIgdGhlIGRpc2sgY2FjaGUu Ci0gICAgaWYgKHVzZXNOZXR3b3JrUHJvY2VzcygpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBp ZiAoIW1fY2xlYXJSZXNvdXJjZUNhY2hlc0Rpc3BhdGNoR3JvdXApCi0gICAgICAgIG1fY2xlYXJS ZXNvdXJjZUNhY2hlc0Rpc3BhdGNoR3JvdXAgPSBkaXNwYXRjaF9ncm91cF9jcmVhdGUoKTsKLQot ICAgIGRpc3BhdGNoX2dyb3VwX2FzeW5jKG1fY2xlYXJSZXNvdXJjZUNhY2hlc0Rpc3BhdGNoR3Jv dXAsIGRpc3BhdGNoX2dldF9nbG9iYWxfcXVldWUoRElTUEFUQ0hfUVVFVUVfUFJJT1JJVFlfREVG QVVMVCwgMCksIF57Ci0gICAgICAgIFtbTlNVUkxDYWNoZSBzaGFyZWRVUkxDYWNoZV0gcmVtb3Zl QWxsQ2FjaGVkUmVzcG9uc2VzXTsKLSAgICB9KTsKKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMu CiB9CiAKICNpZiBVU0UoQVBQS0lUKQpAQCAtMTQwLDcgKzEyMiw2IEBAIHZvaWQgV2ViUHJvY2Vz czo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzJiYgcGFyCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFt ZXRlcnMudWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoRXh0ZW5zaW9uSGFuZGxlKTsKICAgICBT YW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy53ZWJTUUxEYXRh YmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29u c3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZSk7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBh cmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBTYW5kYm94 RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5tZWRpYUtleVN0b3JhZ2VE aXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogI2lmIFBMQVRGT1JNKElPUykKICAgICBTYW5kYm94 RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5jb29raWVTdG9yYWdlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKQEAgLTE1MywyOCArMTM0LDggQEAgdm9pZCBXZWJQcm9j ZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMmJiBwYXIKICAgICBzZXRTaGFyZWRIVFRQQ29va2llU3RvcmFnZShwYXJhbWV0ZXJzLnVp UHJvY2Vzc0Nvb2tpZVN0b3JhZ2VJZGVudGlmaWVyKTsKICNlbmRpZgogCi0gICAgLy8gRklYTUU6 IE1vc3Qgb2Ygd2hhdCB0aGlzIGZ1bmN0aW9uIGRvZXMgZm9yIGNhY2hlIHNpemUgZ2V0cyBpbW1l ZGlhdGVseSBvdmVycmlkZGVuIGJ5IHNldENhY2hlTW9kZWwoKS4KLSAgICAvLyAtIG1lbW9yeSBj YWNoZSBzaXplIHBhc3NlZCBmcm9tIFVJIHByb2Nlc3MgaXMgYWx3YXlzIGlnbm9yZWQ7Ci0gICAg Ly8gLSBkaXNrIGNhY2hlIHNpemUgcGFzc2VkIGZyb20gVUkgcHJvY2VzcyBpcyBlZmZlY3RpdmVs eSBhIG1pbmltdW0gc2l6ZS4KLSAgICAvLyBPbmUgbm9uLW9idmlvdXMgY29uc3RyYWludCBpcyB0 aGF0IHdlIG5lZWQgdG8gdXNlIC1zZXRTaGFyZWRVUkxDYWNoZTogZXZlbiBpbiB0ZXN0aW5nIG1v ZGUsIHRvIHByZXZlbnQgY3JlYXRpbmcgYSBkZWZhdWx0IG9uZSBvbiBkaXNrIGxhdGVyLCB3aGVu IHNvbWUgb3RoZXIgY29kZSB0b3VjaGVzIHRoZSBjYWNoZS4KLQotICAgIEFTU0VSVCghbV9kaXNr Q2FjaGVJc0Rpc2FibGVkRm9yVGVzdGluZyB8fCAhcGFyYW1ldGVycy5uc1VSTENhY2hlRGlza0Nh cGFjaXR5KTsKLQotI2lmIFBMQVRGT1JNKElPUykKLSAgICBpZiAoIXBhcmFtZXRlcnMudWlQcm9j ZXNzQnVuZGxlSWRlbnRpZmllci5pc051bGwoKSkgewotICAgICAgICBbTlNVUkxDYWNoZSBzZXRT aGFyZWRVUkxDYWNoZTphZG9wdE5TKFtbTlNVUkxDYWNoZSBhbGxvY10KLSAgICAgICAgICAgIF9p bml0V2l0aE1lbW9yeUNhcGFjaXR5OnBhcmFtZXRlcnMubnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5 Ci0gICAgICAgICAgICBkaXNrQ2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlRGlza0NhcGFj aXR5Ci0gICAgICAgICAgICByZWxhdGl2ZVBhdGg6cGFyYW1ldGVycy51aVByb2Nlc3NCdW5kbGVJ ZGVudGlmaWVyXSkuZ2V0KCldOwotICAgIH0KLSNlbHNlCi0gICAgaWYgKCFwYXJhbWV0ZXJzLmRp c2tDYWNoZURpcmVjdG9yeS5pc051bGwoKSkgewotICAgICAgICBbTlNVUkxDYWNoZSBzZXRTaGFy ZWRVUkxDYWNoZTphZG9wdE5TKFtbTlNVUkxDYWNoZSBhbGxvY10KLSAgICAgICAgICAgIGluaXRX aXRoTWVtb3J5Q2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5Q2FwYWNpdHkKLSAg ICAgICAgICAgIGRpc2tDYXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHkK LSAgICAgICAgICAgIGRpc2tQYXRoOnBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5XSkuZ2V0 KCldOwotICAgIH0KLSNlbmRpZgorICAgIGF1dG8gdXJsQ2FjaGUgPSBhZG9wdE5TKFtbTlNVUkxD YWNoZSBhbGxvY10gaW5pdFdpdGhNZW1vcnlDYXBhY2l0eTowIGRpc2tDYXBhY2l0eTowIGRpc2tQ YXRoOm5pbF0pOworICAgIFtOU1VSTENhY2hlIHNldFNoYXJlZFVSTENhY2hlOnVybENhY2hlLmdl dCgpXTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBXZWJDb3JlOjpGb250Q2FjaGU6OnNldEZv bnRXaGl0ZWxpc3QocGFyYW1ldGVycy5mb250V2hpdGVsaXN0KTsKQEAgLTIzMSwxMSArMTkyLDYg QEAgdm9pZCBXZWJQcm9jZXNzOjpzdG9wUnVuTG9vcCgpCiAKIHZvaWQgV2ViUHJvY2Vzczo6cGxh dGZvcm1UZXJtaW5hdGUoKQogewotICAgIGlmIChtX2NsZWFyUmVzb3VyY2VDYWNoZXNEaXNwYXRj aEdyb3VwKSB7Ci0gICAgICAgIGRpc3BhdGNoX2dyb3VwX3dhaXQobV9jbGVhclJlc291cmNlQ2Fj aGVzRGlzcGF0Y2hHcm91cCwgRElTUEFUQ0hfVElNRV9GT1JFVkVSKTsKLSAgICAgICAgZGlzcGF0 Y2hfcmVsZWFzZShtX2NsZWFyUmVzb3VyY2VDYWNoZXNEaXNwYXRjaEdyb3VwKTsKLSAgICAgICAg bV9jbGVhclJlc291cmNlQ2FjaGVzRGlzcGF0Y2hHcm91cCA9IDA7Ci0gICAgfQogfQogCiB2b2lk IFdlYlByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxp emF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycywgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1l dGVycyYgc2FuZGJveFBhcmFtZXRlcnMpCg==