229813 2021-09-02 09:37:50 -0700 Buffer large media XHRs in the NetworkProcess to reduce IPC overhead 2021-09-03 09:41:15 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble achristensen eric.carlson jean-yves.avenard peng.liu6 webkit-bug-importer oldest_to_newest 1789744 0 jer.noble 2021-09-02 09:37:50 -0700 Buffer large media XHRs in the NetworkProcess to reduce IPC overhead 1789745 1 jer.noble 2021-09-02 09:38:31 -0700 <rdar://82406803> 1789828 2 437180 jer.noble 2021-09-02 12:13:37 -0700 Created attachment 437180 Patch 1789834 3 437180 peng.liu6 2021-09-02 12:26:28 -0700 Comment on attachment 437180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437180&action=review > Source/WebKit/WebProcess/Network/WebLoaderStrategy.h:94 > + static constexpr Seconds mediaMaximumBufferingTime { 50_s }; 50_s? 1789835 4 437180 achristensen 2021-09-02 12:26:34 -0700 Comment on attachment 437180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437180&action=review > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:652 > + && m_response.expectedContentLength() > static_cast<long long>(1 * MB) I would put this check before isMediaMIMEType because it's a cheap integer comparison that's likely to fail. > Source/WebKit/NetworkProcess/NetworkResourceLoader.h:213 > + NetworkResourceLoadParameters m_parameters; I think it would be better to mark maximumBufferingTime as mutable rather than all the parameters as non-const. 1789836 5 jer.noble 2021-09-02 12:29:17 -0700 (In reply to Peng Liu from comment #3) > Comment on attachment 437180 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=437180&action=review > > > Source/WebKit/WebProcess/Network/WebLoaderStrategy.h:94 > > + static constexpr Seconds mediaMaximumBufferingTime { 50_s }; > > 50_s? OMG. Nice catch. 1789838 6 437182 jer.noble 2021-09-02 12:31:10 -0700 Created attachment 437182 Patch for landing 1789894 7 437198 jer.noble 2021-09-02 14:21:43 -0700 Created attachment 437198 Patch for landing 1790205 8 ews-feeder 2021-09-03 09:41:13 -0700 Committed r282003 (241310@main): <https://commits.webkit.org/241310@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437198. 437180 2021-09-02 12:13:37 -0700 2021-09-02 12:26:34 -0700 Patch bug-229813-20210902121336.patch text/plain 6360 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2MThmZjI4NWM1YTQ0ZjQw N2VkZmI5ODk3MmI2OWYyZjMxYmUxODcuLjI2MWFiMTVkNDIyNWE3Y2EzMmIzNzc2ZTZmZTYxNTRl OTJjODRlYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDktMDIgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgQnVmZmVyIGxhcmdlIG1lZGlhIFhI UnMgaW4gdGhlIE5ldHdvcmtQcm9jZXNzIHRvIHJlZHVjZSBJUEMgb3ZlcmhlYWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTgxMworICAgICAgICA8 cmRhcjovLzgyNDA2ODAzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdoZW4gcGxheWluZyBiYWNrIG1lZGlhIHRocm91Z2ggTVNFLCBhIHNpZ25pZmlj YW50IGFtb3VudCBvZiBDUFUgdGltZSBpcyBzcGVudCBzZW5kaW5nCisgICAgICAgIHNtYWxsIGNo dW5rcyBvZiBsb2FkZWQgbWVkaWEgYWNyb3NzIHRoZSBYUEMgYm91bmRhcnksIG9uIHRoZSBvcmRl ciBvZiAxNmtiIGF0IGEgdGltZSBvdXQKKyAgICAgICAgb2YgYSAxLTNNQiByZXNvdXJjZS4gVGhp cyBsYXJnZSBudW1iZXIgb2Ygc21hbGwgWFBDIG1lc3NhZ2VzLCBlYWNoIHdpdGggYSBmaXhlZCBj b3N0LCBjYXVzZXMKKyAgICAgICAgYSByZWxhdGl2ZWx5IGxhcmdlIENQVSBvdmVyaGVhZC4gTWVk aWEgbG9hZGVkIGRpcmVjdGx5IHRocm91Z2ggYSBIVE1MTWVkaWFFbGVtZW50IGFscmVhZHkKKyAg ICAgICAgaXMgY29hbGVzY2VkIGluIHRoZSBOZXR3b3JrUHJvY2VzcyBvbiBhIDUwbXMgdGltZXIu CisKKyAgICAgICAgQnVmZmVyIGFsbCBsb2FkcyBvZiBsYXJnZSBtZWRpYSByZXNvdXJjZXMsIHBl cmZvcm1lZCBvdmVyIGZldGNoKCkgb3IgWEhSLCB3aGVuIHRob3NlIHJlc291cmNlcworICAgICAg ICBoYXZlIGFuIGV4cGVjdGVkIGxlbmd0aCBvZiBtb3JlIHRoYW4gMU1CLCBieSBjb2FsZXNjaW5n IHRoZW0gb24gdGhlIHNhbWUgNTBtcyB0aW1lciBhcyB3ZSB1c2UKKyAgICAgICAgZm9yIEhUTUxN ZWRpYUVsZW1lbnQtZ2VuZXJhdGVkIGxvYWRzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291 cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRlci5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9X ZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6Om1heGltdW1CdWZmZXJpbmdU aW1lKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaDoK KwogMjAyMS0wOC0xNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAg ICBEZS1kdXBsaWNhdGUgdGhlIENvY29hLXNwZWNpZmljIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90 ZSBjb25zdHJ1Y3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDgyZjFlNTMwMTQ0ZmEwZmYyZGFiMTFlNjQ0 YzA5YjdmNjg2MWEwMDAuLjhkZjkzN2YzY2U2NmEyOGY1MzQ5MDcwMjMyMjdmMzAyNDI1YmIwOWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNl TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNv dXJjZUxvYWRlci5jcHAKQEAgLTQzLDYgKzQzLDcgQEAKICNpbmNsdWRlICJTaGFyZWRCdWZmZXJE YXRhUmVmZXJlbmNlLmgiCiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgiCiAjaW5j bHVkZSAiV2ViRXJyb3JzLmgiCisjaW5jbHVkZSAiV2ViTG9hZGVyU3RyYXRlZ3kuaCIKICNpbmNs dWRlICJXZWJQYWdlTWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJSZXNvdXJjZUxvYWRlck1lc3Nh Z2VzLmgiCiAjaW5jbHVkZSAiV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmgiCkBAIC02MzMsNiArNjM0 LDI3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoUmVz b3VyY2VSZXNwb25zZSYmIHJlY2VpdmVkUmVzcG9uCiAgICAgICAgIG1fY29ubmVjdGlvbi0+YWRk TmV0d29ya0xvYWRJbmZvcm1hdGlvbihpZGVudGlmaWVyKCksIFdURk1vdmUoaW5mb3JtYXRpb24p KTsKICAgICB9CiAKKyAgICBhdXRvIHJlc291cmNlTG9hZEluZm8gPSB0aGlzLT5yZXNvdXJjZUxv YWRJbmZvKCk7CisKKyAgICBhdXRvIGlzRmV0Y2hPclhIUiA9IFtdIChjb25zdCBSZXNvdXJjZUxv YWRJbmZvJiBpbmZvKSB7CisgICAgICAgIHJldHVybiBpbmZvLnR5cGUgPT0gUmVzb3VyY2VMb2Fk SW5mbzo6VHlwZTo6RmV0Y2gKKyAgICAgICAgICAgIHx8IGluZm8udHlwZSA9PSBSZXNvdXJjZUxv YWRJbmZvOjpUeXBlOjpYTUxIVFRQUmVxdWVzdDsKKyAgICB9OworCisgICAgYXV0byBpc01lZGlh TUlNRVR5cGUgPSBbXSAoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgeworICAgICAgICByZXR1cm4g bWltZVR5cGUuc3RhcnRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCJhdWRpby8iKQorICAgICAgICAg ICAgfHwgbWltZVR5cGUuc3RhcnRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCJ2aWRlby8iKQorICAg ICAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UobWltZVR5cGUsICJhcHBs aWNhdGlvbi9vY3RldC1zdHJlYW0iKTsKKyAgICB9OworCisgICAgaWYgKGlzRmV0Y2hPclhIUihy ZXNvdXJjZUxvYWRJbmZvKQorICAgICAgICAmJiBpc01lZGlhTUlNRVR5cGUobV9yZXNwb25zZS5t aW1lVHlwZSgpKQorICAgICAgICAmJiBtX3Jlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgp ID4gc3RhdGljX2Nhc3Q8bG9uZyBsb25nPigxICogTUIpCisgICAgICAgICYmICFtX2J1ZmZlcmVk RGF0YSkgeworICAgICAgICBtX2J1ZmZlcmVkRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCk7 CisgICAgICAgIG1fcGFyYW1ldGVycy5tYXhpbXVtQnVmZmVyaW5nVGltZSA9IFdlYkxvYWRlclN0 cmF0ZWd5OjptZWRpYU1heGltdW1CdWZmZXJpbmdUaW1lOworICAgIH0KKwogICAgIC8vIEZvciBt dWx0aXBhcnQveC1taXhlZC1yZXBsYWNlIGRpZFJlY2VpdmVSZXNwb25zZUFzeW5jIGdldHMgY2Fs bGVkIG11bHRpcGxlIHRpbWVzIGFuZCBidWZmZXJpbmcgd291bGQgcmVxdWlyZSBzcGVjaWFsIGhh bmRsaW5nLgogICAgIGlmICghaXNTeW5jaHJvbm91cygpICYmIG1fcmVzcG9uc2UuaXNNdWx0aXBh cnQoKSkKICAgICAgICAgbV9idWZmZXJlZERhdGEgPSBudWxscHRyOwpAQCAtNzA3LDcgKzcyOSw3 IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoUmVzb3Vy Y2VSZXNwb25zZSYmIHJlY2VpdmVkUmVzcG9uCiAgICAgc2VuZChNZXNzYWdlczo6V2ViUmVzb3Vy Y2VMb2FkZXI6OkRpZFJlY2VpdmVSZXNwb25zZSB7IHJlc3BvbnNlLCB3aWxsV2FpdEZvckNvbnRp bnVlRGlkUmVjZWl2ZVJlc3BvbnNlIH0pOwogCiAgICAgaWYgKG1fcGFyYW1ldGVycy5wYWdlSGFz UmVzb3VyY2VMb2FkQ2xpZW50KQotICAgICAgICBtX2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9jZXNz KCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nl c3NQcm94eTo6UmVzb3VyY2VMb2FkRGlkUmVjZWl2ZVJlc3BvbnNlKG1fcGFyYW1ldGVycy53ZWJQ YWdlUHJveHlJRCwgcmVzb3VyY2VMb2FkSW5mbygpLCByZXNwb25zZSksIDApOworICAgICAgICBt X2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9jZXNzKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+ c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6UmVzb3VyY2VMb2FkRGlkUmVjZWl2 ZVJlc3BvbnNlKG1fcGFyYW1ldGVycy53ZWJQYWdlUHJveHlJRCwgcmVzb3VyY2VMb2FkSW5mbywg cmVzcG9uc2UpLCAwKTsKIAogICAgIGlmICh3aWxsV2FpdEZvckNvbnRpbnVlRGlkUmVjZWl2ZVJl c3BvbnNlKSB7CiAgICAgICAgIG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmgKaW5kZXggY2VmNjU0NzliN2U2YmNmZjI1Y2ZmMDE4 MjVjMmJkM2EwYzc2ODdlZi4uNmRiNjg2MTg2MzJkZTI2NzVjZjI2MDFmYTE3ZDlhNzMwOWQ1NDg4 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNv dXJjZUxvYWRlci5oCkBAIC0yMTAsNyArMjEwLDcgQEAgcHJpdmF0ZToKIAogICAgIFJlc291cmNl TG9hZEluZm8gcmVzb3VyY2VMb2FkSW5mbygpOwogCi0gICAgY29uc3QgTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMgbV9wYXJhbWV0ZXJzOworICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh bWV0ZXJzIG1fcGFyYW1ldGVyczsKIAogICAgIFJlZjxOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2Vzcz4gbV9jb25uZWN0aW9uOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggNmU5NjkwNzI1NGE0YmQxNTVm NThkZjEzNzg0OGI2MDUzMTlmNTE1NS4uYzdkZmE2MDAzNzg3MTkzNjk4ZTJhNjFkMjFjZDQxZjY4 OTE2YzNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtMTUxLDcgKzE1MSw3IEBAIHN0YXRpYyBTZWNvbmRz IG1heGltdW1CdWZmZXJpbmdUaW1lKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkKICAgICBjYXNl IENhY2hlZFJlc291cmNlOjpUeXBlOjpJbWFnZVJlc291cmNlOgogICAgICAgICByZXR1cm4gNTAw X21zOwogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1lZGlhUmVzb3VyY2U6Ci0gICAg ICAgIHJldHVybiA1MF9tczsKKyAgICAgICAgcmV0dXJuIFdlYkxvYWRlclN0cmF0ZWd5OjptZWRp YU1heGltdW1CdWZmZXJpbmdUaW1lOwogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Ok1h aW5SZXNvdXJjZToKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpUeXBlOjpJY29uOgogICAgIGNh c2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OlJhd1Jlc291cmNlOgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmgKaW5kZXggY2EyMzQ5 OTU4NjY2YTgwMWIwZTBhNmJkNzY3ZGJiY2NjZmI3MTZhZS4uYmYyMmI5Njg5Yzk1ZGQyNjgwY2Qx MjBmNThlMjY0NGRlYWM3ZGVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oCkBAIC05MSw2ICs5MSw4IEBAIHB1YmxpYzoK IAogICAgIHN0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZUxvYWRJZGVudGlmaWVyKCk7CiAKKyAgICBz dGF0aWMgY29uc3RleHByIFNlY29uZHMgbWVkaWFNYXhpbXVtQnVmZmVyaW5nVGltZSB7IDUwX3Mg fTsKKwogcHJpdmF0ZToKICAgICB2b2lkIHNjaGVkdWxlTG9hZChXZWJDb3JlOjpSZXNvdXJjZUxv YWRlciYsIFdlYkNvcmU6OkNhY2hlZFJlc291cmNlKiwgYm9vbCBzaG91bGRDbGVhclJlZmVycmVy T25IVFRQU1RvSFRUUFJlZGlyZWN0KTsKICAgICB2b2lkIHNjaGVkdWxlSW50ZXJuYWxseUZhaWxl ZExvYWQoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXImKTsK 437182 2021-09-02 12:31:10 -0700 2021-09-02 14:21:31 -0700 Patch for landing bug-229813-20210902123109.patch text/plain 6768 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2MThmZjI4NWM1YTQ0ZjQw N2VkZmI5ODk3MmI2OWYyZjMxYmUxODcuLmFiNTNhNjc4MmRmNzI0YjgyZGZiZTYyYzEwMzM0MDIw MWRhNGRlYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDktMDIgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgQnVmZmVyIGxhcmdlIG1lZGlhIFhI UnMgaW4gdGhlIE5ldHdvcmtQcm9jZXNzIHRvIHJlZHVjZSBJUEMgb3ZlcmhlYWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTgxMworICAgICAgICA8 cmRhcjovLzgyNDA2ODAzPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4u CisKKyAgICAgICAgV2hlbiBwbGF5aW5nIGJhY2sgbWVkaWEgdGhyb3VnaCBNU0UsIGEgc2lnbmlm aWNhbnQgYW1vdW50IG9mIENQVSB0aW1lIGlzIHNwZW50IHNlbmRpbmcKKyAgICAgICAgc21hbGwg Y2h1bmtzIG9mIGxvYWRlZCBtZWRpYSBhY3Jvc3MgdGhlIFhQQyBib3VuZGFyeSwgb24gdGhlIG9y ZGVyIG9mIDE2a2IgYXQgYSB0aW1lIG91dAorICAgICAgICBvZiBhIDEtM01CIHJlc291cmNlLiBU aGlzIGxhcmdlIG51bWJlciBvZiBzbWFsbCBYUEMgbWVzc2FnZXMsIGVhY2ggd2l0aCBhIGZpeGVk IGNvc3QsIGNhdXNlcworICAgICAgICBhIHJlbGF0aXZlbHkgbGFyZ2UgQ1BVIG92ZXJoZWFkLiBN ZWRpYSBsb2FkZWQgZGlyZWN0bHkgdGhyb3VnaCBhIEhUTUxNZWRpYUVsZW1lbnQgYWxyZWFkeQor ICAgICAgICBpcyBjb2FsZXNjZWQgaW4gdGhlIE5ldHdvcmtQcm9jZXNzIG9uIGEgNTBtcyB0aW1l ci4KKworICAgICAgICBCdWZmZXIgYWxsIGxvYWRzIG9mIGxhcmdlIG1lZGlhIHJlc291cmNlcywg cGVyZm9ybWVkIG92ZXIgZmV0Y2goKSBvciBYSFIsIHdoZW4gdGhvc2UgcmVzb3VyY2VzCisgICAg ICAgIGhhdmUgYW4gZXhwZWN0ZWQgbGVuZ3RoIG9mIG1vcmUgdGhhbiAxTUIsIGJ5IGNvYWxlc2Np bmcgdGhlbSBvbiB0aGUgc2FtZSA1MG1zIHRpbWVyIGFzIHdlIHVzZQorICAgICAgICBmb3IgSFRN TE1lZGlhRWxlbWVudC1nZW5lcmF0ZWQgbG9hZHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdv cmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwOgorICAgICAgICAoV2ViS2l0OjptYXhpbXVtQnVmZmVy aW5nVGltZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5 Lmg6CisKIDIwMjEtMDgtMTcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAg ICAgICAgRGUtZHVwbGljYXRlIHRoZSBDb2NvYS1zcGVjaWZpYyBNZWRpYVBsYXllclByaXZhdGVS ZW1vdGUgY29uc3RydWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaAppbmRleCA1Nzk0MDBkZGE2 ZTU1ZWNjMmRhZTRiNGNhNzA2ZWJiMTFhNzU3ODNmLi4xNDQ4M2VkZDM1ZDdkYWEwNDZlMjZlOTM1 M2IwYmQwNDgwNDAxYzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCkBAIC01NCw3ICs1NCw3 IEBAIHB1YmxpYzoKICAgICBSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlkZW50aWZpZXIgeyAwIH07 CiAgICAgVmVjdG9yPFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPj4gcmVxdWVzdEJvZHlTYW5kYm94 RXh0ZW5zaW9uczsgLy8gQ3JlYXRlZCBhdXRvbWF0aWNhbGx5IGZvciB0aGUgc2VuZGVyLgogICAg IFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiByZXNvdXJjZVNhbmRib3hFeHRlbnNpb247IC8vIENy ZWF0ZWQgYXV0b21hdGljYWxseSBmb3IgdGhlIHNlbmRlci4KLSAgICBTZWNvbmRzIG1heGltdW1C dWZmZXJpbmdUaW1lOworICAgIG11dGFibGUgU2Vjb25kcyBtYXhpbXVtQnVmZmVyaW5nVGltZTsK ICAgICBXZWJDb3JlOjpGZXRjaE9wdGlvbnMgb3B0aW9uczsKICAgICBzdGQ6Om9wdGlvbmFsPFdl YkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycz4gY3NwUmVzcG9uc2VI ZWFkZXJzOwogICAgIFdlYkNvcmU6OkNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3kgcGFyZW50Q3Jv c3NPcmlnaW5FbWJlZGRlclBvbGljeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCA4MmYxZTUzMDE0NGZhMGZm MmRhYjExZTY0NGMwOWI3ZjY4NjFhMDAwLi44MDdmMGZjZjA0OTFjMmFlZjMwNDBkM2IxMDc0MjE0 NGU5MWUzZmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiU2hh cmVkQnVmZmVyRGF0YVJlZmVyZW5jZS5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVy cy5oIgogI2luY2x1ZGUgIldlYkVycm9ycy5oIgorI2luY2x1ZGUgIldlYkxvYWRlclN0cmF0ZWd5 LmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViUmVzb3VyY2VM b2FkZXJNZXNzYWdlcy5oIgogI2luY2x1ZGUgIldlYlNXU2VydmVyQ29ubmVjdGlvbi5oIgpAQCAt NjMzLDYgKzYzNCwyNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJl c3BvbnNlKFJlc291cmNlUmVzcG9uc2UmJiByZWNlaXZlZFJlc3BvbgogICAgICAgICBtX2Nvbm5l Y3Rpb24tPmFkZE5ldHdvcmtMb2FkSW5mb3JtYXRpb24oaWRlbnRpZmllcigpLCBXVEZNb3ZlKGlu Zm9ybWF0aW9uKSk7CiAgICAgfQogCisgICAgYXV0byByZXNvdXJjZUxvYWRJbmZvID0gdGhpcy0+ cmVzb3VyY2VMb2FkSW5mbygpOworCisgICAgYXV0byBpc0ZldGNoT3JYSFIgPSBbXSAoY29uc3Qg UmVzb3VyY2VMb2FkSW5mbyYgaW5mbykgeworICAgICAgICByZXR1cm4gaW5mby50eXBlID09IFJl c291cmNlTG9hZEluZm86OlR5cGU6OkZldGNoCisgICAgICAgICAgICB8fCBpbmZvLnR5cGUgPT0g UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6WE1MSFRUUFJlcXVlc3Q7CisgICAgfTsKKworICAgIGF1 dG8gaXNNZWRpYU1JTUVUeXBlID0gW10gKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpIHsKKyAgICAg ICAgcmV0dXJuIG1pbWVUeXBlLnN0YXJ0c1dpdGhJZ25vcmluZ0FTQ0lJQ2FzZSgiYXVkaW8vIikK KyAgICAgICAgICAgIHx8IG1pbWVUeXBlLnN0YXJ0c1dpdGhJZ25vcmluZ0FTQ0lJQ2FzZSgidmlk ZW8vIikKKyAgICAgICAgICAgIHx8IGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1pbWVU eXBlLCAiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIik7CisgICAgfTsKKworICAgIGlmICghbV9i dWZmZXJlZERhdGEKKyAgICAgICAgJiYgbV9yZXNwb25zZS5leHBlY3RlZENvbnRlbnRMZW5ndGgo KSA+IHN0YXRpY19jYXN0PGxvbmcgbG9uZz4oMSAqIE1CKQorICAgICAgICAmJiBpc0ZldGNoT3JY SFIocmVzb3VyY2VMb2FkSW5mbykKKyAgICAgICAgJiYgaXNNZWRpYU1JTUVUeXBlKG1fcmVzcG9u c2UubWltZVR5cGUoKSkpIHsKKyAgICAgICAgbV9idWZmZXJlZERhdGEgPSBTaGFyZWRCdWZmZXI6 OmNyZWF0ZSgpOworICAgICAgICBtX3BhcmFtZXRlcnMubWF4aW11bUJ1ZmZlcmluZ1RpbWUgPSBX ZWJMb2FkZXJTdHJhdGVneTo6bWVkaWFNYXhpbXVtQnVmZmVyaW5nVGltZTsKKyAgICB9CisKICAg ICAvLyBGb3IgbXVsdGlwYXJ0L3gtbWl4ZWQtcmVwbGFjZSBkaWRSZWNlaXZlUmVzcG9uc2VBc3lu YyBnZXRzIGNhbGxlZCBtdWx0aXBsZSB0aW1lcyBhbmQgYnVmZmVyaW5nIHdvdWxkIHJlcXVpcmUg c3BlY2lhbCBoYW5kbGluZy4KICAgICBpZiAoIWlzU3luY2hyb25vdXMoKSAmJiBtX3Jlc3BvbnNl LmlzTXVsdGlwYXJ0KCkpCiAgICAgICAgIG1fYnVmZmVyZWREYXRhID0gbnVsbHB0cjsKQEAgLTcw Nyw3ICs3MjksNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3Bv bnNlKFJlc291cmNlUmVzcG9uc2UmJiByZWNlaXZlZFJlc3BvbgogICAgIHNlbmQoTWVzc2FnZXM6 OldlYlJlc291cmNlTG9hZGVyOjpEaWRSZWNlaXZlUmVzcG9uc2UgeyByZXNwb25zZSwgd2lsbFdh aXRGb3JDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSB9KTsKIAogICAgIGlmIChtX3BhcmFtZXRl cnMucGFnZUhhc1Jlc291cmNlTG9hZENsaWVudCkKLSAgICAgICAgbV9jb25uZWN0aW9uLT5uZXR3 b3JrUHJvY2VzcygpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5l dHdvcmtQcm9jZXNzUHJveHk6OlJlc291cmNlTG9hZERpZFJlY2VpdmVSZXNwb25zZShtX3BhcmFt ZXRlcnMud2ViUGFnZVByb3h5SUQsIHJlc291cmNlTG9hZEluZm8oKSwgcmVzcG9uc2UpLCAwKTsK KyAgICAgICAgbV9jb25uZWN0aW9uLT5uZXR3b3JrUHJvY2VzcygpLnBhcmVudFByb2Nlc3NDb25u ZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OlJlc291cmNlTG9h ZERpZFJlY2VpdmVSZXNwb25zZShtX3BhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQsIHJlc291cmNl TG9hZEluZm8sIHJlc3BvbnNlKSwgMCk7CiAKICAgICBpZiAod2lsbFdhaXRGb3JDb250aW51ZURp ZFJlY2VpdmVSZXNwb25zZSkgewogICAgICAgICBtX3Jlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAppbmRleCA2ZTk2OTA3MjU0 YTRiZDE1NWY1OGRmMTM3ODQ4YjYwNTMxOWY1MTU1Li5jN2RmYTYwMDM3ODcxOTM2OThlMmE2MWQy MWNkNDFmNjg5MTZjM2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCkBAIC0xNTEsNyArMTUxLDcgQEAgc3RhdGlj IFNlY29uZHMgbWF4aW11bUJ1ZmZlcmluZ1RpbWUoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQog ICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OkltYWdlUmVzb3VyY2U6CiAgICAgICAgIHJl dHVybiA1MDBfbXM7CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6TWVkaWFSZXNvdXJj ZToKLSAgICAgICAgcmV0dXJuIDUwX21zOworICAgICAgICByZXR1cm4gV2ViTG9hZGVyU3RyYXRl Z3k6Om1lZGlhTWF4aW11bUJ1ZmZlcmluZ1RpbWU7CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6 VHlwZTo6TWFpblJlc291cmNlOgogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlR5cGU6Okljb246 CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6UmF3UmVzb3VyY2U6CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaAppbmRl eCBjYTIzNDk5NTg2NjZhODAxYjBlMGE2YmQ3NjdkYmJjY2NmYjcxNmFlLi43YTczZGNjNGFhMGQw Njk4MmQxNzMwOGY0NjVlZGJjZGI1NGViNWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmgKQEAgLTkxLDYgKzkxLDggQEAg cHVibGljOgogCiAgICAgc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRlTG9hZElkZW50aWZpZXIoKTsK IAorICAgIHN0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBtZWRpYU1heGltdW1CdWZmZXJpbmdUaW1l IHsgNTBfbXMgfTsKKwogcHJpdmF0ZToKICAgICB2b2lkIHNjaGVkdWxlTG9hZChXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlciYsIFdlYkNvcmU6OkNhY2hlZFJlc291cmNlKiwgYm9vbCBzaG91bGRDbGVh clJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KTsKICAgICB2b2lkIHNjaGVkdWxlSW50ZXJu YWxseUZhaWxlZExvYWQoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXImKTsK 437198 2021-09-02 14:21:43 -0700 2021-09-03 09:41:14 -0700 Patch for landing bug-229813-20210902142142.patch text/plain 7023 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE1MDJmZmRhYzRiYWIzYjgx ZDE4NGIyYmM0OGE1OTViMzNiZWJlNWYuLjFiZmJmNzkxZDRhNjVlNDlkZjQzYzdmNmQ0MWY5OTdh MTQ2ZjAyZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDktMDIgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgQnVmZmVyIGxhcmdlIG1lZGlhIFhI UnMgaW4gdGhlIE5ldHdvcmtQcm9jZXNzIHRvIHJlZHVjZSBJUEMgb3ZlcmhlYWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTgxMworICAgICAgICA8 cmRhcjovLzgyNDA2ODAzPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4u CisKKyAgICAgICAgV2hlbiBwbGF5aW5nIGJhY2sgbWVkaWEgdGhyb3VnaCBNU0UsIGEgc2lnbmlm aWNhbnQgYW1vdW50IG9mIENQVSB0aW1lIGlzIHNwZW50IHNlbmRpbmcKKyAgICAgICAgc21hbGwg Y2h1bmtzIG9mIGxvYWRlZCBtZWRpYSBhY3Jvc3MgdGhlIFhQQyBib3VuZGFyeSwgb24gdGhlIG9y ZGVyIG9mIDE2a2IgYXQgYSB0aW1lIG91dAorICAgICAgICBvZiBhIDEtM01CIHJlc291cmNlLiBU aGlzIGxhcmdlIG51bWJlciBvZiBzbWFsbCBYUEMgbWVzc2FnZXMsIGVhY2ggd2l0aCBhIGZpeGVk IGNvc3QsIGNhdXNlcworICAgICAgICBhIHJlbGF0aXZlbHkgbGFyZ2UgQ1BVIG92ZXJoZWFkLiBN ZWRpYSBsb2FkZWQgZGlyZWN0bHkgdGhyb3VnaCBhIEhUTUxNZWRpYUVsZW1lbnQgYWxyZWFkeQor ICAgICAgICBpcyBjb2FsZXNjZWQgaW4gdGhlIE5ldHdvcmtQcm9jZXNzIG9uIGEgNTBtcyB0aW1l ci4KKworICAgICAgICBCdWZmZXIgYWxsIGxvYWRzIG9mIGxhcmdlIG1lZGlhIHJlc291cmNlcywg cGVyZm9ybWVkIG92ZXIgZmV0Y2goKSBvciBYSFIsIHdoZW4gdGhvc2UgcmVzb3VyY2VzCisgICAg ICAgIGhhdmUgYW4gZXhwZWN0ZWQgbGVuZ3RoIG9mIG1vcmUgdGhhbiAxTUIsIGJ5IGNvYWxlc2Np bmcgdGhlbSBvbiB0aGUgc2FtZSA1MG1zIHRpbWVyIGFzIHdlIHVzZQorICAgICAgICBmb3IgSFRN TE1lZGlhRWxlbWVudC1nZW5lcmF0ZWQgbG9hZHMuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdv cmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwOgorICAgICAgICAoV2ViS2l0OjptYXhpbXVtQnVmZmVy aW5nVGltZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5 Lmg6CisKIDIwMjEtMDktMDIgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAg ICAgICBbTVNFXVtHUFVQXSBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQyBkb2VzIG5vdCB3b3Jr IHByb3Blcmx5IHdoZW4gYXVkaW8gYW5kIHZpZGVvIGV4Y2hhbmdlIHRoZWlyIHRyYWNrIElEcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VM b2FkUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkUGFyYW1ldGVycy5oCmluZGV4IDA0ZDVhNzE1OWExNmE2YmY3MzM5YTY4YTg0ZTY0 OTRlMmFhMDdlZTIuLmNjYzhiNTNjZjhkZWI4YzBjNWFjMWRmNjIxMjkyZjRjOWRmNjVlZGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZFBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogICAgIG11 dGFibGUgUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVyIHsgMCB9OwogICAgIFZlY3Rv cjxSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4+IHJlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbnM7 IC8vIENyZWF0ZWQgYXV0b21hdGljYWxseSBmb3IgdGhlIHNlbmRlci4KICAgICBSZWZQdHI8U2Fu ZGJveEV4dGVuc2lvbj4gcmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9uOyAvLyBDcmVhdGVkIGF1dG9t YXRpY2FsbHkgZm9yIHRoZSBzZW5kZXIuCi0gICAgU2Vjb25kcyBtYXhpbXVtQnVmZmVyaW5nVGlt ZTsKKyAgICBtdXRhYmxlIFNlY29uZHMgbWF4aW11bUJ1ZmZlcmluZ1RpbWU7CiAgICAgV2ViQ29y ZTo6RmV0Y2hPcHRpb25zIG9wdGlvbnM7CiAgICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpDb250 ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnM+IGNzcFJlc3BvbnNlSGVhZGVyczsKICAg ICBXZWJDb3JlOjpDcm9zc09yaWdpbkVtYmVkZGVyUG9saWN5IHBhcmVudENyb3NzT3JpZ2luRW1i ZWRkZXJQb2xpY3k7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggM2Y5YjFlNTM4ZDM5NzYyNjA1ZTI0NDhhMGI5 ZDI2ZjgzNzZmZjMwZi4uNTc4NzNmNDU0ZTE0MDg1ZmFmODhlOGVjMDk5ZmJiNjc5NDhlOWU3OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VM b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmNwcApAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlckRh dGFSZWZlcmVuY2UuaCIKICNpbmNsdWRlICJXZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKICNpbmNs dWRlICJXZWJFcnJvcnMuaCIKKyNpbmNsdWRlICJXZWJMb2FkZXJTdHJhdGVneS5oIgogI2luY2x1 ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgogI2luY2x1ZGUgIldlYlJlc291cmNlTG9hZGVyTWVzc2Fn ZXMuaCIKICNpbmNsdWRlICJXZWJTV1NlcnZlckNvbm5lY3Rpb24uaCIKQEAgLTY0Myw2ICs2NDQs MjcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNv dXJjZVJlc3BvbnNlJiYgcmVjZWl2ZWRSZXNwb24KICAgICAgICAgbV9jb25uZWN0aW9uLT5hZGRO ZXR3b3JrTG9hZEluZm9ybWF0aW9uKGNvcmVJZGVudGlmaWVyKCksIFdURk1vdmUoaW5mb3JtYXRp b24pKTsKICAgICB9CiAKKyAgICBhdXRvIHJlc291cmNlTG9hZEluZm8gPSB0aGlzLT5yZXNvdXJj ZUxvYWRJbmZvKCk7CisKKyAgICBhdXRvIGlzRmV0Y2hPclhIUiA9IFtdIChjb25zdCBSZXNvdXJj ZUxvYWRJbmZvJiBpbmZvKSB7CisgICAgICAgIHJldHVybiBpbmZvLnR5cGUgPT0gUmVzb3VyY2VM b2FkSW5mbzo6VHlwZTo6RmV0Y2gKKyAgICAgICAgICAgIHx8IGluZm8udHlwZSA9PSBSZXNvdXJj ZUxvYWRJbmZvOjpUeXBlOjpYTUxIVFRQUmVxdWVzdDsKKyAgICB9OworCisgICAgYXV0byBpc01l ZGlhTUlNRVR5cGUgPSBbXSAoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgeworICAgICAgICByZXR1 cm4gbWltZVR5cGUuc3RhcnRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCJhdWRpby8iKQorICAgICAg ICAgICAgfHwgbWltZVR5cGUuc3RhcnRzV2l0aElnbm9yaW5nQVNDSUlDYXNlKCJ2aWRlby8iKQor ICAgICAgICAgICAgfHwgZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UobWltZVR5cGUsICJh cHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iKTsKKyAgICB9OworCisgICAgaWYgKCFtX2J1ZmZlcmVk RGF0YQorICAgICAgICAmJiBtX3Jlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpID4gc3Rh dGljX2Nhc3Q8bG9uZyBsb25nPigxICogTUIpCisgICAgICAgICYmIGlzRmV0Y2hPclhIUihyZXNv dXJjZUxvYWRJbmZvKQorICAgICAgICAmJiBpc01lZGlhTUlNRVR5cGUobV9yZXNwb25zZS5taW1l VHlwZSgpKSkgeworICAgICAgICBtX2J1ZmZlcmVkRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRl KCk7CisgICAgICAgIG1fcGFyYW1ldGVycy5tYXhpbXVtQnVmZmVyaW5nVGltZSA9IFdlYkxvYWRl clN0cmF0ZWd5OjptZWRpYU1heGltdW1CdWZmZXJpbmdUaW1lOworICAgIH0KKwogICAgIC8vIEZv ciBtdWx0aXBhcnQveC1taXhlZC1yZXBsYWNlIGRpZFJlY2VpdmVSZXNwb25zZUFzeW5jIGdldHMg Y2FsbGVkIG11bHRpcGxlIHRpbWVzIGFuZCBidWZmZXJpbmcgd291bGQgcmVxdWlyZSBzcGVjaWFs IGhhbmRsaW5nLgogICAgIGlmICghaXNTeW5jaHJvbm91cygpICYmIG1fcmVzcG9uc2UuaXNNdWx0 aXBhcnQoKSkKICAgICAgICAgbV9idWZmZXJlZERhdGEgPSBudWxscHRyOwpAQCAtNzE3LDcgKzcz OSw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoUmVz b3VyY2VSZXNwb25zZSYmIHJlY2VpdmVkUmVzcG9uCiAgICAgc2VuZChNZXNzYWdlczo6V2ViUmVz b3VyY2VMb2FkZXI6OkRpZFJlY2VpdmVSZXNwb25zZSB7IHJlc3BvbnNlLCB3aWxsV2FpdEZvckNv bnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlIH0pOwogCiAgICAgaWYgKG1fcGFyYW1ldGVycy5wYWdl SGFzUmVzb3VyY2VMb2FkQ2xpZW50KQotICAgICAgICBtX2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9j ZXNzKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6TmV0d29ya1By b2Nlc3NQcm94eTo6UmVzb3VyY2VMb2FkRGlkUmVjZWl2ZVJlc3BvbnNlKG1fcGFyYW1ldGVycy53 ZWJQYWdlUHJveHlJRCwgcmVzb3VyY2VMb2FkSW5mbygpLCByZXNwb25zZSksIDApOworICAgICAg ICBtX2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9jZXNzKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24o KS0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6UmVzb3VyY2VMb2FkRGlkUmVj ZWl2ZVJlc3BvbnNlKG1fcGFyYW1ldGVycy53ZWJQYWdlUHJveHlJRCwgcmVzb3VyY2VMb2FkSW5m bywgcmVzcG9uc2UpLCAwKTsKIAogICAgIGlmICh3aWxsV2FpdEZvckNvbnRpbnVlRGlkUmVjZWl2 ZVJlc3BvbnNlKSB7CiAgICAgICAgIG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDVkZmRiZWZlZWEyZTY0Y2Vi MjQwZjY1NzQ3ZDhlYzQ1OWQwNWZmNjQuLjM1MjUzMTA2Y2IxZDMwMTMzOWMyYjMwZTg2MDJmNmJm MjRhM2U3MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCBzdGF0aWMgU2Vjb25k cyBtYXhpbXVtQnVmZmVyaW5nVGltZShDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UpCiAgICAgY2Fz ZSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6SW1hZ2VSZXNvdXJjZToKICAgICAgICAgcmV0dXJuIDUw MF9tczsKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpUeXBlOjpNZWRpYVJlc291cmNlOgotICAg ICAgICByZXR1cm4gNTBfbXM7CisgICAgICAgIHJldHVybiBXZWJMb2FkZXJTdHJhdGVneTo6bWVk aWFNYXhpbXVtQnVmZmVyaW5nVGltZTsKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpUeXBlOjpN YWluUmVzb3VyY2U6CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6SWNvbjoKICAgICBj YXNlIENhY2hlZFJlc291cmNlOjpUeXBlOjpSYXdSZXNvdXJjZToKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmggYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oCmluZGV4IDI0YjY5 Mzc5MDE3ZDU0MzliYmIxZTFiM2QxYTk1YzhiNzkyMzYwZWYuLmM3OTZhZTUwZjE0YzE2ZWMyNWU2 ZTAxNDlkNzY2YmY3ZDExZTE4N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaApAQCAtOTQsNiArOTQsOCBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIHNldEV4aXN0aW5nTmV0d29ya1Jlc291cmNlTG9hZElkZW50aWZpZXJUb1Jl c3VtZShzdGQ6Om9wdGlvbmFsPE5ldHdvcmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyPiBleGlzdGlu Z05ldHdvcmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyVG9SZXN1bWUpIHsgbV9leGlzdGluZ05ldHdv cmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyVG9SZXN1bWUgPSBleGlzdGluZ05ldHdvcmtSZXNvdXJj ZUxvYWRJZGVudGlmaWVyVG9SZXN1bWU7IH0KIAorICAgIHN0YXRpYyBjb25zdGV4cHIgU2Vjb25k cyBtZWRpYU1heGltdW1CdWZmZXJpbmdUaW1lIHsgNTBfbXMgfTsKKwogcHJpdmF0ZToKICAgICB2 b2lkIHNjaGVkdWxlTG9hZChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlciYsIFdlYkNvcmU6OkNhY2hl ZFJlc291cmNlKiwgYm9vbCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0 KTsKICAgICB2b2lkIHNjaGVkdWxlSW50ZXJuYWxseUZhaWxlZExvYWQoV2ViQ29yZTo6UmVzb3Vy Y2VMb2FkZXImKTsK