199470 2019-07-03 15:30:08 -0700 Make CacheStorage::Engine directory listing operations in a background thread 2019-07-03 18:13:28 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf cdumez cgarcia commit-queue ews-watchlist webkit-bug-importer oldest_to_newest 1550042 0 youennf 2019-07-03 15:30:08 -0700 Make CacheStorage::Engine directory listing operations in a background thread 1550044 1 373423 youennf 2019-07-03 15:33:06 -0700 Created attachment 373423 Patch 1550076 2 373431 youennf 2019-07-03 16:28:04 -0700 Created attachment 373431 Patch 1550081 3 373431 cdumez 2019-07-03 16:35:11 -0700 Comment on attachment 373431 Patch r=me if the bots are happy 1550127 4 373431 commit-queue 2019-07-03 18:10:33 -0700 Comment on attachment 373431 Patch Clearing flags on attachment: 373431 Committed r247125: <https://trac.webkit.org/changeset/247125> 1550128 5 commit-queue 2019-07-03 18:10:34 -0700 All reviewed patches have been landed. Closing bug. 1550134 6 webkit-bug-importer 2019-07-03 18:13:28 -0700 <rdar://problem/52622561> 373423 2019-07-03 15:33:06 -0700 2019-07-03 16:28:03 -0700 Patch bug-199470-20190703153306.patch text/plain 7393 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU1YWQ0MWU5MzM2MmFmOWI2 NWMxOTJkNjE4ZTQxMTZmZWVhOGFjN2UuLmUwNjM5MTA1NTE1OGYyMzJhODA1NGQwMTg1NDNkNWEx OTBhNzc0YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDctMDMgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgQ2FjaGVTdG9yYWdlOjpF bmdpbmUgZGlyZWN0b3J5IGxpc3Rpbmcgb3BlcmF0aW9ucyBpbiBhIGJhY2tncm91bmQgdGhyZWFk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk0NzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhl IGlvIHdvcmsgcXVldWUgdG8gZ2V0IHRoZSBsaXN0IG9mIGRpcmVjdG9yaWVzLgorICAgICAgICBU aGVuIGdvIGJhY2sgdG8gbWFpbiB0aHJlYWQgYW5kIHRyaWdnZXIgY2xlYXIvZmV0Y2ggb3BlcmF0 aW9uIGFzIGN1cnJlbnRseSBkb25lLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUv Q2FjaGVTdG9yYWdlRW5naW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpS ZWFkT3JpZ2luc1Rhc2tDb3VudGVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0 b3JhZ2U6OlJlYWRPcmlnaW5zVGFza0NvdW50ZXI6OlJlYWRPcmlnaW5zVGFza0NvdW50ZXIpOgor ICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6Z2V0RGlyZWN0b3JpZXMpOgor ICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6ZmV0Y2hFbnRyaWVzKToKKyAg ICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OmZldGNoRGlyZWN0b3J5RW50cmll cyk6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5naW5lOjpjbGVhckNhY2hlc0Zv ck9yaWdpbkZyb21EaXNrKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6 OmNsZWFyQ2FjaGVzRm9yT3JpZ2luRnJvbURpcmVjdG9yaWVzKToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaDoKKwogMjAxOS0wNy0wMyAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSXNvbGF0ZSBDYWNoZVN0b3Jh Z2U6OkVuZ2luZSBwYXRoIHdoZW4gaG9wcGluZyB0byBhIGJhY2tncm91bmQgdGhyZWFkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVu Z2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFn ZUVuZ2luZS5jcHAKaW5kZXggYWMzY2RiOTMwNDZjYjU3NDMwODJjMDIxNTg0MGYzZTAxN2IyMzFl NS4uYWRkZjdkZGM1MGNmZDVjMWE5NjU2ZjYxOTgyNDhhNTVlYWM0Yzc2MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5n aW5lLmNwcApAQCAtNDU5LDcgKzQ1OSw3IEBAIHZvaWQgRW5naW5lOjpyZW1vdmVGaWxlKGNvbnN0 IFN0cmluZyYgZmlsZW5hbWUpCiAKIGNsYXNzIFJlYWRPcmlnaW5zVGFza0NvdW50ZXIgOiBwdWJs aWMgUmVmQ291bnRlZDxSZWFkT3JpZ2luc1Rhc2tDb3VudGVyPiB7CiBwdWJsaWM6Ci0gICAgc3Rh dGljIFJlZjxSZWFkT3JpZ2luc1Rhc2tDb3VudGVyPiBjcmVhdGUoV1RGOjpDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjYWxsYmFjaykKKyAgICBz dGF0aWMgUmVmPFJlYWRPcmlnaW5zVGFza0NvdW50ZXI+IGNyZWF0ZShDb21wbGV0aW9uSGFuZGxl cjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjYWxsYmFjaykKICAgICB7CiAg ICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFJlYWRPcmlnaW5zVGFza0NvdW50ZXIoV1RGTW92 ZShjYWxsYmFjaykpKTsKICAgICB9CkBAIC00NzUsMTYgKzQ3NSwzMSBAQCBwdWJsaWM6CiAgICAg fQogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFJlYWRPcmlnaW5zVGFza0NvdW50ZXIoV1RGOjpD b21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjYWxs YmFjaykKKyAgICBleHBsaWNpdCBSZWFkT3JpZ2luc1Rhc2tDb3VudGVyKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhOjpFbnRyeT4pPiYmIGNhbGxiYWNrKQogICAgICAg ICA6IG1fY2FsbGJhY2soV1RGTW92ZShjYWxsYmFjaykpCiAgICAgewogICAgIH0KIAotICAgIFdU Rjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6OkVudHJ5Pik+IG1f Y2FsbGJhY2s7CisgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6 OkVudHJ5Pik+IG1fY2FsbGJhY2s7CiAgICAgVmVjdG9yPFdlYnNpdGVEYXRhOjpFbnRyeT4gbV9l bnRyaWVzOwogfTsKIAotdm9pZCBFbmdpbmU6OmZldGNoRW50cmllcyhib29sIHNob3VsZENvbXB1 dGVTaXplLCBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhOjpF bnRyeT4pPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBFbmdpbmU6OmdldERpcmVjdG9yaWVz KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFN0cmluZz4mKT4mJiBjb21wbGV0 aW9uSGFuZGxlcikKK3sKKyAgICBtX2lvUXVldWUtPmRpc3BhdGNoKFtwYXRoID0gbV9yb290UGF0 aC5pc29sYXRlZENvcHkoKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZm9sZGVyUGF0aHM7 CisgICAgICAgIGZvciAoYXV0byYgZmlsZW5hbWUgOiBGaWxlU3lzdGVtOjpsaXN0RGlyZWN0b3J5 KHBhdGgsICIqIikpIHsKKyAgICAgICAgICAgIGlmIChGaWxlU3lzdGVtOjpmaWxlSXNEaXJlY3Rv cnkoZmlsZW5hbWUsIEZpbGVTeXN0ZW06OlNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6Ok5vKSkK KyAgICAgICAgICAgICAgICBmb2xkZXJQYXRocy5hcHBlbmQoZmlsZW5hbWUpOworICAgICAgICB9 CisKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtmb2xkZXJQYXRocyA9IGZvbGRl clBhdGhzLmlzb2xhdGVkQ29weSgpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpXSgpIG11dGFibGUgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo Zm9sZGVyUGF0aHMpOworICAgICAgICB9KTsKKyAgICB9KTsKK30KKwordm9pZCBFbmdpbmU6OmZl dGNoRW50cmllcyhib29sIHNob3VsZENvbXB1dGVTaXplLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAg ICBpZiAoIXNob3VsZFBlcnNpc3QoKSkgewogICAgICAgICBhdXRvIGVudHJpZXMgPSBXVEY6Om1h cChtX2NhY2hlcywgW10gKGF1dG8mIHBhaXIpIHsKQEAgLTQ5NCwxMCArNTA5LDE3IEBAIHZvaWQg RW5naW5lOjpmZXRjaEVudHJpZXMoYm9vbCBzaG91bGRDb21wdXRlU2l6ZSwgV1RGOjpDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFZlCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBnZXREaXJl Y3RvcmllcyhbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0aGlzKSwgcGF0aCA9IG1fcm9v dFBhdGguaXNvbGF0ZWRDb3B5KCksIHNob3VsZENvbXB1dGVTaXplLCBjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShjb25zdCBhdXRvJiBmb2xkZXJQYXRocykg bXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm4gY29t cGxldGlvbkhhbmRsZXIoeyB9KTsKKyAgICAgICAgZmV0Y2hEaXJlY3RvcnlFbnRyaWVzKHNob3Vs ZENvbXB1dGVTaXplLCBmb2xkZXJQYXRocywgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor ICAgIH0pOworfQorCit2b2lkIEVuZ2luZTo6ZmV0Y2hEaXJlY3RvcnlFbnRyaWVzKGJvb2wgc2hv dWxkQ29tcHV0ZVNpemUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBmb2xkZXJQYXRocywgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6OkVudHJ5Pik+JiYgY29tcGxldGlv bkhhbmRsZXIpCit7CiAgICAgYXV0byB0YXNrQ291bnRlciA9IFJlYWRPcmlnaW5zVGFza0NvdW50 ZXI6OmNyZWF0ZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgZm9yIChhdXRvJiBm b2xkZXJQYXRoIDogRmlsZVN5c3RlbTo6bGlzdERpcmVjdG9yeShtX3Jvb3RQYXRoLCAiKiIpKSB7 Ci0gICAgICAgIGlmICghRmlsZVN5c3RlbTo6ZmlsZUlzRGlyZWN0b3J5KGZvbGRlclBhdGgsIEZp bGVTeXN0ZW06OlNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6Ok5vKSkKLSAgICAgICAgICAgIGNv bnRpbnVlOworICAgIGZvciAoYXV0byYgZm9sZGVyUGF0aCA6IGZvbGRlclBhdGhzKSB7CiAgICAg ICAgIENhY2hlczo6cmV0cmlldmVPcmlnaW5Gcm9tRGlyZWN0b3J5KGZvbGRlclBhdGgsICptX2lv UXVldWUsIFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHNob3VsZENvbXB1dGVTaXpl LCB0YXNrQ291bnRlciA9IHRhc2tDb3VudGVyLmNvcHlSZWYoKV0gKGF1dG8mJiBvcmlnaW4pIG11 dGFibGUgewogICAgICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICAgICAg ICAgIGlmICghb3JpZ2luKQpAQCAtNTY5LDEyICs1OTEsMTcgQEAgdm9pZCBFbmdpbmU6OmNsZWFy Q2FjaGVzRm9yT3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgb3JpZ2lu LCBDb20KIHZvaWQgRW5naW5lOjpjbGVhckNhY2hlc0Zvck9yaWdpbkZyb21EaXNrKGNvbnN0IFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgb3JpZ2luLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigp KTsKKyAgICBnZXREaXJlY3RvcmllcyhbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0aGlz KSwgb3JpZ2luLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XShjb25zdCBhdXRvJiBmb2xkZXJQYXRocykgbXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1Ro aXMpCisgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoKTsKKyAgICAgICAgY2xl YXJDYWNoZXNGb3JPcmlnaW5Gcm9tRGlyZWN0b3JpZXMoZm9sZGVyUGF0aHMsIG9yaWdpbiwgV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIH0pOworfQogCit2b2lkIEVuZ2luZTo6Y2xl YXJDYWNoZXNGb3JPcmlnaW5Gcm9tRGlyZWN0b3JpZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGZv bGRlclBhdGhzLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIG9yaWdpbiwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQorewogICAgIGF1dG8g Y2FsbGJhY2tBZ2dyZWdhdG9yID0gQ2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwotCi0gICAgZm9yIChhdXRvJiBmb2xkZXJQYXRoIDogRmlsZVN5 c3RlbTo6bGlzdERpcmVjdG9yeShtX3Jvb3RQYXRoLCAiKiIpKSB7Ci0gICAgICAgIGlmICghRmls ZVN5c3RlbTo6ZmlsZUlzRGlyZWN0b3J5KGZvbGRlclBhdGgsIEZpbGVTeXN0ZW06OlNob3VsZEZv bGxvd1N5bWJvbGljTGlua3M6Ok5vKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgIGZvciAo YXV0byYgZm9sZGVyUGF0aCA6IGZvbGRlclBhdGhzKSB7CiAgICAgICAgIENhY2hlczo6cmV0cmll dmVPcmlnaW5Gcm9tRGlyZWN0b3J5KGZvbGRlclBhdGgsICptX2lvUXVldWUsIFt0aGlzLCBwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIG9yaWdpbiwgY2FsbGJhY2tBZ2dyZWdhdG9yID0g Y2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKSwgZm9sZGVyUGF0aF0gKE9wdGlvbmFsPFdlYkNv cmU6OkNsaWVudE9yaWdpbj4mJiBmb2xkZXJPcmlnaW4pIG11dGFibGUgewogICAgICAgICAgICAg aWYgKCFmb2xkZXJPcmlnaW4pCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lLmgK aW5kZXggMTc2ODUwMTQ5YWYzZWMxY2U1MTZkYjRlNmMyNjJlZDdiODNiMmRlZS4uOGFhNDczMmEw NDQwZDI3Zjk0Mzk0YjYyNzRhYzQxY2JkMTM0MmY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5oCkBAIC0xMTks NiArMTE5LDEwIEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGZldGNoRW50cmllcyhib29sIC8qIHNo b3VsZENvbXB1dGVTaXplICovLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRl RGF0YTo6RW50cnk+KT4mJik7CiAKKyAgICB2b2lkIGdldERpcmVjdG9yaWVzKENvbXBsZXRpb25I YW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFN0cmluZz4mKT4mJik7CisgICAgdm9pZCBmZXRjaERp cmVjdG9yeUVudHJpZXMoYm9vbCBzaG91bGRDb21wdXRlU2l6ZSwgY29uc3QgVmVjdG9yPFN0cmlu Zz4mIGZvbGRlclBhdGhzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0 YTo6RW50cnk+KT4mJik7CisgICAgdm9pZCBjbGVhckNhY2hlc0Zvck9yaWdpbkZyb21EaXJlY3Rv cmllcyhjb25zdCBWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu RGF0YSYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CisKICAgICB2b2lkIGluaXRpYWxp emUoV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkNvbXBsZXRpb25DYWxsYmFjayYmKTsKIAogICAg IHVzaW5nIENhY2hlc09yRXJyb3IgPSBFeHBlY3RlZDxzdGQ6OnJlZmVyZW5jZV93cmFwcGVyPENh Y2hlcz4sIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpFcnJvcj47Cg== 373431 2019-07-03 16:28:04 -0700 2019-07-03 18:10:33 -0700 Patch bug-199470-20190703162803.patch text/plain 7402 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU1YWQ0MWU5MzM2MmFmOWI2 NWMxOTJkNjE4ZTQxMTZmZWVhOGFjN2UuLmUwNjM5MTA1NTE1OGYyMzJhODA1NGQwMTg1NDNkNWEx OTBhNzc0YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMDctMDMgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgQ2FjaGVTdG9yYWdlOjpF bmdpbmUgZGlyZWN0b3J5IGxpc3Rpbmcgb3BlcmF0aW9ucyBpbiBhIGJhY2tncm91bmQgdGhyZWFk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk0NzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhl IGlvIHdvcmsgcXVldWUgdG8gZ2V0IHRoZSBsaXN0IG9mIGRpcmVjdG9yaWVzLgorICAgICAgICBU aGVuIGdvIGJhY2sgdG8gbWFpbiB0aHJlYWQgYW5kIHRyaWdnZXIgY2xlYXIvZmV0Y2ggb3BlcmF0 aW9uIGFzIGN1cnJlbnRseSBkb25lLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUv Q2FjaGVTdG9yYWdlRW5naW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpS ZWFkT3JpZ2luc1Rhc2tDb3VudGVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpDYWNoZVN0 b3JhZ2U6OlJlYWRPcmlnaW5zVGFza0NvdW50ZXI6OlJlYWRPcmlnaW5zVGFza0NvdW50ZXIpOgor ICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6Z2V0RGlyZWN0b3JpZXMpOgor ICAgICAgICAoV2ViS2l0OjpDYWNoZVN0b3JhZ2U6OkVuZ2luZTo6ZmV0Y2hFbnRyaWVzKToKKyAg ICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6OmZldGNoRGlyZWN0b3J5RW50cmll cyk6CisgICAgICAgIChXZWJLaXQ6OkNhY2hlU3RvcmFnZTo6RW5naW5lOjpjbGVhckNhY2hlc0Zv ck9yaWdpbkZyb21EaXNrKToKKyAgICAgICAgKFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpFbmdpbmU6 OmNsZWFyQ2FjaGVzRm9yT3JpZ2luRnJvbURpcmVjdG9yaWVzKToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaDoKKwogMjAxOS0wNy0wMyAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSXNvbGF0ZSBDYWNoZVN0b3Jh Z2U6OkVuZ2luZSBwYXRoIHdoZW4gaG9wcGluZyB0byBhIGJhY2tncm91bmQgdGhyZWFkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVu Z2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFn ZUVuZ2luZS5jcHAKaW5kZXggYWMzY2RiOTMwNDZjYjU3NDMwODJjMDIxNTg0MGYzZTAxN2IyMzFl NS4uOTgxMTI2MGE5NGNmNmNiZGM2YWUyMmFkMjM5ZDQzZDc0N2RhNzI3ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5n aW5lLmNwcApAQCAtNDU5LDcgKzQ1OSw3IEBAIHZvaWQgRW5naW5lOjpyZW1vdmVGaWxlKGNvbnN0 IFN0cmluZyYgZmlsZW5hbWUpCiAKIGNsYXNzIFJlYWRPcmlnaW5zVGFza0NvdW50ZXIgOiBwdWJs aWMgUmVmQ291bnRlZDxSZWFkT3JpZ2luc1Rhc2tDb3VudGVyPiB7CiBwdWJsaWM6Ci0gICAgc3Rh dGljIFJlZjxSZWFkT3JpZ2luc1Rhc2tDb3VudGVyPiBjcmVhdGUoV1RGOjpDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjYWxsYmFjaykKKyAgICBz dGF0aWMgUmVmPFJlYWRPcmlnaW5zVGFza0NvdW50ZXI+IGNyZWF0ZShDb21wbGV0aW9uSGFuZGxl cjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjYWxsYmFjaykKICAgICB7CiAg ICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFJlYWRPcmlnaW5zVGFza0NvdW50ZXIoV1RGTW92 ZShjYWxsYmFjaykpKTsKICAgICB9CkBAIC00NzUsMTYgKzQ3NSwzMSBAQCBwdWJsaWM6CiAgICAg fQogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFJlYWRPcmlnaW5zVGFza0NvdW50ZXIoV1RGOjpD b21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjYWxs YmFjaykKKyAgICBleHBsaWNpdCBSZWFkT3JpZ2luc1Rhc2tDb3VudGVyKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhOjpFbnRyeT4pPiYmIGNhbGxiYWNrKQogICAgICAg ICA6IG1fY2FsbGJhY2soV1RGTW92ZShjYWxsYmFjaykpCiAgICAgewogICAgIH0KIAotICAgIFdU Rjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6OkVudHJ5Pik+IG1f Y2FsbGJhY2s7CisgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6 OkVudHJ5Pik+IG1fY2FsbGJhY2s7CiAgICAgVmVjdG9yPFdlYnNpdGVEYXRhOjpFbnRyeT4gbV9l bnRyaWVzOwogfTsKIAotdm9pZCBFbmdpbmU6OmZldGNoRW50cmllcyhib29sIHNob3VsZENvbXB1 dGVTaXplLCBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhOjpF bnRyeT4pPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBFbmdpbmU6OmdldERpcmVjdG9yaWVz KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFN0cmluZz4mKT4mJiBjb21wbGV0 aW9uSGFuZGxlcikKK3sKKyAgICBtX2lvUXVldWUtPmRpc3BhdGNoKFtwYXRoID0gbV9yb290UGF0 aC5pc29sYXRlZENvcHkoKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZm9sZGVyUGF0aHM7 CisgICAgICAgIGZvciAoYXV0byYgZmlsZW5hbWUgOiBGaWxlU3lzdGVtOjpsaXN0RGlyZWN0b3J5 KHBhdGgsICIqIikpIHsKKyAgICAgICAgICAgIGlmIChGaWxlU3lzdGVtOjpmaWxlSXNEaXJlY3Rv cnkoZmlsZW5hbWUsIEZpbGVTeXN0ZW06OlNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6Ok5vKSkK KyAgICAgICAgICAgICAgICBmb2xkZXJQYXRocy5hcHBlbmQoZmlsZW5hbWUuaXNvbGF0ZWRDb3B5 KCkpOworICAgICAgICB9CisKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtmb2xk ZXJQYXRocyA9IFdURk1vdmUoZm9sZGVyUGF0aHMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgeworICAgICAgICAgICAgY29tcGxldGlv bkhhbmRsZXIoZm9sZGVyUGF0aHMpOworICAgICAgICB9KTsKKyAgICB9KTsKK30KKwordm9pZCBF bmdpbmU6OmZldGNoRW50cmllcyhib29sIHNob3VsZENvbXB1dGVTaXplLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJiBjb21wbGV0aW9uSGFuZGxl cikKIHsKICAgICBpZiAoIXNob3VsZFBlcnNpc3QoKSkgewogICAgICAgICBhdXRvIGVudHJpZXMg PSBXVEY6Om1hcChtX2NhY2hlcywgW10gKGF1dG8mIHBhaXIpIHsKQEAgLTQ5NCwxMCArNTA5LDE3 IEBAIHZvaWQgRW5naW5lOjpmZXRjaEVudHJpZXMoYm9vbCBzaG91bGRDb21wdXRlU2l6ZSwgV1RG OjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBnZXREaXJlY3RvcmllcyhbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0aGlzKSwgcGF0 aCA9IG1fcm9vdFBhdGguaXNvbGF0ZWRDb3B5KCksIHNob3VsZENvbXB1dGVTaXplLCBjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShjb25zdCBhdXRvJiBmb2xk ZXJQYXRocykgbXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICBy ZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoeyB9KTsKKyAgICAgICAgZmV0Y2hEaXJlY3RvcnlFbnRy aWVzKHNob3VsZENvbXB1dGVTaXplLCBmb2xkZXJQYXRocywgV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlcikpOworICAgIH0pOworfQorCit2b2lkIEVuZ2luZTo6ZmV0Y2hEaXJlY3RvcnlFbnRyaWVz KGJvb2wgc2hvdWxkQ29tcHV0ZVNpemUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBmb2xkZXJQYXRo cywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2Vic2l0ZURhdGE6OkVudHJ5Pik+JiYg Y29tcGxldGlvbkhhbmRsZXIpCit7CiAgICAgYXV0byB0YXNrQ291bnRlciA9IFJlYWRPcmlnaW5z VGFza0NvdW50ZXI6OmNyZWF0ZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0gICAgZm9y IChhdXRvJiBmb2xkZXJQYXRoIDogRmlsZVN5c3RlbTo6bGlzdERpcmVjdG9yeShtX3Jvb3RQYXRo LCAiKiIpKSB7Ci0gICAgICAgIGlmICghRmlsZVN5c3RlbTo6ZmlsZUlzRGlyZWN0b3J5KGZvbGRl clBhdGgsIEZpbGVTeXN0ZW06OlNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6Ok5vKSkKLSAgICAg ICAgICAgIGNvbnRpbnVlOworICAgIGZvciAoYXV0byYgZm9sZGVyUGF0aCA6IGZvbGRlclBhdGhz KSB7CiAgICAgICAgIENhY2hlczo6cmV0cmlldmVPcmlnaW5Gcm9tRGlyZWN0b3J5KGZvbGRlclBh dGgsICptX2lvUXVldWUsIFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHNob3VsZENv bXB1dGVTaXplLCB0YXNrQ291bnRlciA9IHRhc2tDb3VudGVyLmNvcHlSZWYoKV0gKGF1dG8mJiBv cmlnaW4pIG11dGFibGUgewogICAgICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsK ICAgICAgICAgICAgIGlmICghb3JpZ2luKQpAQCAtNTY5LDEyICs1OTEsMTcgQEAgdm9pZCBFbmdp bmU6OmNsZWFyQ2FjaGVzRm9yT3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YSYgb3JpZ2luLCBDb20KIHZvaWQgRW5naW5lOjpjbGVhckNhY2hlc0Zvck9yaWdpbkZyb21EaXNr KGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYgb3JpZ2luLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKKyAgICBnZXREaXJlY3RvcmllcyhbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vh a1B0cih0aGlzKSwgb3JpZ2luLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpXShjb25zdCBhdXRvJiBmb2xkZXJQYXRocykgbXV0YWJsZSB7CisgICAgICAgIGlm ICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoKTsKKyAg ICAgICAgY2xlYXJDYWNoZXNGb3JPcmlnaW5Gcm9tRGlyZWN0b3JpZXMoZm9sZGVyUGF0aHMsIG9y aWdpbiwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIH0pOworfQogCit2b2lkIEVu Z2luZTo6Y2xlYXJDYWNoZXNGb3JPcmlnaW5Gcm9tRGlyZWN0b3JpZXMoY29uc3QgVmVjdG9yPFN0 cmluZz4mIGZvbGRlclBhdGhzLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIG9y aWdpbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQorewog ICAgIGF1dG8gY2FsbGJhY2tBZ2dyZWdhdG9yID0gQ2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUo V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwotCi0gICAgZm9yIChhdXRvJiBmb2xkZXJQYXRo IDogRmlsZVN5c3RlbTo6bGlzdERpcmVjdG9yeShtX3Jvb3RQYXRoLCAiKiIpKSB7Ci0gICAgICAg IGlmICghRmlsZVN5c3RlbTo6ZmlsZUlzRGlyZWN0b3J5KGZvbGRlclBhdGgsIEZpbGVTeXN0ZW06 OlNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6Ok5vKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgIGZvciAoYXV0byYgZm9sZGVyUGF0aCA6IGZvbGRlclBhdGhzKSB7CiAgICAgICAgIENhY2hl czo6cmV0cmlldmVPcmlnaW5Gcm9tRGlyZWN0b3J5KGZvbGRlclBhdGgsICptX2lvUXVldWUsIFt0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIG9yaWdpbiwgY2FsbGJhY2tBZ2dy ZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKSwgZm9sZGVyUGF0aF0gKE9wdGlv bmFsPFdlYkNvcmU6OkNsaWVudE9yaWdpbj4mJiBmb2xkZXJPcmlnaW4pIG11dGFibGUgewogICAg ICAgICAgICAgaWYgKCFmb2xkZXJPcmlnaW4pCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VF bmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdl RW5naW5lLmgKaW5kZXggMTc2ODUwMTQ5YWYzZWMxY2U1MTZkYjRlNmMyNjJlZDdiODNiMmRlZS4u OGFhNDczMmEwNDQwZDI3Zjk0Mzk0YjYyNzRhYzQxY2JkMTM0MmY4ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZS5o CkBAIC0xMTksNiArMTE5LDEwIEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGZldGNoRW50cmllcyhi b29sIC8qIHNob3VsZENvbXB1dGVTaXplICovLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3Rv cjxXZWJzaXRlRGF0YTo6RW50cnk+KT4mJik7CiAKKyAgICB2b2lkIGdldERpcmVjdG9yaWVzKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFN0cmluZz4mKT4mJik7CisgICAgdm9p ZCBmZXRjaERpcmVjdG9yeUVudHJpZXMoYm9vbCBzaG91bGRDb21wdXRlU2l6ZSwgY29uc3QgVmVj dG9yPFN0cmluZz4mIGZvbGRlclBhdGhzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxX ZWJzaXRlRGF0YTo6RW50cnk+KT4mJik7CisgICAgdm9pZCBjbGVhckNhY2hlc0Zvck9yaWdpbkZy b21EaXJlY3Rvcmllcyhjb25zdCBWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luRGF0YSYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CisKICAgICB2b2lk IGluaXRpYWxpemUoV2ViQ29yZTo6RE9NQ2FjaGVFbmdpbmU6OkNvbXBsZXRpb25DYWxsYmFjayYm KTsKIAogICAgIHVzaW5nIENhY2hlc09yRXJyb3IgPSBFeHBlY3RlZDxzdGQ6OnJlZmVyZW5jZV93 cmFwcGVyPENhY2hlcz4sIFdlYkNvcmU6OkRPTUNhY2hlRW5naW5lOjpFcnJvcj47Cg==