187544 2018-07-10 17:46:06 -0700 Disable all network caching for HLS streams. 2018-07-11 16:09:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble achristensen cdumez commit-queue koivisto webkit-bug-importer youennf oldest_to_newest 1441047 0 jer.noble 2018-07-10 17:46:06 -0700 Disable all network caching for HLS streams. 1441048 1 jer.noble 2018-07-10 17:46:23 -0700 <rdar://problem/41863600> 1441053 2 344740 jer.noble 2018-07-10 17:48:54 -0700 Created attachment 344740 Patch 1441060 3 344743 jer.noble 2018-07-10 18:22:00 -0700 Created attachment 344743 Patch 1441076 4 344743 youennf 2018-07-10 19:23:09 -0700 Comment on attachment 344743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344743&action=review > Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm:661 > + return NO; I am not sure this is sufficient to disable caching in the NetworkProcess. Maybe setting FetchOptions.cache to FetchOptions::Cache::NoStore in MediaResourceLoader when we return NO here would do the trick. 1441202 5 344774 jer.noble 2018-07-11 11:43:19 -0700 Created attachment 344774 Patch 1441212 6 344774 commit-queue 2018-07-11 12:30:06 -0700 Comment on attachment 344774 Patch Clearing flags on attachment: 344774 Committed r233738: <https://trac.webkit.org/changeset/233738> 1441213 7 commit-queue 2018-07-11 12:30:08 -0700 All reviewed patches have been landed. Closing bug. 1441266 8 344774 koivisto 2018-07-11 16:09:13 -0700 Comment on attachment 344774 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344774&action=review > Source/WebKit/NetworkProcess/cache/NetworkCache.cpp:265 > // FIXME: We should introduce a separate media cache partition that doesn't affect other resources. > // FIXME: We should also make sure make the MSE paths are copy-free so we can use mapped buffers from disk effectively. These FIXMEs don't make much sense now either and could be removed. 344740 2018-07-10 17:48:54 -0700 2018-07-10 18:21:59 -0700 Patch bug-187544-20180710174854.patch text/plain 2907 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q3NTMwYzUxNDk5YzQw ODk3ZTI3N2I0ODRmZDVkYmQxM2M1OWU1YS4uMDM0NGFmMTI5ZjMyOWYwOTUzOGY2NjFmMjc3ZWQ0 NjZiNGI4MThkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA3LTEwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgYWxsIG5ldHdv cmsgY2FjaGluZyBmb3IgSExTIHN0cmVhbXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODc1NDQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxODYz NjAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhM UyBzdHJlYW1zIHNob3VsZCBuZXZlciBiZSBjYWNoZWQsIGFzIHRoZXkncmUgbm90IHNpbmdsZS1y ZXNvdXJjZSBhbmQgY2FuIHRodXMgY2F1c2Ugb3RoZXIKKyAgICAgICAgcmVzb3VyY2VzIHRvIGJl Y29tZSBldmljdGVkLCBkZXNwaXRlIG91ciAiPDRNQiIgcGVyLXJlc291cmNlIGxpbWl0LgorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tOgor ICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgcmVzb3VyY2U6cmVjZWl2ZWRS ZXNwb25zZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHJlc291 cmNlOnNob3VsZENhY2hlUmVzcG9uc2U6XSk6CisKIDIwMTgtMDctMDkgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU2hyaW5rIFdlYkNvcmU6OlBhaXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29y ZU5TVVJMU2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2Ev V2ViQ29yZU5TVVJMU2Vzc2lvbi5tbQppbmRleCA1MTdjOTZhYzQ5NTE3YjIyMjZjZjVlODZiZDk3 YTJjNDM0MTczNmUzLi5mNTBhMmNiYjU5N2MxZDg1NDQ5ZDNiYzc4NmZiYzE5OTU4NTMxNmYyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVO U1VSTFNlc3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2Nv YS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tCkBAIC0zOSw2ICszOSw3IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIAogQGludGVyZmFjZSBXZWJDb3Jl TlNVUkxTZXNzaW9uICgpCitAcHJvcGVydHkgKGFzc2lnbikgQk9PTCBoYXNTZWVuSExTUmVzcG9u c2U7CiBAcHJvcGVydHkgKHJlYWRvbmx5KSBQbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXImIGxv YWRlcjsKIEBwcm9wZXJ0eSAocmVhZHdyaXRlLCByZXRhaW4pIGlkPE5TVVJMU2Vzc2lvblRhc2tE ZWxlZ2F0ZT4gZGVsZWdhdGU7CiAtICh2b2lkKXRhc2tDb21wbGV0ZWQ6KFdlYkNvcmVOU1VSTFNl c3Npb25EYXRhVGFzayAqKXRhc2s7CkBAIC02MTQsNiArNjE1LDExIEBAIC0gKHZvaWQpcmVzb3Vy Y2U6KFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYpcmVzb3VyY2UgcmVjZWl2ZWRSZXNwb25zZTooY29u c3QgUmVzb3VyCiAgICAgQVNTRVJUKHJlc3BvbnNlLnNvdXJjZSgpID09IFJlc291cmNlUmVzcG9u c2U6OlNvdXJjZTo6TmV0d29yayB8fCByZXNwb25zZS5zb3VyY2UoKSA9PSBSZXNvdXJjZVJlc3Bv bnNlOjpTb3VyY2U6OkRpc2tDYWNoZSB8fCByZXNwb25zZS5zb3VyY2UoKSA9PSBSZXNvdXJjZVJl c3BvbnNlOjpTb3VyY2U6OkRpc2tDYWNoZUFmdGVyVmFsaWRhdGlvbiB8fCByZXNwb25zZS5zb3Vy Y2UoKSA9PSBSZXNvdXJjZVJlc3BvbnNlOjpTb3VyY2U6OlNlcnZpY2VXb3JrZXIpOwogICAgIEFT U0VSVF9VTlVTRUQocmVzb3VyY2UsICZyZXNvdXJjZSA9PSBfcmVzb3VyY2UpOwogICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CisKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShyZXNw b25zZS5taW1lVHlwZSgpLCAiYXBwbGljYXRpb24veC1tcGVndXJsIikKKyAgICAgICAgfHwgZXF1 YWxJZ25vcmluZ0FTQ0lJQ2FzZShyZXNwb25zZS5taW1lVHlwZSgpLCAiYXBwbGljYXRpb24vdm5k LmFwcGxlLm1wZWd1cmwiKSkKKyAgICAgICAgc2VsZi5zZXNzaW9uLmhhc1NlZW5ITFNSZXNwb25z ZSA9IFlFUzsKKwogICAgIFtzZWxmLnNlc3Npb24gdGFzazpzZWxmIGRpZFJlY2VpdmVDT1JTQWNj ZXNzQ2hlY2tSZXN1bHQ6cmVzb3VyY2UuZGlkUGFzc0FjY2Vzc0NvbnRyb2xDaGVjaygpXTsKICAg ICBzZWxmLmNvdW50T2ZCeXRlc0V4cGVjdGVkVG9SZWNlaXZlID0gcmVzcG9uc2UuZXhwZWN0ZWRD b250ZW50TGVuZ3RoKCk7CiAgICAgW3NlbGYgX3NldERlZmVyc0xvYWRpbmc6WUVTXTsKQEAgLTY1 MCw2ICs2NTYsOSBAQCAtIChCT09MKXJlc291cmNlOihQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmKXJl c291cmNlIHNob3VsZENhY2hlUmVzcG9uc2U6KGNvbnN0IFJlcwogCiAgICAgQVNTRVJUKGlzTWFp blRocmVhZCgpKTsKIAorICAgIGlmIChzZWxmLnNlc3Npb24uaGFzU2VlbkhMU1Jlc3BvbnNlKQor ICAgICAgICByZXR1cm4gTk87CisKICAgICAvLyBGSVhNRTogcmVtb3ZlIGlmIDxyZGFyOi8vcHJv YmxlbS8yMDAwMTk4NT4gaXMgZXZlciByZXNvbHZlZC4KICAgICByZXR1cm4gcmVzcG9uc2UuaHR0 cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpDb250ZW50UmFuZ2UpLmlzRW1wdHkoKTsKIH0K 344743 2018-07-10 18:22:00 -0700 2018-07-11 11:43:17 -0700 Patch bug-187544-20180710182159.patch text/plain 3956 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q3NTMwYzUxNDk5YzQw ODk3ZTI3N2I0ODRmZDVkYmQxM2M1OWU1YS4uMDM0NGFmMTI5ZjMyOWYwOTUzOGY2NjFmMjc3ZWQ0 NjZiNGI4MThkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA3LTEwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgYWxsIG5ldHdv cmsgY2FjaGluZyBmb3IgSExTIHN0cmVhbXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODc1NDQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxODYz NjAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhM UyBzdHJlYW1zIHNob3VsZCBuZXZlciBiZSBjYWNoZWQsIGFzIHRoZXkncmUgbm90IHNpbmdsZS1y ZXNvdXJjZSBhbmQgY2FuIHRodXMgY2F1c2Ugb3RoZXIKKyAgICAgICAgcmVzb3VyY2VzIHRvIGJl Y29tZSBldmljdGVkLCBkZXNwaXRlIG91ciAiPDRNQiIgcGVyLXJlc291cmNlIGxpbWl0LgorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tOgor ICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgcmVzb3VyY2U6cmVjZWl2ZWRS ZXNwb25zZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHJlc291 cmNlOnNob3VsZENhY2hlUmVzcG9uc2U6XSk6CisKIDIwMTgtMDctMDkgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU2hyaW5rIFdlYkNvcmU6OlBhaXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29y ZU5TVVJMU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLmgKaW5kZXggOTg3M2JjMzQyYjZkZmZjMzA3ZTNmNTk0NGFjMDRi MmI3MzZkYzY4Yy4uNTkxYzZhZTgxYmE5ODhlNzcwNTRiM2U5NWE4ZWZmNDgxZDViMTFmZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNV UkxTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLmgKQEAgLTY0LDYgKzY0LDcgQEAgV0VCQ09SRV9FWFBPUlQgQGlu dGVyZmFjZSBXZWJDb3JlTlNVUkxTZXNzaW9uIDogTlNPYmplY3QgewogICAgIEhhc2hTZXQ8UmV0 YWluUHRyPFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzaz4+IF9kYXRhVGFza3M7CiAgICAgTG9j ayBfZGF0YVRhc2tzTG9jazsKICAgICBCT09MIF9pbnZhbGlkYXRlZDsKKyAgICBCT09MIF9oYXNT ZWVuSExTUmVzcG9uc2U7CiAgICAgTlNVSW50ZWdlciBfbmV4dFRhc2tJZGVudGlmaWVyOwogICAg IE9TT2JqZWN0UHRyPGRpc3BhdGNoX3F1ZXVlX3Q+IF9pbnRlcm5hbFF1ZXVlOwogICAgIFdlYkNv cmVOU1VSTFNlc3Npb25DT1JTQWNjZXNzQ2hlY2tSZXN1bHRzIF9jb3JzUmVzdWx0czsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJM U2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29y ZU5TVVJMU2Vzc2lvbi5tbQppbmRleCA1MTdjOTZhYzQ5NTE3YjIyMjZjZjVlODZiZDk3YTJjNDM0 MTczNmUzLi4zZDVjOTYxOTI4YjEzMzhkOTUwY2UyNDAzYzAyM2QyMWJjZDczOWQ4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNl c3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJD b3JlTlNVUkxTZXNzaW9uLm1tCkBAIC0zOSw2ICszOSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIAogQGludGVyZmFjZSBXZWJDb3JlTlNVUkxT ZXNzaW9uICgpCitAcHJvcGVydHkgKGFzc2lnbikgQk9PTCBoYXNTZWVuSExTUmVzcG9uc2U7CiBA cHJvcGVydHkgKHJlYWRvbmx5KSBQbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXImIGxvYWRlcjsK IEBwcm9wZXJ0eSAocmVhZHdyaXRlLCByZXRhaW4pIGlkPE5TVVJMU2Vzc2lvblRhc2tEZWxlZ2F0 ZT4gZGVsZWdhdGU7CiAtICh2b2lkKXRhc2tDb21wbGV0ZWQ6KFdlYkNvcmVOU1VSTFNlc3Npb25E YXRhVGFzayAqKXRhc2s7CkBAIC0xNDksNiArMTUwLDcgQEAgLSAodm9pZCl0YXNrOihXZWJDb3Jl TlNVUkxTZXNzaW9uRGF0YVRhc2sgKil0YXNrIGRpZFJlY2VpdmVDT1JTQWNjZXNzQ2hlY2tSZXN1 bHQKIAogI3ByYWdtYSBtYXJrIC0gTlNVUkxTZXNzaW9uIEFQSQogQHN5bnRoZXNpemUgc2Vzc2lv bkRlc2NyaXB0aW9uPV9zZXNzaW9uRGVzY3JpcHRpb247CitAc3ludGhlc2l6ZSBoYXNTZWVuSExT UmVzcG9uc2U9X2hhc1NlZW5ITFNSZXNwb25zZTsKIEBkeW5hbWljIGRlbGVnYXRlOwogLSAoX19u dWxsYWJsZSBpZDxOU1VSTFNlc3Npb25EZWxlZ2F0ZT4pZGVsZWdhdGUKIHsKQEAgLTYxNCw2ICs2 MTYsMTEgQEAgLSAodm9pZClyZXNvdXJjZTooUGxhdGZvcm1NZWRpYVJlc291cmNlJilyZXNvdXJj ZSByZWNlaXZlZFJlc3BvbnNlOihjb25zdCBSZXNvdXIKICAgICBBU1NFUlQocmVzcG9uc2Uuc291 cmNlKCkgPT0gUmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpOZXR3b3JrIHx8IHJlc3BvbnNlLnNv dXJjZSgpID09IFJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6RGlza0NhY2hlIHx8IHJlc3BvbnNl LnNvdXJjZSgpID09IFJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6RGlza0NhY2hlQWZ0ZXJWYWxp ZGF0aW9uIHx8IHJlc3BvbnNlLnNvdXJjZSgpID09IFJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6 U2VydmljZVdvcmtlcik7CiAgICAgQVNTRVJUX1VOVVNFRChyZXNvdXJjZSwgJnJlc291cmNlID09 IF9yZXNvdXJjZSk7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKworICAgIGlmIChlcXVh bElnbm9yaW5nQVNDSUlDYXNlKHJlc3BvbnNlLm1pbWVUeXBlKCksICJhcHBsaWNhdGlvbi94LW1w ZWd1cmwiKQorICAgICAgICB8fCBlcXVhbElnbm9yaW5nQVNDSUlDYXNlKHJlc3BvbnNlLm1pbWVU eXBlKCksICJhcHBsaWNhdGlvbi92bmQuYXBwbGUubXBlZ3VybCIpKQorICAgICAgICBzZWxmLnNl c3Npb24uaGFzU2VlbkhMU1Jlc3BvbnNlID0gWUVTOworCiAgICAgW3NlbGYuc2Vzc2lvbiB0YXNr OnNlbGYgZGlkUmVjZWl2ZUNPUlNBY2Nlc3NDaGVja1Jlc3VsdDpyZXNvdXJjZS5kaWRQYXNzQWNj ZXNzQ29udHJvbENoZWNrKCldOwogICAgIHNlbGYuY291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2Vp dmUgPSByZXNwb25zZS5leHBlY3RlZENvbnRlbnRMZW5ndGgoKTsKICAgICBbc2VsZiBfc2V0RGVm ZXJzTG9hZGluZzpZRVNdOwpAQCAtNjUwLDYgKzY1Nyw5IEBAIC0gKEJPT0wpcmVzb3VyY2U6KFBs YXRmb3JtTWVkaWFSZXNvdXJjZSYpcmVzb3VyY2Ugc2hvdWxkQ2FjaGVSZXNwb25zZTooY29uc3Qg UmVzCiAKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCisgICAgaWYgKHNlbGYuc2Vzc2lv bi5oYXNTZWVuSExTUmVzcG9uc2UpCisgICAgICAgIHJldHVybiBOTzsKKwogICAgIC8vIEZJWE1F OiByZW1vdmUgaWYgPHJkYXI6Ly9wcm9ibGVtLzIwMDAxOTg1PiBpcyBldmVyIHJlc29sdmVkLgog ICAgIHJldHVybiByZXNwb25zZS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkNvbnRl bnRSYW5nZSkuaXNFbXB0eSgpOwogfQo= 344774 2018-07-11 11:43:19 -0700 2018-07-11 12:30:06 -0700 Patch bug-187544-20180711114318.patch text/plain 6312 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUyZjk1MDdmNjM3ODlkYzNm OWExMWRkMWU2NDQ4MjhhYjdmMjQzZTEuLmQzNGRkZGJiNWJkNmM0MmJlNmRjYzEwZDM3YjkxMTU4 ZGY1MWI3NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDctMTEgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzYWJsZSBhbGwgbmV0d29yayBj YWNoaW5nIGZvciBITFMgc3RyZWFtcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4NzU0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDE4NjM2MDA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0 IHRoZSBiZWhhdmlvciBhZGRlZCBpbiByMjE1MjYzIHdoZXJlIE1lZGlhIHJlc3BvbnNlcyBhcmUg Y2FjaGVkIGlmIHRoZXkgYXJlIGZyb20KKyAgICAgICAgYSByZXNvdXJjZSB3aG9zZSBleHBlY3Rl ZCBjb250ZW50IGxlbmd0aCBpcyA8NE1CLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjptYWtl U3RvcmVEZWNpc2lvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6ZXhwZWN0ZWRU b3RhbFJlc291cmNlU2l6ZUZyb21Db250ZW50UmFuZ2UpOiBEZWxldGVkLgorCiAyMDE4LTA3LTEw ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04g KHIyMzAxNjMpOiBWaWRlb3MgY2Fubm90IGJlIHNlZW4gZnVsbCBzY3JlZW4gaW4gQ29tcGxldGUg QW5hdG9teSBhcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlLmNwcAppbmRleCBhNjkyNTUyOTU4MTNhZDQ4ZDdjMWZkYWQ4MjdhY2M4ZjEw YmJhNjY0Li45ZWMyNTdjYjIxNjdiOGFkZTgzZDU2NWNkZjIwOGQ1YjkzMWUyNjY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3Bw CkBAIC0yMjUsMzMgKzIyNSw2IEBAIHN0YXRpYyBib29sIGlzTWVkaWFNSU1FVHlwZShjb25zdCBT dHJpbmcmIHR5cGUpCiAgICAgcmV0dXJuIHN0YXJ0c1dpdGhMZXR0ZXJzSWdub3JpbmdBU0NJSUNh c2UodHlwZSwgInZpZGVvLyIpIHx8IHN0YXJ0c1dpdGhMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2Uo dHlwZSwgImF1ZGlvLyIpOwogfQogCi1zdGF0aWMgc3RkOjpvcHRpb25hbDxzaXplX3Q+IGV4cGVj dGVkVG90YWxSZXNvdXJjZVNpemVGcm9tQ29udGVudFJhbmdlKGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQotewotICAgIEFTU0VSVChyZXNwb25zZS5odHRwU3RhdHVz Q29kZSgpID09IDIwNik7Ci0KLSAgICBhdXRvIGNvbnRlbnRSYW5nZSA9IHJlc3BvbnNlLmh0dHBI ZWFkZXJGaWVsZChXZWJDb3JlOjpIVFRQSGVhZGVyTmFtZTo6Q29udGVudFJhbmdlKTsKLSAgICBp ZiAoY29udGVudFJhbmdlLmlzTnVsbCgpKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgaWYg KCFjb250ZW50UmFuZ2Uuc3RhcnRzV2l0aCgiYnl0ZXMgIikpCi0gICAgICAgIHJldHVybiB7IH07 Ci0KLSAgICBhdXRvIHNsYXNoUG9zaXRpb24gPSBjb250ZW50UmFuZ2UuZmluZCgnLycpOwotICAg IGlmIChzbGFzaFBvc2l0aW9uID09IG5vdEZvdW5kKQotICAgICAgICByZXR1cm4geyB9OwotCi0g ICAgYXV0byBzaXplU3RyaW5nTGVuZ3RoID0gY29udGVudFJhbmdlLmxlbmd0aCgpIC0gc2xhc2hQ b3NpdGlvbiAtIDE7Ci0gICAgaWYgKCFzaXplU3RyaW5nTGVuZ3RoKQotICAgICAgICByZXR1cm4g eyB9OwotCi0gICAgYm9vbCBpc1ZhbGlkOwotICAgIGF1dG8gc2l6ZSA9IFN0cmluZ1ZpZXcoY29u dGVudFJhbmdlKS5yaWdodChzaXplU3RyaW5nTGVuZ3RoKS50b0ludFN0cmljdChpc1ZhbGlkKTsK LSAgICBpZiAoIWlzVmFsaWQpCi0gICAgICAgIHJldHVybiB7IH07Ci0KLSAgICByZXR1cm4gc2l6 ZTsKLX0KLQogc3RhdGljIFN0b3JlRGVjaXNpb24gbWFrZVN0b3JlRGVjaXNpb24oY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBzaXplX3QgYm9keVNpemUpCiB7CiAgICAgaWYgKCFv cmlnaW5hbFJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpIHx8ICFyZXNwb25z ZS5pc0hUVFAoKSkKQEAgLTI4NiwyNSArMjU5LDE1IEBAIHN0YXRpYyBTdG9yZURlY2lzaW9uIG1h a2VTdG9yZURlY2lzaW9uKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxS CiAgICAgICAgICAgICByZXR1cm4gU3RvcmVEZWNpc2lvbjo6Tm9EdWVUb1VubGlrZWx5VG9SZXVz ZTsKICAgICB9CiAKKyAgICAvLyBNZWRpYSBsb2FkZWQgdmlhIFhIUiBpcyBsaWtlbHkgYmVpbmcg dXNlZCBmb3IgTVNFIHN0cmVhbWluZyAoWW91VHViZSBhbmQgTmV0ZmxpeCBmb3IgZXhhbXBsZSku CiAgICAgLy8gU3RyZWFtaW5nIG1lZGlhIGZpbGxzIHRoZSBjYWNoZSBxdWlja2x5IGFuZCBpcyB1 bmxpa2VseSB0byBiZSByZXVzZWQuCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBpbnRyb2R1Y2Ug YSBzZXBhcmF0ZSBtZWRpYSBjYWNoZSBwYXJ0aXRpb24gdGhhdCBkb2Vzbid0IGFmZmVjdCBvdGhl ciByZXNvdXJjZXMuCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhbHNvIG1ha2Ugc3VyZSBtYWtl IHRoZSBNU0UgcGF0aHMgYXJlIGNvcHktZnJlZSBzbyB3ZSBjYW4gdXNlIG1hcHBlZCBidWZmZXJz IGZyb20gZGlzayBlZmZlY3RpdmVseS4KICAgICBhdXRvIHJlcXVlc3RlciA9IG9yaWdpbmFsUmVx dWVzdC5yZXF1ZXN0ZXIoKTsKLSAgICBib29sIGlzRGVmaW5pdGVseU1lZGlhID0gcmVxdWVzdGVy ID09IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6UmVxdWVzdGVyOjpNZWRpYTsKLSAgICBpZiAo aXNEZWZpbml0ZWx5TWVkaWEpIHsKLSAgICAgICAgLy8gQWxsb3cgY2FjaGluZyBvZiBzbWFsbGVy IG1lZGlhIGZpbGVzIGlmIHdlIGtub3cgdGhlIHRvdGFsIHNpemUuCi0gICAgICAgIGNvbnN0IHNp emVfdCBtYXhpbXVtQ2FjaGVhYmxlTWVkaWFTaXplID0gNSAqIDEwMjQgKiAxMDI0OwotICAgICAg ICBhdXRvIHRvdGFsU2l6ZSA9IHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPT0gMjA2ID8gZXhw ZWN0ZWRUb3RhbFJlc291cmNlU2l6ZUZyb21Db250ZW50UmFuZ2UocmVzcG9uc2UpIDogYm9keVNp emU7Ci0gICAgICAgIGlmICghdG90YWxTaXplIHx8ICp0b3RhbFNpemUgPiBtYXhpbXVtQ2FjaGVh YmxlTWVkaWFTaXplKQotICAgICAgICAgICAgcmV0dXJuIFN0b3JlRGVjaXNpb246Ok5vRHVlVG9T dHJlYW1pbmdNZWRpYTsKLSAgICB9Ci0KKyAgICBib29sIGlzRGVmaW5pdGVseVN0cmVhbWluZ01l ZGlhID0gcmVxdWVzdGVyID09IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6UmVxdWVzdGVyOjpN ZWRpYTsKICAgICBib29sIGlzTGlrZWx5U3RyZWFtaW5nTWVkaWEgPSByZXF1ZXN0ZXIgPT0gV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXF1ZXN0ZXI6OlhIUiAmJiBpc01lZGlhTUlNRVR5cGUo cmVzcG9uc2UubWltZVR5cGUoKSk7Ci0gICAgaWYgKGlzTGlrZWx5U3RyZWFtaW5nTWVkaWEpIHsK LSAgICAgICAgLy8gTWVkaWEgbG9hZGVkIHZpYSBYSFIgaXMgbGlrZWx5IGJlaW5nIHVzZWQgZm9y IE1TRSBzdHJlYW1pbmcgKFlvdVR1YmUgYW5kIE5ldGZsaXggZm9yIGV4YW1wbGUpLgotICAgICAg ICAvLyBXZSBoYXZlIG5vIHdheSBvZiBrbm93aW5nIHRoZSB0b3RhbCBtZWRpYSBzaXplIHNvIGRp c2FsbG93IGNhY2hpbmcuCisgICAgaWYgKGlzTGlrZWx5U3RyZWFtaW5nTWVkaWEgfHwgaXNEZWZp bml0ZWx5U3RyZWFtaW5nTWVkaWEpCiAgICAgICAgIHJldHVybiBTdG9yZURlY2lzaW9uOjpOb0R1 ZVRvU3RyZWFtaW5nTWVkaWE7Ci0gICAgfQogCiAgICAgcmV0dXJuIFN0b3JlRGVjaXNpb246Olll czsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCBjYTFjNzU0Y2FkMzMxNzVlNzRlN2MwMmU3YWVkNGI4NjFiOTkwYzJkLi5k MGNkOWYzYTAwMjUxMjMyZjhmNmU1YjM0NDk3ZGYxMDkzNzQyYjljIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMTgtMDctMTEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAg ICAgICAgRGlzYWJsZSBhbGwgbmV0d29yayBjYWNoaW5nIGZvciBITFMgc3RyZWFtcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzU0NAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDE4NjM2MDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUvZGlzay1j YWNoZS1tZWRpYS1zbWFsbC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0cy9jYWNo ZS9kaXNrLWNhY2hlL2Rpc2stY2FjaGUtbWVkaWEtc21hbGwuaHRtbDoKKwogMjAxOC0wNy0wOSAg QnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBXZWIg SW5zcGVjdG9yIG5vIGxvbmdlciBwYXVzZXMgaW4gaW50ZXJuYWwgaW5qZWN0ZWQgc2NyaXB0cyBs aWtlIFdERmluZE5vZGVzLmpzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Nh Y2hlL2Rpc2stY2FjaGUvZGlzay1jYWNoZS1tZWRpYS1zbWFsbC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUvZGlzay1jYWNoZS1tZWRpYS1zbWFs bC1leHBlY3RlZC50eHQKaW5kZXggYWM3YTc5YWU3MDA4ZDZmNmQzY2FlZTNmZjA1ZjMxOWYwZjc3 N2YxYS4uY2ViZGQxNTkzMzhlOTc4NzFhMDJlNDcyOTdiYjA5MmQ5MTVhYjA2OSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS9kaXNrLWNhY2hlL2Rpc2stY2FjaGUtbWVk aWEtc21hbGwtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2FjaGUv ZGlzay1jYWNoZS9kaXNrLWNhY2hlLW1lZGlhLXNtYWxsLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsx LDUgQEAKIEZpcnN0IGxvYWQKIFBBU1M6IEFsbCByZXNwb25zZSByYW5nZXMgZnJvbTogTmV0d29y awogU2Vjb25kIExvYWQKLVBBU1M6IEFsbCByZXNwb25zZSByYW5nZXMgZnJvbTogRGlzayBjYWNo ZQorUEFTUzogQWxsIHJlc3BvbnNlIHJhbmdlcyBmcm9tOiBOZXR3b3JrCiAgCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUvZGlzay1jYWNoZS1tZWRp YS1zbWFsbC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jYWNoZS9kaXNrLWNhY2hlL2Rp c2stY2FjaGUtbWVkaWEtc21hbGwuaHRtbAppbmRleCBmNDVlMjQ5YjhkNzllNmUzNzc1NDFiY2Ji OWE3ZjIzZmQwYmE2NmZlLi5kMWQwNTNhMGU3NDgwN2E5M2UwNjNmNmQ1NmNmMzU2YzYwMWMzNGIz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUvZGlz ay1jYWNoZS1tZWRpYS1zbWFsbC5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY2Fj aGUvZGlzay1jYWNoZS9kaXNrLWNhY2hlLW1lZGlhLXNtYWxsLmh0bWwKQEAgLTQzLDcgKzQzLDcg QEAgYXN5bmMgZnVuY3Rpb24gdGVzdCgpIHsKICAgICBsb2dSZXNwb25zZXMoYXdhaXQgbG9hZFRl c3RNZWRpYSgpLCAiTmV0d29yayIpOwogCiAgICAgbG9nZGl2LmlubmVySFRNTCArPSAiU2Vjb25k IExvYWQ8YnI+IjsKLSAgICBsb2dSZXNwb25zZXMoYXdhaXQgbG9hZFRlc3RNZWRpYSgpLCAiRGlz ayBjYWNoZSIpOworICAgIGxvZ1Jlc3BvbnNlcyhhd2FpdCBsb2FkVGVzdE1lZGlhKCksICJOZXR3 b3JrIik7CiAKICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKIH0K