221871 2021-02-13 15:35:32 -0800 Web Inspector: Add a way to wake up debuggables to the remote inspector protocol 2021-02-15 16:16:56 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 221933 1 timothy timothy bburg ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1728953 0 timothy 2021-02-13 15:35:32 -0800 We need a way to wake up debuggables on the target side for an application. rdar://70351644 1728956 1 420228 timothy 2021-02-13 15:40:45 -0800 Created attachment 420228 Patch 1729403 2 420228 hi 2021-02-15 14:56:09 -0800 Comment on attachment 420228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420228&action=review > Source/WebKit/UIProcess/Cocoa/AutomationClient.mm:96 > +void AutomationClient::requestedDebuggablesToWakeUp() This feels kinda wrong IMO. I don't think an Inspector feature should rely on anything `Automation*`. I think it would be better to rename `RemoteInspector::Client` to `RemoteInspector::AutomationClient` and create a new `RemoteInspector::Client` that is initialized/inherited elsewhere. 1729413 3 420228 timothy 2021-02-15 15:05:08 -0800 Comment on attachment 420228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420228&action=review >> Source/WebKit/UIProcess/Cocoa/AutomationClient.mm:96 >> +void AutomationClient::requestedDebuggablesToWakeUp() > > This feels kinda wrong IMO. I don't think an Inspector feature should rely on anything `Automation*`. I think it would be better to rename `RemoteInspector::Client` to `RemoteInspector::AutomationClient` and create a new `RemoteInspector::Client` that is initialized/inherited elsewhere. It is only called `AutomationClient` in WebKit. It is technically the `RemoteInspectorClient`. It should be renamed at some point. 1729423 4 420385 timothy 2021-02-15 15:18:12 -0800 Created attachment 420385 Patch 1729426 5 420385 hi 2021-02-15 15:23:47 -0800 Comment on attachment 420385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420385&action=review > Source/WebKit/UIProcess/API/Cocoa/_WKAutomationDelegate.h:39 > +// FIXME: Consider renaming WebKit::AutomationClient and _WKAutomationDelegate to _WKInspectorDelegate since it isn't only used for automation now. http://webkit.org/b/221933 NIT: I'd put this in `RemoteInspector::receivedWakeUpDebuggables` and `AutomationClient::requestedDebuggablesToWakeUp` too so that it's more visible and less likely to be missed/forgotten :) 1729428 6 420385 timothy 2021-02-15 15:30:32 -0800 Comment on attachment 420385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420385&action=review >> Source/WebKit/UIProcess/API/Cocoa/_WKAutomationDelegate.h:39 >> +// FIXME: Consider renaming WebKit::AutomationClient and _WKAutomationDelegate to _WKInspectorDelegate since it isn't only used for automation now. http://webkit.org/b/221933 > > NIT: I'd put this in `RemoteInspector::receivedWakeUpDebuggables` and `AutomationClient::requestedDebuggablesToWakeUp` too so that it's more visible and less likely to be missed/forgotten :) I don't think `RemoteInspector::receivedWakeUpDebuggables` is a good place for that comment since RemoteInspector is the right place. The WebKit side is what needs changed. 1729429 7 420387 timothy 2021-02-15 15:30:50 -0800 Created attachment 420387 Patch 1729443 8 ews-feeder 2021-02-15 16:16:54 -0800 Committed r272889: <https://commits.webkit.org/r272889> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420387. 420228 2021-02-13 15:40:45 -0800 2021-02-15 15:18:10 -0800 Patch bug-221871-20210213154044.patch text/plain 8997 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MjliMzUyMDA1YzVlN2ZkZDQxMjYyM2U1NWVkZGRkN2FlYjQ2MDJlLi42MTc5NzYwNzU0YzZhOGI4 ODI5NTIwYzU4YmNkZGYyYTIyYmMyMjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0wMi0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgd2F5IHRvIHdha2UgdXAgZGVidWdn YWJsZXMgdG8gdGhlIHJlbW90ZSBpbnNwZWN0b3IgcHJvdG9jb2wKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg3MQorICAgICAgICByZGFyOi8vNzAz NTE2NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmg6CisgICAgICAgICogaW5zcGVjdG9y L3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JDb25zdGFudHMuaDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv cmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tOgorICAgICAgICAoSW5zcGVjdG9y OjpSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rpb25SZWNlaXZlZE1lc3NhZ2UpOiBIYW5kbGUg V0lSQXBwbGljYXRpb25XYWtlVXBEZWJ1Z2dhYmxlc01lc3NhZ2UuCisgICAgICAgIChJbnNwZWN0 b3I6OlJlbW90ZUluc3BlY3Rvcjo6cmVjZWl2ZWRXYWtlVXBEZWJ1Z2dhYmxlcyk6IEFkZGVkLiBD YWxsIHRoZSBjbGllbnQuCisKIDIwMjEtMDItMDEgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFw cGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBBdG9taWNzIHNob3VsZCBzdXBwb3J0IEJpZ0ludDY0 QXJyYXkgLyBCaWdVaW50NjRBcnJheQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NmIzMGMzNTA1NGEzODczZDkyNGMw OTAxODM5OGFkNjUyMTZjYTBlLi5lM2Q2NGQ2YTM1YmE0MGJjZWIzYzVkMTZmZWE4ZWIxMTRmNWNk MzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAyLTEzICBUaW1vdGh5IEhhdGNo ZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgYSB3 YXkgdG8gd2FrZSB1cCBkZWJ1Z2dhYmxlcyB0byB0aGUgcmVtb3RlIGluc3BlY3RvciBwcm90b2Nv bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxODcx CisgICAgICAgIHJkYXI6Ly83MDM1MTY0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVs ZWdhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tOgorICAgICAgICAo V2ViS2l0OjpBdXRvbWF0aW9uQ2xpZW50OjpBdXRvbWF0aW9uQ2xpZW50KTogQ2hlY2sgaWYgdGhl IGRlbGVnYXRlIHJlc3BvbmRzIHRvIG5ldyBtZXRob2QuCisgICAgICAgIChXZWJLaXQ6OkF1dG9t YXRpb25DbGllbnQ6OnJlcXVlc3RlZERlYnVnZ2FibGVzVG9XYWtlVXApOiBBZGRlZC4gQ2FsbCBu ZXcgcHJvY2VzcyBwb29sIGRlbGVnYXRlIG1ldGhvZC4KKwogMjAyMS0wMi0wMyAgTWljaGFlbCBD YXRhbnphcm8gIDxtY2F0YW56YXJvQGdub21lLm9yZz4KIAogICAgICAgICBbR1RLXSB3ZWJraXRf c2V0dGluZ3Nfc2V0X2VuYWJsZV9wbHVnaW5zIGRlcHJlY2F0aW9uIHdhcm5pbmcgYnJlYWtzIHVu aXQgdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVt b3RlL1JlbW90ZUluc3BlY3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKaW5kZXggZmY0MDA5MmVhZWY1YjllODJmMDIwNjdiMTZi OTk3MGZhODhkY2E1YS4uYTA3MWRiMTNlYmIyNWQyMmRkZjAwMTI5ZWRhMDE1MTZhYjZhN2YyMiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3Rl SW5zcGVjdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUv UmVtb3RlSW5zcGVjdG9yLmgKQEAgLTExMiw2ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZp cnR1YWwgU3RyaW5nIGJyb3dzZXJOYW1lKCkgY29uc3QgeyByZXR1cm4geyB9OyB9CiAgICAgICAg IHZpcnR1YWwgU3RyaW5nIGJyb3dzZXJWZXJzaW9uKCkgY29uc3QgeyByZXR1cm4geyB9OyB9CiAg ICAgICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oY29uc3QgU3RyaW5n JiBzZXNzaW9uSWRlbnRpZmllciwgY29uc3QgU2Vzc2lvbkNhcGFiaWxpdGllcyYpID0gMDsKKyAg ICAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RlZERlYnVnZ2FibGVzVG9XYWtlVXAoKSB7IH07CiAj aWYgVVNFKElOU1BFQ1RPUl9TT0NLRVRfU0VSVkVSKQogICAgICAgICB2aXJ0dWFsIHZvaWQgY2xv c2VBdXRvbWF0aW9uU2Vzc2lvbigpID0gMDsKICNlbmRpZgpAQCAtMjE4LDYgKzIxOSw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCByZWNlaXZlZERhdGFNZXNzYWdlKE5TRGljdGlvbmFyeSAqdXNlcklu Zm8pOwogICAgIHZvaWQgcmVjZWl2ZWREaWRDbG9zZU1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2Vy SW5mbyk7CiAgICAgdm9pZCByZWNlaXZlZEdldExpc3RpbmdNZXNzYWdlKE5TRGljdGlvbmFyeSAq dXNlckluZm8pOworICAgIHZvaWQgcmVjZWl2ZWRXYWtlVXBEZWJ1Z2dhYmxlcyhOU0RpY3Rpb25h cnkgKnVzZXJJbmZvKTsKICAgICB2b2lkIHJlY2VpdmVkSW5kaWNhdGVNZXNzYWdlKE5TRGljdGlv bmFyeSAqdXNlckluZm8pOwogICAgIHZvaWQgcmVjZWl2ZWRQcm94eUFwcGxpY2F0aW9uU2V0dXBN ZXNzYWdlKE5TRGljdGlvbmFyeSAqdXNlckluZm8pOwogICAgIHZvaWQgcmVjZWl2ZWRDb25uZWN0 aW9uRGllZE1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2VySW5mbyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JDb25zdGFu dHMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3Bl Y3RvckNvbnN0YW50cy5oCmluZGV4IDAwNDg1NjE4YmNmOWRiNTY1OWNmNDZlYjMwMjVkY2NkZmJk YjZjMWYuLmNjMmNjMjU0ZDQyMDlhODVmYTQyZGZlNDQ4ODEzNjdhYjNjZjgxNTkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rv ckNvbnN0YW50cy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3Rl L1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5oCkBAIC01Nyw2ICs1Nyw3IEBACiAjZGVmaW5lIFdJ UkFwcGxpY2F0aW9uRGljdGlvbmFyeUtleSAgICAgICAgICAgICBAIldJUkFwcGxpY2F0aW9uRGlj dGlvbmFyeUtleSIKICNkZWZpbmUgV0lSTWVzc2FnZURhdGFLZXkgICAgICAgICAgICAgICAgICAg ICAgIEAiV0lSTWVzc2FnZURhdGFLZXkiCiAjZGVmaW5lIFdJUkFwcGxpY2F0aW9uR2V0TGlzdGlu Z01lc3NhZ2UgICAgICAgICBAIldJUkFwcGxpY2F0aW9uR2V0TGlzdGluZ01lc3NhZ2UiCisjZGVm aW5lIFdJUkFwcGxpY2F0aW9uV2FrZVVwRGVidWdnYWJsZXNNZXNzYWdlICBAIldJUkFwcGxpY2F0 aW9uV2FrZVVwRGVidWdnYWJsZXNNZXNzYWdlIgogI2RlZmluZSBXSVJJbmRpY2F0ZU1lc3NhZ2Ug ICAgICAgICAgICAgICAgICAgICAgQCJXSVJJbmRpY2F0ZU1lc3NhZ2UiCiAjZGVmaW5lIFdJUklu ZGljYXRlRW5hYmxlZEtleSAgICAgICAgICAgICAgICAgICBAIldJUkluZGljYXRlRW5hYmxlZEtl eSIKICNkZWZpbmUgV0lSU2VuZGVyS2V5ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEAiV0lS U2VuZGVyS2V5IgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQppbmRleCA2 ZGJiYTMxMmI4OGU4NzNiNzFlNzVkNmMzNTRjMjNlMjRmMjFkNGE3Li4xODUwYzRkNzA5MmM1MDFj YjJjZDkxZTExMGEyZTY3ZDVjYzI4NTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0 b3JDb2NvYS5tbQpAQCAtMzI2LDYgKzMyNiw4IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp4cGND b25uZWN0aW9uUmVjZWl2ZWRNZXNzYWdlKFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24qCiAg ICAgICAgIHJlY2VpdmVkRGlkQ2xvc2VNZXNzYWdlKHVzZXJJbmZvKTsKICAgICBlbHNlIGlmIChb bWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUkFwcGxpY2F0aW9uR2V0TGlzdGluZ01lc3Nh Z2VdKQogICAgICAgICByZWNlaXZlZEdldExpc3RpbmdNZXNzYWdlKHVzZXJJbmZvKTsKKyAgICBl bHNlIGlmIChbbWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUkFwcGxpY2F0aW9uV2FrZVVw RGVidWdnYWJsZXNNZXNzYWdlXSkKKyAgICAgICAgcmVjZWl2ZWRXYWtlVXBEZWJ1Z2dhYmxlcyh1 c2VySW5mbyk7CiAgICAgZWxzZSBpZiAoW21lc3NhZ2VOYW1lIGlzRXF1YWxUb1N0cmluZzpXSVJJ bmRpY2F0ZU1lc3NhZ2VdKQogICAgICAgICByZWNlaXZlZEluZGljYXRlTWVzc2FnZSh1c2VySW5m byk7CiAgICAgZWxzZSBpZiAoW21lc3NhZ2VOYW1lIGlzRXF1YWxUb1N0cmluZzpXSVJQcm94eUFw cGxpY2F0aW9uU2V0dXBNZXNzYWdlXSkKQEAgLTU5Miw2ICs1OTQsMTIgQEAgdm9pZCBSZW1vdGVJ bnNwZWN0b3I6OnJlY2VpdmVkR2V0TGlzdGluZ01lc3NhZ2UoTlNEaWN0aW9uYXJ5ICopCiAgICAg cHVzaExpc3RpbmdzTm93KCk7CiB9CiAKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yOjpyZWNlaXZlZFdh a2VVcERlYnVnZ2FibGVzKE5TRGljdGlvbmFyeSAqKQoreworICAgIGlmIChtX2NsaWVudCkKKyAg ICAgICAgbV9jbGllbnQtPnJlcXVlc3RlZERlYnVnZ2FibGVzVG9XYWtlVXAoKTsKK30KKwogdm9p ZCBSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkSW5kaWNhdGVNZXNzYWdlKE5TRGljdGlvbmFyeSAq dXNlckluZm8pCiB7CiAgICAgTlNOdW1iZXIgKnRhcmdldElkZW50aWZpZXJOdW1iZXIgPSB1c2Vy SW5mb1tXSVJUYXJnZXRJZGVudGlmaWVyS2V5XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdhdGUuaAppbmRleCAyNWI0 MWU1N2Y5MThiY2RjZDllZGJmNDA4OTM1ZmVmYzdiM2ZjNmZkLi5hMGYxYjg1ODAxODQzMTFmODEy Y2MxMTA4NTk3MDA1ZWQ2ODllMzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvbkRlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxlZ2F0ZS5oCkBAIC0zNSw0ICszNSw2 IEBACiAKIC0gKE5TU3RyaW5nICopX3Byb2Nlc3NQb29sQnJvd3Nlck5hbWVGb3JBdXRvbWF0aW9u OihXS1Byb2Nlc3NQb29sICopcHJvY2Vzc1Bvb2wgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4x NCksIGlvcygxMi4wKSk7CiAtIChOU1N0cmluZyAqKV9wcm9jZXNzUG9vbEJyb3dzZXJWZXJzaW9u Rm9yQXV0b21hdGlvbjooV0tQcm9jZXNzUG9vbCAqKXByb2Nlc3NQb29sIFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoMTAuMTQpLCBpb3MoMTIuMCkpOworCistICh2b2lkKV9wcm9jZXNzUG9vbERpZFJl cXVlc3RJbnNwZWN0b3JEZWJ1Z2dhYmxlc1RvV2FrZVVwOihXS1Byb2Nlc3NQb29sICopcHJvY2Vz c1Bvb2wgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEp KTsKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9t YXRpb25DbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25D bGllbnQuaAppbmRleCA0NzdlYjZhYzU3MTM1Y2JhN2ZjZWM1YzlkNmU2ZmM3OTVhOTVhM2MxLi4z NjY0MjY3YjZiZjU3Mzk0Y2Q3MTkxZWRiZjMxYjcwNzA3NmIxODQ5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50LmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5oCkBAIC01MSw2ICs1MSw3 IEBAIHByaXZhdGU6CiAgICAgLy8gUmVtb3RlSW5zcGVjdG9yOjpDbGllbnQKICAgICBib29sIHJl bW90ZUF1dG9tYXRpb25BbGxvd2VkKCkgY29uc3QgZmluYWw7CiAgICAgdm9pZCByZXF1ZXN0QXV0 b21hdGlvblNlc3Npb24oY29uc3QgU3RyaW5nJiBzZXNzaW9uSWRlbnRpZmllciwgY29uc3QgSW5z cGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OkNsaWVudDo6U2Vzc2lvbkNhcGFiaWxpdGllcyYpIGZp bmFsOworICAgIHZvaWQgcmVxdWVzdGVkRGVidWdnYWJsZXNUb1dha2VVcCgpIGZpbmFsOwogICAg IFN0cmluZyBicm93c2VyTmFtZSgpIGNvbnN0IGZpbmFsOwogICAgIFN0cmluZyBicm93c2VyVmVy c2lvbigpIGNvbnN0IGZpbmFsOwogCkBAIC02MCw2ICs2MSw3IEBAIHByaXZhdGU6CiAgICAgc3Ry dWN0IHsKICAgICAgICAgYm9vbCBhbGxvd3NSZW1vdGVBdXRvbWF0aW9uIDogMTsKICAgICAgICAg Ym9vbCByZXF1ZXN0QXV0b21hdGlvblNlc3Npb24gOiAxOworICAgICAgICBib29sIHJlcXVlc3Rl ZERlYnVnZ2FibGVzVG9XYWtlVXAgOiAxOwogICAgICAgICBib29sIGJyb3dzZXJOYW1lRm9yQXV0 b21hdGlvbiA6IDE7CiAgICAgICAgIGJvb2wgYnJvd3NlclZlcnNpb25Gb3JBdXRvbWF0aW9uIDog MTsKICAgICB9IG1fZGVsZWdhdGVNZXRob2RzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQubW0KaW5kZXggYzJmYjlkMDAwZDhlNDczYmE3Zjgw MmE3YTUzNDVhNDQyM2YyYmEyYy4uZjg3Nzk1OTg5MzNiODMzZTkwZWU4MzljZmFlN2MxOWMwZDRi MzVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlv bkNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9u Q2xpZW50Lm1tCkBAIC00Niw2ICs0Niw3IEBAIEF1dG9tYXRpb25DbGllbnQ6OkF1dG9tYXRpb25D bGllbnQoV0tQcm9jZXNzUG9vbCAqcHJvY2Vzc1Bvb2wsIGlkIDxfV0tBdXRvbWF0aW9uCiB7CiAg ICAgbV9kZWxlZ2F0ZU1ldGhvZHMuYWxsb3dzUmVtb3RlQXV0b21hdGlvbiA9IFtkZWxlZ2F0ZSBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcm9jZXNzUG9vbEFsbG93c1JlbW90ZUF1dG9t YXRpb246KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdEF1dG9tYXRpb25TZXNzaW9u ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQb29sOmRp ZFJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbldpdGhJZGVudGlmaWVyOmNvbmZpZ3VyYXRpb246KV07 CisgICAgbV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdGVkRGVidWdnYWJsZXNUb1dha2VVcCA9IFtk ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcm9jZXNzUG9vbERpZFJlcXVl c3RJbnNwZWN0b3JEZWJ1Z2dhYmxlc1RvV2FrZVVwOildOwogICAgIG1fZGVsZWdhdGVNZXRob2Rz LmJyb3dzZXJOYW1lRm9yQXV0b21hdGlvbiA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9wcm9jZXNzUG9vbEJyb3dzZXJOYW1lRm9yQXV0b21hdGlvbjopXTsKICAgICBt X2RlbGVnYXRlTWV0aG9kcy5icm93c2VyVmVyc2lvbkZvckF1dG9tYXRpb24gPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfcHJvY2Vzc1Bvb2xCcm93c2VyVmVyc2lvbkZv ckF1dG9tYXRpb246KV07CiAKQEAgLTkyLDYgKzkzLDE0IEBAIHZvaWQgQXV0b21hdGlvbkNsaWVu dDo6cmVxdWVzdEF1dG9tYXRpb25TZXNzaW9uKGNvbnN0IFN0cmluZyYgc2Vzc2lvbklkZW50aWZp ZXIsCiAgICAgfSk7CiB9CiAKK3ZvaWQgQXV0b21hdGlvbkNsaWVudDo6cmVxdWVzdGVkRGVidWdn YWJsZXNUb1dha2VVcCgpCit7CisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzXSB7 CisgICAgICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0ZWREZWJ1Z2dhYmxlc1RvV2Fr ZVVwKQorICAgICAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX3Byb2Nlc3NQb29sRGlkUmVxdWVz dEluc3BlY3RvckRlYnVnZ2FibGVzVG9XYWtlVXA6bV9wcm9jZXNzUG9vbF07CisgICAgfSk7Cit9 CisKIFN0cmluZyBBdXRvbWF0aW9uQ2xpZW50Ojpicm93c2VyTmFtZSgpIGNvbnN0CiB7CiAgICAg aWYgKG1fZGVsZWdhdGVNZXRob2RzLmJyb3dzZXJOYW1lRm9yQXV0b21hdGlvbikK 420385 2021-02-15 15:18:12 -0800 2021-02-15 15:30:48 -0800 Patch bug-221871-20210215151811.patch text/plain 9173 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MjliMzUyMDA1YzVlN2ZkZDQxMjYyM2U1NWVkZGRkN2FlYjQ2MDJlLi42MTc5NzYwNzU0YzZhOGI4 ODI5NTIwYzU4YmNkZGYyYTIyYmMyMjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0wMi0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgd2F5IHRvIHdha2UgdXAgZGVidWdn YWJsZXMgdG8gdGhlIHJlbW90ZSBpbnNwZWN0b3IgcHJvdG9jb2wKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg3MQorICAgICAgICByZGFyOi8vNzAz NTE2NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmg6CisgICAgICAgICogaW5zcGVjdG9y L3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JDb25zdGFudHMuaDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv cmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tOgorICAgICAgICAoSW5zcGVjdG9y OjpSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rpb25SZWNlaXZlZE1lc3NhZ2UpOiBIYW5kbGUg V0lSQXBwbGljYXRpb25XYWtlVXBEZWJ1Z2dhYmxlc01lc3NhZ2UuCisgICAgICAgIChJbnNwZWN0 b3I6OlJlbW90ZUluc3BlY3Rvcjo6cmVjZWl2ZWRXYWtlVXBEZWJ1Z2dhYmxlcyk6IEFkZGVkLiBD YWxsIHRoZSBjbGllbnQuCisKIDIwMjEtMDItMDEgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFw cGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBBdG9taWNzIHNob3VsZCBzdXBwb3J0IEJpZ0ludDY0 QXJyYXkgLyBCaWdVaW50NjRBcnJheQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2NmIzMGMzNTA1NGEzODczZDkyNGMw OTAxODM5OGFkNjUyMTZjYTBlLi5lM2Q2NGQ2YTM1YmE0MGJjZWIzYzVkMTZmZWE4ZWIxMTRmNWNk MzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAyLTEzICBUaW1vdGh5IEhhdGNo ZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgYSB3 YXkgdG8gd2FrZSB1cCBkZWJ1Z2dhYmxlcyB0byB0aGUgcmVtb3RlIGluc3BlY3RvciBwcm90b2Nv bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxODcx CisgICAgICAgIHJkYXI6Ly83MDM1MTY0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVs ZWdhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tOgorICAgICAgICAo V2ViS2l0OjpBdXRvbWF0aW9uQ2xpZW50OjpBdXRvbWF0aW9uQ2xpZW50KTogQ2hlY2sgaWYgdGhl IGRlbGVnYXRlIHJlc3BvbmRzIHRvIG5ldyBtZXRob2QuCisgICAgICAgIChXZWJLaXQ6OkF1dG9t YXRpb25DbGllbnQ6OnJlcXVlc3RlZERlYnVnZ2FibGVzVG9XYWtlVXApOiBBZGRlZC4gQ2FsbCBu ZXcgcHJvY2VzcyBwb29sIGRlbGVnYXRlIG1ldGhvZC4KKwogMjAyMS0wMi0wMyAgTWljaGFlbCBD YXRhbnphcm8gIDxtY2F0YW56YXJvQGdub21lLm9yZz4KIAogICAgICAgICBbR1RLXSB3ZWJraXRf c2V0dGluZ3Nfc2V0X2VuYWJsZV9wbHVnaW5zIGRlcHJlY2F0aW9uIHdhcm5pbmcgYnJlYWtzIHVu aXQgdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVt b3RlL1JlbW90ZUluc3BlY3Rvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKaW5kZXggZmY0MDA5MmVhZWY1YjllODJmMDIwNjdiMTZi OTk3MGZhODhkY2E1YS4uYTA3MWRiMTNlYmIyNWQyMmRkZjAwMTI5ZWRhMDE1MTZhYjZhN2YyMiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3Rl SW5zcGVjdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUv UmVtb3RlSW5zcGVjdG9yLmgKQEAgLTExMiw2ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZp cnR1YWwgU3RyaW5nIGJyb3dzZXJOYW1lKCkgY29uc3QgeyByZXR1cm4geyB9OyB9CiAgICAgICAg IHZpcnR1YWwgU3RyaW5nIGJyb3dzZXJWZXJzaW9uKCkgY29uc3QgeyByZXR1cm4geyB9OyB9CiAg ICAgICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oY29uc3QgU3RyaW5n JiBzZXNzaW9uSWRlbnRpZmllciwgY29uc3QgU2Vzc2lvbkNhcGFiaWxpdGllcyYpID0gMDsKKyAg ICAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RlZERlYnVnZ2FibGVzVG9XYWtlVXAoKSB7IH07CiAj aWYgVVNFKElOU1BFQ1RPUl9TT0NLRVRfU0VSVkVSKQogICAgICAgICB2aXJ0dWFsIHZvaWQgY2xv c2VBdXRvbWF0aW9uU2Vzc2lvbigpID0gMDsKICNlbmRpZgpAQCAtMjE4LDYgKzIxOSw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCByZWNlaXZlZERhdGFNZXNzYWdlKE5TRGljdGlvbmFyeSAqdXNlcklu Zm8pOwogICAgIHZvaWQgcmVjZWl2ZWREaWRDbG9zZU1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2Vy SW5mbyk7CiAgICAgdm9pZCByZWNlaXZlZEdldExpc3RpbmdNZXNzYWdlKE5TRGljdGlvbmFyeSAq dXNlckluZm8pOworICAgIHZvaWQgcmVjZWl2ZWRXYWtlVXBEZWJ1Z2dhYmxlcyhOU0RpY3Rpb25h cnkgKnVzZXJJbmZvKTsKICAgICB2b2lkIHJlY2VpdmVkSW5kaWNhdGVNZXNzYWdlKE5TRGljdGlv bmFyeSAqdXNlckluZm8pOwogICAgIHZvaWQgcmVjZWl2ZWRQcm94eUFwcGxpY2F0aW9uU2V0dXBN ZXNzYWdlKE5TRGljdGlvbmFyeSAqdXNlckluZm8pOwogICAgIHZvaWQgcmVjZWl2ZWRDb25uZWN0 aW9uRGllZE1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2VySW5mbyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JDb25zdGFu dHMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3Bl Y3RvckNvbnN0YW50cy5oCmluZGV4IDAwNDg1NjE4YmNmOWRiNTY1OWNmNDZlYjMwMjVkY2NkZmJk YjZjMWYuLmNjMmNjMjU0ZDQyMDlhODVmYTQyZGZlNDQ4ODEzNjdhYjNjZjgxNTkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rv ckNvbnN0YW50cy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3Rl L1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5oCkBAIC01Nyw2ICs1Nyw3IEBACiAjZGVmaW5lIFdJ UkFwcGxpY2F0aW9uRGljdGlvbmFyeUtleSAgICAgICAgICAgICBAIldJUkFwcGxpY2F0aW9uRGlj dGlvbmFyeUtleSIKICNkZWZpbmUgV0lSTWVzc2FnZURhdGFLZXkgICAgICAgICAgICAgICAgICAg ICAgIEAiV0lSTWVzc2FnZURhdGFLZXkiCiAjZGVmaW5lIFdJUkFwcGxpY2F0aW9uR2V0TGlzdGlu Z01lc3NhZ2UgICAgICAgICBAIldJUkFwcGxpY2F0aW9uR2V0TGlzdGluZ01lc3NhZ2UiCisjZGVm aW5lIFdJUkFwcGxpY2F0aW9uV2FrZVVwRGVidWdnYWJsZXNNZXNzYWdlICBAIldJUkFwcGxpY2F0 aW9uV2FrZVVwRGVidWdnYWJsZXNNZXNzYWdlIgogI2RlZmluZSBXSVJJbmRpY2F0ZU1lc3NhZ2Ug ICAgICAgICAgICAgICAgICAgICAgQCJXSVJJbmRpY2F0ZU1lc3NhZ2UiCiAjZGVmaW5lIFdJUklu ZGljYXRlRW5hYmxlZEtleSAgICAgICAgICAgICAgICAgICBAIldJUkluZGljYXRlRW5hYmxlZEtl eSIKICNkZWZpbmUgV0lSU2VuZGVyS2V5ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEAiV0lS U2VuZGVyS2V5IgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9y ZW1vdGUvY29jb2EvUmVtb3RlSW5zcGVjdG9yQ29jb2EubW0gYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQppbmRleCA2 ZGJiYTMxMmI4OGU4NzNiNzFlNzVkNmMzNTRjMjNlMjRmMjFkNGE3Li4xODUwYzRkNzA5MmM1MDFj YjJjZDkxZTExMGEyZTY3ZDVjYzI4NTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0 b3JDb2NvYS5tbQpAQCAtMzI2LDYgKzMyNiw4IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjp4cGND b25uZWN0aW9uUmVjZWl2ZWRNZXNzYWdlKFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24qCiAg ICAgICAgIHJlY2VpdmVkRGlkQ2xvc2VNZXNzYWdlKHVzZXJJbmZvKTsKICAgICBlbHNlIGlmIChb bWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUkFwcGxpY2F0aW9uR2V0TGlzdGluZ01lc3Nh Z2VdKQogICAgICAgICByZWNlaXZlZEdldExpc3RpbmdNZXNzYWdlKHVzZXJJbmZvKTsKKyAgICBl bHNlIGlmIChbbWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUkFwcGxpY2F0aW9uV2FrZVVw RGVidWdnYWJsZXNNZXNzYWdlXSkKKyAgICAgICAgcmVjZWl2ZWRXYWtlVXBEZWJ1Z2dhYmxlcyh1 c2VySW5mbyk7CiAgICAgZWxzZSBpZiAoW21lc3NhZ2VOYW1lIGlzRXF1YWxUb1N0cmluZzpXSVJJ bmRpY2F0ZU1lc3NhZ2VdKQogICAgICAgICByZWNlaXZlZEluZGljYXRlTWVzc2FnZSh1c2VySW5m byk7CiAgICAgZWxzZSBpZiAoW21lc3NhZ2VOYW1lIGlzRXF1YWxUb1N0cmluZzpXSVJQcm94eUFw cGxpY2F0aW9uU2V0dXBNZXNzYWdlXSkKQEAgLTU5Miw2ICs1OTQsMTIgQEAgdm9pZCBSZW1vdGVJ bnNwZWN0b3I6OnJlY2VpdmVkR2V0TGlzdGluZ01lc3NhZ2UoTlNEaWN0aW9uYXJ5ICopCiAgICAg cHVzaExpc3RpbmdzTm93KCk7CiB9CiAKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yOjpyZWNlaXZlZFdh a2VVcERlYnVnZ2FibGVzKE5TRGljdGlvbmFyeSAqKQoreworICAgIGlmIChtX2NsaWVudCkKKyAg ICAgICAgbV9jbGllbnQtPnJlcXVlc3RlZERlYnVnZ2FibGVzVG9XYWtlVXAoKTsKK30KKwogdm9p ZCBSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkSW5kaWNhdGVNZXNzYWdlKE5TRGljdGlvbmFyeSAq dXNlckluZm8pCiB7CiAgICAgTlNOdW1iZXIgKnRhcmdldElkZW50aWZpZXJOdW1iZXIgPSB1c2Vy SW5mb1tXSVJUYXJnZXRJZGVudGlmaWVyS2V5XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdhdGUuaAppbmRleCAyNWI0 MWU1N2Y5MThiY2RjZDllZGJmNDA4OTM1ZmVmYzdiM2ZjNmZkLi5mYWJiZDkxMWM5MjU4YzM3ZDBm Mjk1ZDg4Y2JjYjlkNThhYzU3NDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvbkRlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxlZ2F0ZS5oCkBAIC0zNSw0ICszNSw3 IEBACiAKIC0gKE5TU3RyaW5nICopX3Byb2Nlc3NQb29sQnJvd3Nlck5hbWVGb3JBdXRvbWF0aW9u OihXS1Byb2Nlc3NQb29sICopcHJvY2Vzc1Bvb2wgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4x NCksIGlvcygxMi4wKSk7CiAtIChOU1N0cmluZyAqKV9wcm9jZXNzUG9vbEJyb3dzZXJWZXJzaW9u Rm9yQXV0b21hdGlvbjooV0tQcm9jZXNzUG9vbCAqKXByb2Nlc3NQb29sIFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoMTAuMTQpLCBpb3MoMTIuMCkpOworCisvLyBGSVhNRTogQ29uc2lkZXIgcmVuYW1p bmcgV2ViS2l0OjpBdXRvbWF0aW9uQ2xpZW50IGFuZCBfV0tBdXRvbWF0aW9uRGVsZWdhdGUgdG8g X1dLSW5zcGVjdG9yRGVsZWdhdGUgc2luY2UgaXQgaXNuJ3Qgb25seSB1c2VkIGZvciBhdXRvbWF0 aW9uIG5vdy4gaHR0cDovL3dlYmtpdC5vcmcvYi8yMjE5MzMKKy0gKHZvaWQpX3Byb2Nlc3NQb29s RGlkUmVxdWVzdEluc3BlY3RvckRlYnVnZ2FibGVzVG9XYWtlVXA6KFdLUHJvY2Vzc1Bvb2wgKilw cm9jZXNzUG9vbCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev QXV0b21hdGlvbkNsaWVudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21h dGlvbkNsaWVudC5oCmluZGV4IDQ3N2ViNmFjNTcxMzVjYmE3ZmNlYzVjOWQ2ZTZmYzc5NWE5NWEz YzEuLjM2NjQyNjdiNmJmNTczOTRjZDcxOTFlZGJmMzFiNzA3MDc2YjE4NDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50LmgKQEAgLTUxLDYg KzUxLDcgQEAgcHJpdmF0ZToKICAgICAvLyBSZW1vdGVJbnNwZWN0b3I6OkNsaWVudAogICAgIGJv b2wgcmVtb3RlQXV0b21hdGlvbkFsbG93ZWQoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIHJlcXVl c3RBdXRvbWF0aW9uU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNlc3Npb25JZGVudGlmaWVyLCBjb25z dCBJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6Q2xpZW50OjpTZXNzaW9uQ2FwYWJpbGl0aWVz JikgZmluYWw7CisgICAgdm9pZCByZXF1ZXN0ZWREZWJ1Z2dhYmxlc1RvV2FrZVVwKCkgZmluYWw7 CiAgICAgU3RyaW5nIGJyb3dzZXJOYW1lKCkgY29uc3QgZmluYWw7CiAgICAgU3RyaW5nIGJyb3dz ZXJWZXJzaW9uKCkgY29uc3QgZmluYWw7CiAKQEAgLTYwLDYgKzYxLDcgQEAgcHJpdmF0ZToKICAg ICBzdHJ1Y3QgewogICAgICAgICBib29sIGFsbG93c1JlbW90ZUF1dG9tYXRpb24gOiAxOwogICAg ICAgICBib29sIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiA6IDE7CisgICAgICAgIGJvb2wgcmVx dWVzdGVkRGVidWdnYWJsZXNUb1dha2VVcCA6IDE7CiAgICAgICAgIGJvb2wgYnJvd3Nlck5hbWVG b3JBdXRvbWF0aW9uIDogMTsKICAgICAgICAgYm9vbCBicm93c2VyVmVyc2lvbkZvckF1dG9tYXRp b24gOiAxOwogICAgIH0gbV9kZWxlZ2F0ZU1ldGhvZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVudC5tbQppbmRleCBjMmZiOWQwMDBkOGU0NzNi YTdmODAyYTdhNTM0NWE0NDIzZjJiYTJjLi5mODc3OTU5ODkzM2I4MzNlOTBlZTgzOWNmYWU3YzE5 YzBkNGIzNWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRv bWF0aW9uQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9t YXRpb25DbGllbnQubW0KQEAgLTQ2LDYgKzQ2LDcgQEAgQXV0b21hdGlvbkNsaWVudDo6QXV0b21h dGlvbkNsaWVudChXS1Byb2Nlc3NQb29sICpwcm9jZXNzUG9vbCwgaWQgPF9XS0F1dG9tYXRpb24K IHsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5hbGxvd3NSZW1vdGVBdXRvbWF0aW9uID0gW2RlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQb29sQWxsb3dzUmVtb3Rl QXV0b21hdGlvbjopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0QXV0b21hdGlvblNl c3Npb24gPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfcHJvY2Vzc1Bv b2w6ZGlkUmVxdWVzdEF1dG9tYXRpb25TZXNzaW9uV2l0aElkZW50aWZpZXI6Y29uZmlndXJhdGlv bjopXTsKKyAgICBtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0ZWREZWJ1Z2dhYmxlc1RvV2FrZVVw ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQb29sRGlk UmVxdWVzdEluc3BlY3RvckRlYnVnZ2FibGVzVG9XYWtlVXA6KV07CiAgICAgbV9kZWxlZ2F0ZU1l dGhvZHMuYnJvd3Nlck5hbWVGb3JBdXRvbWF0aW9uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQb29sQnJvd3Nlck5hbWVGb3JBdXRvbWF0aW9uOildOwog ICAgIG1fZGVsZWdhdGVNZXRob2RzLmJyb3dzZXJWZXJzaW9uRm9yQXV0b21hdGlvbiA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcm9jZXNzUG9vbEJyb3dzZXJWZXJz aW9uRm9yQXV0b21hdGlvbjopXTsKIApAQCAtOTIsNiArOTMsMTQgQEAgdm9pZCBBdXRvbWF0aW9u Q2xpZW50OjpyZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oY29uc3QgU3RyaW5nJiBzZXNzaW9uSWRl bnRpZmllciwKICAgICB9KTsKIH0KIAordm9pZCBBdXRvbWF0aW9uQ2xpZW50OjpyZXF1ZXN0ZWRE ZWJ1Z2dhYmxlc1RvV2FrZVVwKCkKK3sKKyAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Ro aXNdIHsKKyAgICAgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLnJlcXVlc3RlZERlYnVnZ2FibGVz VG9XYWtlVXApCisgICAgICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfcHJvY2Vzc1Bvb2xEaWRS ZXF1ZXN0SW5zcGVjdG9yRGVidWdnYWJsZXNUb1dha2VVcDptX3Byb2Nlc3NQb29sXTsKKyAgICB9 KTsKK30KKwogU3RyaW5nIEF1dG9tYXRpb25DbGllbnQ6OmJyb3dzZXJOYW1lKCkgY29uc3QKIHsK ICAgICBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMuYnJvd3Nlck5hbWVGb3JBdXRvbWF0aW9uKQo= 420387 2021-02-15 15:30:50 -0800 2021-02-15 16:16:55 -0800 Patch bug-221871-20210215153049.patch text/plain 9165 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MjliMzUyMDA1YzVlN2ZkZDQxMjYyM2U1NWVkZGRkN2FlYjQ2MDJlLi5iMmU5ODdhNjdmZjQ0ODM0 OWE5ZDBkYzg4Y2EyNTdiOGE2OTU3ZmZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0wMi0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgd2F5IHRvIHdha2UgdXAgZGVidWdn YWJsZXMgdG8gdGhlIHJlbW90ZSBpbnNwZWN0b3IgcHJvdG9jb2wKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg3MQorICAgICAgICByZGFyOi8vNzAz NTE2NDQKKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgKiBp bnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oOgorICAgICAgICAqIGluc3BlY3Rvci9y ZW1vdGUvUmVtb3RlSW5zcGVjdG9yQ29uc3RhbnRzLmg6CisgICAgICAgICogaW5zcGVjdG9yL3Jl bW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbToKKyAgICAgICAgKEluc3BlY3Rvcjo6 UmVtb3RlSW5zcGVjdG9yOjp4cGNDb25uZWN0aW9uUmVjZWl2ZWRNZXNzYWdlKTogSGFuZGxlIFdJ UkFwcGxpY2F0aW9uV2FrZVVwRGVidWdnYWJsZXNNZXNzYWdlLgorICAgICAgICAoSW5zcGVjdG9y OjpSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkV2FrZVVwRGVidWdnYWJsZXMpOiBBZGRlZC4gQ2Fs bCB0aGUgY2xpZW50LgorCiAyMDIxLTAyLTAxICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBs ZS5jb20+CiAKICAgICAgICAgW0pTQ10gQXRvbWljcyBzaG91bGQgc3VwcG9ydCBCaWdJbnQ2NEFy cmF5IC8gQmlnVWludDY0QXJyYXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNjZiMzBjMzUwNTRhMzg3M2Q5MjRjMDkw MTgzOThhZDY1MjE2Y2EwZS4uMjMxMWYyZWM1ZGQ1OTc1MzM2Y2I1Y2IwMDgxNjc5NzI5NjZjNmUy ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wMi0xMyAgVGltb3RoeSBIYXRjaGVy ICA8dGltb3RoeUBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgd2F5 IHRvIHdha2UgdXAgZGVidWdnYWJsZXMgdG8gdGhlIHJlbW90ZSBpbnNwZWN0b3IgcHJvdG9jb2wK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg3MQor ICAgICAgICByZGFyOi8vNzAzNTE2NDQKKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vz c28uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxlZ2F0 ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lmg6CisgICAg ICAgICogVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQubW06CisgICAgICAgIChXZWJL aXQ6OkF1dG9tYXRpb25DbGllbnQ6OkF1dG9tYXRpb25DbGllbnQpOiBDaGVjayBpZiB0aGUgZGVs ZWdhdGUgcmVzcG9uZHMgdG8gbmV3IG1ldGhvZC4KKyAgICAgICAgKFdlYktpdDo6QXV0b21hdGlv bkNsaWVudDo6cmVxdWVzdGVkRGVidWdnYWJsZXNUb1dha2VVcCk6IEFkZGVkLiBDYWxsIG5ldyBw cm9jZXNzIHBvb2wgZGVsZWdhdGUgbWV0aG9kLgorCiAyMDIxLTAyLTAzICBNaWNoYWVsIENhdGFu emFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgogCiAgICAgICAgIFtHVEtdIHdlYmtpdF9zZXR0 aW5nc19zZXRfZW5hYmxlX3BsdWdpbnMgZGVwcmVjYXRpb24gd2FybmluZyBicmVha3MgdW5pdCB0 ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUv UmVtb3RlSW5zcGVjdG9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90 ZS9SZW1vdGVJbnNwZWN0b3IuaAppbmRleCBmZjQwMDkyZWFlZjViOWU4MmYwMjA2N2IxNmI5OTcw ZmE4OGRjYTVhLi5hMDcxZGIxM2ViYjI1ZDIyZGRmMDAxMjllZGEwMTUxNmFiNmE3ZjIyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNw ZWN0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1v dGVJbnNwZWN0b3IuaApAQCAtMTEyLDYgKzExMiw3IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVh bCBTdHJpbmcgYnJvd3Nlck5hbWUoKSBjb25zdCB7IHJldHVybiB7IH07IH0KICAgICAgICAgdmly dHVhbCBTdHJpbmcgYnJvd3NlclZlcnNpb24oKSBjb25zdCB7IHJldHVybiB7IH07IH0KICAgICAg ICAgdmlydHVhbCB2b2lkIHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNl c3Npb25JZGVudGlmaWVyLCBjb25zdCBTZXNzaW9uQ2FwYWJpbGl0aWVzJikgPSAwOworICAgICAg ICB2aXJ0dWFsIHZvaWQgcmVxdWVzdGVkRGVidWdnYWJsZXNUb1dha2VVcCgpIHsgfTsKICNpZiBV U0UoSU5TUEVDVE9SX1NPQ0tFVF9TRVJWRVIpCiAgICAgICAgIHZpcnR1YWwgdm9pZCBjbG9zZUF1 dG9tYXRpb25TZXNzaW9uKCkgPSAwOwogI2VuZGlmCkBAIC0yMTgsNiArMjE5LDcgQEAgcHJpdmF0 ZToKICAgICB2b2lkIHJlY2VpdmVkRGF0YU1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2VySW5mbyk7 CiAgICAgdm9pZCByZWNlaXZlZERpZENsb3NlTWVzc2FnZShOU0RpY3Rpb25hcnkgKnVzZXJJbmZv KTsKICAgICB2b2lkIHJlY2VpdmVkR2V0TGlzdGluZ01lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2Vy SW5mbyk7CisgICAgdm9pZCByZWNlaXZlZFdha2VVcERlYnVnZ2FibGVzKE5TRGljdGlvbmFyeSAq dXNlckluZm8pOwogICAgIHZvaWQgcmVjZWl2ZWRJbmRpY2F0ZU1lc3NhZ2UoTlNEaWN0aW9uYXJ5 ICp1c2VySW5mbyk7CiAgICAgdm9pZCByZWNlaXZlZFByb3h5QXBwbGljYXRpb25TZXR1cE1lc3Nh Z2UoTlNEaWN0aW9uYXJ5ICp1c2VySW5mbyk7CiAgICAgdm9pZCByZWNlaXZlZENvbm5lY3Rpb25E aWVkTWVzc2FnZShOU0RpY3Rpb25hcnkgKnVzZXJJbmZvKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvckNvbnN0YW50cy5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9y Q29uc3RhbnRzLmgKaW5kZXggMDA0ODU2MThiY2Y5ZGI1NjU5Y2Y0NmViMzAyNWRjY2RmYmRiNmMx Zi4uY2MyY2MyNTRkNDIwOWE4NWZhNDJkZmU0NDg4MTM2N2FiM2NmODE1OSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yQ29u c3RhbnRzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yQ29uc3RhbnRzLmgKQEAgLTU3LDYgKzU3LDcgQEAKICNkZWZpbmUgV0lSQXBw bGljYXRpb25EaWN0aW9uYXJ5S2V5ICAgICAgICAgICAgIEAiV0lSQXBwbGljYXRpb25EaWN0aW9u YXJ5S2V5IgogI2RlZmluZSBXSVJNZXNzYWdlRGF0YUtleSAgICAgICAgICAgICAgICAgICAgICAg QCJXSVJNZXNzYWdlRGF0YUtleSIKICNkZWZpbmUgV0lSQXBwbGljYXRpb25HZXRMaXN0aW5nTWVz c2FnZSAgICAgICAgIEAiV0lSQXBwbGljYXRpb25HZXRMaXN0aW5nTWVzc2FnZSIKKyNkZWZpbmUg V0lSQXBwbGljYXRpb25XYWtlVXBEZWJ1Z2dhYmxlc01lc3NhZ2UgIEAiV0lSQXBwbGljYXRpb25X YWtlVXBEZWJ1Z2dhYmxlc01lc3NhZ2UiCiAjZGVmaW5lIFdJUkluZGljYXRlTWVzc2FnZSAgICAg ICAgICAgICAgICAgICAgICBAIldJUkluZGljYXRlTWVzc2FnZSIKICNkZWZpbmUgV0lSSW5kaWNh dGVFbmFibGVkS2V5ICAgICAgICAgICAgICAgICAgIEAiV0lSSW5kaWNhdGVFbmFibGVkS2V5Igog I2RlZmluZSBXSVJTZW5kZXJLZXkgICAgICAgICAgICAgICAgICAgICAgICAgICAgQCJXSVJTZW5k ZXJLZXkiCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90 ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCmluZGV4IDZkYmJh MzEyYjg4ZTg3M2I3MWU3NWQ2YzM1NGMyM2UyNGYyMWQ0YTcuLjE4NTBjNGQ3MDkyYzUwMWNiMmNk OTFlMTEwYTJlNjdkNWNjMjg1MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNvY29hLm1tCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2NvY29hL1JlbW90ZUluc3BlY3RvckNv Y29hLm1tCkBAIC0zMjYsNiArMzI2LDggQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5l Y3Rpb25SZWNlaXZlZE1lc3NhZ2UoUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbioKICAgICAg ICAgcmVjZWl2ZWREaWRDbG9zZU1lc3NhZ2UodXNlckluZm8pOwogICAgIGVsc2UgaWYgKFttZXNz YWdlTmFtZSBpc0VxdWFsVG9TdHJpbmc6V0lSQXBwbGljYXRpb25HZXRMaXN0aW5nTWVzc2FnZV0p CiAgICAgICAgIHJlY2VpdmVkR2V0TGlzdGluZ01lc3NhZ2UodXNlckluZm8pOworICAgIGVsc2Ug aWYgKFttZXNzYWdlTmFtZSBpc0VxdWFsVG9TdHJpbmc6V0lSQXBwbGljYXRpb25XYWtlVXBEZWJ1 Z2dhYmxlc01lc3NhZ2VdKQorICAgICAgICByZWNlaXZlZFdha2VVcERlYnVnZ2FibGVzKHVzZXJJ bmZvKTsKICAgICBlbHNlIGlmIChbbWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUkluZGlj YXRlTWVzc2FnZV0pCiAgICAgICAgIHJlY2VpdmVkSW5kaWNhdGVNZXNzYWdlKHVzZXJJbmZvKTsK ICAgICBlbHNlIGlmIChbbWVzc2FnZU5hbWUgaXNFcXVhbFRvU3RyaW5nOldJUlByb3h5QXBwbGlj YXRpb25TZXR1cE1lc3NhZ2VdKQpAQCAtNTkyLDYgKzU5NCwxMiBAQCB2b2lkIFJlbW90ZUluc3Bl Y3Rvcjo6cmVjZWl2ZWRHZXRMaXN0aW5nTWVzc2FnZShOU0RpY3Rpb25hcnkgKikKICAgICBwdXNo TGlzdGluZ3NOb3coKTsKIH0KIAordm9pZCBSZW1vdGVJbnNwZWN0b3I6OnJlY2VpdmVkV2FrZVVw RGVidWdnYWJsZXMoTlNEaWN0aW9uYXJ5ICopCit7CisgICAgaWYgKG1fY2xpZW50KQorICAgICAg ICBtX2NsaWVudC0+cmVxdWVzdGVkRGVidWdnYWJsZXNUb1dha2VVcCgpOworfQorCiB2b2lkIFJl bW90ZUluc3BlY3Rvcjo6cmVjZWl2ZWRJbmRpY2F0ZU1lc3NhZ2UoTlNEaWN0aW9uYXJ5ICp1c2Vy SW5mbykKIHsKICAgICBOU051bWJlciAqdGFyZ2V0SWRlbnRpZmllck51bWJlciA9IHVzZXJJbmZv W1dJUlRhcmdldElkZW50aWZpZXJLZXldOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxlZ2F0ZS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25EZWxlZ2F0ZS5oCmluZGV4IDI1YjQxZTU3 ZjkxOGJjZGNkOWVkYmY0MDg5MzVmZWZjN2IzZmM2ZmQuLmEwZjFiODU4MDE4NDMxMWY4MTJjYzEx MDg1OTcwMDVlZDY4OWUzMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tBdXRvbWF0aW9uRGVsZWdhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvbkRlbGVnYXRlLmgKQEAgLTM1LDQgKzM1LDYgQEAK IAogLSAoTlNTdHJpbmcgKilfcHJvY2Vzc1Bvb2xCcm93c2VyTmFtZUZvckF1dG9tYXRpb246KFdL UHJvY2Vzc1Bvb2wgKilwcm9jZXNzUG9vbCBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE0KSwg aW9zKDEyLjApKTsKIC0gKE5TU3RyaW5nICopX3Byb2Nlc3NQb29sQnJvd3NlclZlcnNpb25Gb3JB dXRvbWF0aW9uOihXS1Byb2Nlc3NQb29sICopcHJvY2Vzc1Bvb2wgV0tfQVBJX0FWQUlMQUJMRSht YWNvcygxMC4xNCksIGlvcygxMi4wKSk7CisKKy0gKHZvaWQpX3Byb2Nlc3NQb29sRGlkUmVxdWVz dEluc3BlY3RvckRlYnVnZ2FibGVzVG9XYWtlVXA6KFdLUHJvY2Vzc1Bvb2wgKilwcm9jZXNzUG9v bCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwog QGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlv bkNsaWVudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvbkNsaWVu dC5oCmluZGV4IDQ3N2ViNmFjNTcxMzVjYmE3ZmNlYzVjOWQ2ZTZmYzc5NWE5NWEzYzEuLjM2NjQy NjdiNmJmNTczOTRjZDcxOTFlZGJmMzFiNzA3MDc2YjE4NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50LmgKQEAgLTUxLDYgKzUxLDcgQEAg cHJpdmF0ZToKICAgICAvLyBSZW1vdGVJbnNwZWN0b3I6OkNsaWVudAogICAgIGJvb2wgcmVtb3Rl QXV0b21hdGlvbkFsbG93ZWQoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIHJlcXVlc3RBdXRvbWF0 aW9uU2Vzc2lvbihjb25zdCBTdHJpbmcmIHNlc3Npb25JZGVudGlmaWVyLCBjb25zdCBJbnNwZWN0 b3I6OlJlbW90ZUluc3BlY3Rvcjo6Q2xpZW50OjpTZXNzaW9uQ2FwYWJpbGl0aWVzJikgZmluYWw7 CisgICAgdm9pZCByZXF1ZXN0ZWREZWJ1Z2dhYmxlc1RvV2FrZVVwKCkgZmluYWw7CiAgICAgU3Ry aW5nIGJyb3dzZXJOYW1lKCkgY29uc3QgZmluYWw7CiAgICAgU3RyaW5nIGJyb3dzZXJWZXJzaW9u KCkgY29uc3QgZmluYWw7CiAKQEAgLTYwLDYgKzYxLDcgQEAgcHJpdmF0ZToKICAgICBzdHJ1Y3Qg ewogICAgICAgICBib29sIGFsbG93c1JlbW90ZUF1dG9tYXRpb24gOiAxOwogICAgICAgICBib29s IHJlcXVlc3RBdXRvbWF0aW9uU2Vzc2lvbiA6IDE7CisgICAgICAgIGJvb2wgcmVxdWVzdGVkRGVi dWdnYWJsZXNUb1dha2VVcCA6IDE7CiAgICAgICAgIGJvb2wgYnJvd3Nlck5hbWVGb3JBdXRvbWF0 aW9uIDogMTsKICAgICAgICAgYm9vbCBicm93c2VyVmVyc2lvbkZvckF1dG9tYXRpb24gOiAxOwog ICAgIH0gbV9kZWxlZ2F0ZU1ldGhvZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvQXV0b21hdGlvbkNsaWVudC5tbQppbmRleCBjMmZiOWQwMDBkOGU0NzNiYTdmODAyYTdh NTM0NWE0NDIzZjJiYTJjLi40ZTlhNzZiZDQyMTgwN2Y4NGI1ZjM3ZDRkY2RkNGMyZTJiZDdlM2Jk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uQ2xp ZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25DbGll bnQubW0KQEAgLTQ2LDYgKzQ2LDcgQEAgQXV0b21hdGlvbkNsaWVudDo6QXV0b21hdGlvbkNsaWVu dChXS1Byb2Nlc3NQb29sICpwcm9jZXNzUG9vbCwgaWQgPF9XS0F1dG9tYXRpb24KIHsKICAgICBt X2RlbGVnYXRlTWV0aG9kcy5hbGxvd3NSZW1vdGVBdXRvbWF0aW9uID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQb29sQWxsb3dzUmVtb3RlQXV0b21hdGlv bjopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0QXV0b21hdGlvblNlc3Npb24gPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfcHJvY2Vzc1Bvb2w6ZGlkUmVx dWVzdEF1dG9tYXRpb25TZXNzaW9uV2l0aElkZW50aWZpZXI6Y29uZmlndXJhdGlvbjopXTsKKyAg ICBtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0ZWREZWJ1Z2dhYmxlc1RvV2FrZVVwID0gW2RlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3Byb2Nlc3NQb29sRGlkUmVxdWVzdElu c3BlY3RvckRlYnVnZ2FibGVzVG9XYWtlVXA6KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuYnJv d3Nlck5hbWVGb3JBdXRvbWF0aW9uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3IoX3Byb2Nlc3NQb29sQnJvd3Nlck5hbWVGb3JBdXRvbWF0aW9uOildOwogICAgIG1fZGVs ZWdhdGVNZXRob2RzLmJyb3dzZXJWZXJzaW9uRm9yQXV0b21hdGlvbiA9IFtkZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9wcm9jZXNzUG9vbEJyb3dzZXJWZXJzaW9uRm9yQXV0 b21hdGlvbjopXTsKIApAQCAtOTIsNiArOTMsMTYgQEAgdm9pZCBBdXRvbWF0aW9uQ2xpZW50Ojpy ZXF1ZXN0QXV0b21hdGlvblNlc3Npb24oY29uc3QgU3RyaW5nJiBzZXNzaW9uSWRlbnRpZmllciwK ICAgICB9KTsKIH0KIAorLy8gRklYTUU6IENvbnNpZGVyIHJlbmFtaW5nIEF1dG9tYXRpb25DbGll bnQgYW5kIF9XS0F1dG9tYXRpb25EZWxlZ2F0ZSB0byBfV0tJbnNwZWN0b3JEZWxlZ2F0ZSBzaW5j ZSBpdCBpc24ndCBvbmx5IHVzZWQgZm9yIGF1dG9tYXRpb24gbm93LgorLy8gaHR0cDovL3dlYmtp dC5vcmcvYi8yMjE5MzMKK3ZvaWQgQXV0b21hdGlvbkNsaWVudDo6cmVxdWVzdGVkRGVidWdnYWJs ZXNUb1dha2VVcCgpCit7CisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzXSB7Cisg ICAgICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0ZWREZWJ1Z2dhYmxlc1RvV2FrZVVw KQorICAgICAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX3Byb2Nlc3NQb29sRGlkUmVxdWVzdElu c3BlY3RvckRlYnVnZ2FibGVzVG9XYWtlVXA6bV9wcm9jZXNzUG9vbF07CisgICAgfSk7Cit9CisK IFN0cmluZyBBdXRvbWF0aW9uQ2xpZW50Ojpicm93c2VyTmFtZSgpIGNvbnN0CiB7CiAgICAgaWYg KG1fZGVsZWdhdGVNZXRob2RzLmJyb3dzZXJOYW1lRm9yQXV0b21hdGlvbikK