237098 2022-02-23 11:45:44 -0800 Port CaptivePortalMode preferences to AnyHost in order to support CFPrefs Direct Mode propagation 2022-02-24 17:45:56 -0800 1 1 1 Unclassified WebKit WebKit2 Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 gavin.p gavin.p bfulgham kkinnunen webkit-bug-importer oldest_to_newest 1845245 0 gavin.p 2022-02-23 11:45:44 -0800 Modify our preference observation code to also provide notifications for changes to preferences stored as the currentHost. 1845246 1 453007 gavin.p 2022-02-23 11:50:29 -0800 Created attachment 453007 Patch 1845252 2 453007 bfulgham 2022-02-23 12:01:30 -0800 Comment on attachment 453007 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453007&action=review > Source/WebKit/UIProcess/Cocoa/PreferenceObserver.mm:76 > + auto hostValue = adoptCF(CFPreferencesCopyValue((__bridge CFStringRef)key, kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)); If CurrentHost and AnyHost are treated the same on iOS, should we conditionalize this on PLATFORM(MAC), or maybe !PLATFORM(IOS)? 1845286 3 453007 bfulgham 2022-02-23 13:05:54 -0800 Comment on attachment 453007 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453007&action=review r=me >> Source/WebKit/UIProcess/Cocoa/PreferenceObserver.mm:76 >> + auto hostValue = adoptCF(CFPreferencesCopyValue((__bridge CFStringRef)key, kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)); > > If CurrentHost and AnyHost are treated the same on iOS, should we conditionalize this on PLATFORM(MAC), or maybe !PLATFORM(IOS)? I talked with Gavin offline, and we actually do want it to work this way on all platforms. 1845287 4 webkit-bug-importer 2022-02-23 13:06:17 -0800 <rdar://problem/89373662> 1845618 5 453102 gavin.p 2022-02-24 08:43:15 -0800 Created attachment 453102 Patch 1845626 6 453105 gavin.p 2022-02-24 09:00:11 -0800 Created attachment 453105 Patch 1845635 7 453105 bfulgham 2022-02-24 09:21:02 -0800 Comment on attachment 453105 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453105&action=review r=me > Source/WebKit/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=237098 <rdar://problem/89373662> Please always include the Radar in Changelogs, as it makes it easier to find things using the Xcode change viewer. > Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:748 > +#if PLATFORM(COCOA) Oops -- yes, this would never have worked properly for macOS! 1845856 8 ews-feeder 2022-02-24 17:45:54 -0800 Committed r290482 (247778@main): <https://commits.webkit.org/247778@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453105. 453007 2022-02-23 11:50:29 -0800 2022-02-24 08:43:12 -0800 Patch bug-237098-20220223115027.patch text/plain 2588 gavin.p U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYxNzhkZTU5NzE1MDhkYjFh NWQ0YjU3ZDJlNTdkMzExMjU3MGE4YzQuLjRkYWQ4NWQxY2U0NjM2MzFmNWI0ZGM3NjM0ZTY4ODcw ZTIxZmY3MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMjMgIEdhdmluIFBo aWxsaXBzICA8Z2F2aW4ucEBhcHBsZS5jb20+CisKKyAgICAgICAgT2JzZXJ2ZSBwcmVmZXJlbmNl IGNoYW5nZXMgZnJvbSB0aGUgY3VycmVudEhvc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzA5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmeSBvdXIgcHJlZmVyZW5jZSBvYnNlcnZhdGlvbiBj b2RlIHRvIGFsc28gcHJvdmlkZSBub3RpZmljYXRpb25zIGZvciBjaGFuZ2VzIHRvCisgICAgICAg IHByZWZlcmVuY2VzIHN0b3JlZCBhcyB0aGUgY3VycmVudEhvc3QuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQ29jb2EvUHJlZmVyZW5jZU9ic2VydmVyLm1tOgorICAgICAgICAoLVtXS1VzZXJEZWZh dWx0cyBmaW5kUHJlZmVyZW5jZUNoYW5nZXNBbmROb3RpZnlGb3JLZXlzOnRvVmFsdWVzRm9yS2V5 czpdKToKKwogMjAyMi0wMi0yMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3RlVmlkZW9GcmFtZU9iamVjdEhlYXA6OmdldFZpZGVvRnJhbWVCdWZmZXIg Y2FuIHVzZSBiYXNlIGNsYXNzIHBpeGVsQnVmZmVyIGFjY2Vzc29yCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9QcmVmZXJlbmNlT2JzZXJ2ZXIubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9QcmVmZXJlbmNlT2JzZXJ2ZXIubW0KaW5kZXggMGE2MWM3 NTE0MTZhMTRjOWIwNzEwMzhlOTk5MTM1YWFhN2Y4ZjkzNC4uN2ZjNzA0MzNmNzQzYWIxMzE0ZTlk YjEzM2UyZDk1MTQ5ODEyYWExZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvUHJlZmVyZW5jZU9ic2VydmVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1ByZWZlcmVuY2VPYnNlcnZlci5tbQpAQCAtNzMsMTMgKzczLDE0IEBACiAKICAgICAg ICAgYXV0byBzeXN0ZW1WYWx1ZSA9IGFkb3B0Q0YoQ0ZQcmVmZXJlbmNlc0NvcHlWYWx1ZSgoX19i cmlkZ2UgQ0ZTdHJpbmdSZWYpa2V5LCBrQ0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9uLCBrQ0ZQ cmVmZXJlbmNlc0FueVVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9zdCkpOwogICAgICAgICBhdXRv IGdsb2JhbFZhbHVlID0gYWRvcHRDRihDRlByZWZlcmVuY2VzQ29weVZhbHVlKChfX2JyaWRnZSBD RlN0cmluZ1JlZilrZXksIGtDRlByZWZlcmVuY2VzQW55QXBwbGljYXRpb24sIGtDRlByZWZlcmVu Y2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9zdCkpOworICAgICAgICBhdXRvIGhv c3RWYWx1ZSA9IGFkb3B0Q0YoQ0ZQcmVmZXJlbmNlc0NvcHlWYWx1ZSgoX19icmlkZ2UgQ0ZTdHJp bmdSZWYpa2V5LCBrQ0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9uLCBrQ0ZQcmVmZXJlbmNlc0N1 cnJlbnRVc2VyLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRIb3N0KSk7CiAgICAgICAgIGF1dG8gZG9t YWluVmFsdWUgPSBhZG9wdENGKENGUHJlZmVyZW5jZXNDb3B5VmFsdWUoKF9fYnJpZGdlIENGU3Ry aW5nUmVmKWtleSwgKF9fYnJpZGdlIENGU3RyaW5nUmVmKW1fc3VpdGVOYW1lLmdldCgpLCBrQ0ZQ cmVmZXJlbmNlc0N1cnJlbnRVc2VyLCBrQ0ZQcmVmZXJlbmNlc0FueUhvc3QpKTsKIAogICAgICAg ICBhdXRvIHByZWZlcmVuY2VWYWx1ZXNBcmVFcXVhbCA9IFtdIChpZCBhLCBpZCBiKSB7CiAgICAg ICAgICAgICByZXR1cm4gYSA9PSBiIHx8IFthIGlzRXF1YWw6Yl07CiAgICAgICAgIH07CiAKLSAg ICAgICAgaWYgKHByZWZlcmVuY2VWYWx1ZXNBcmVFcXVhbCgoX19icmlkZ2UgaWQpc3lzdGVtVmFs dWUuZ2V0KCksIG5ld1ZhbHVlKSB8fCBwcmVmZXJlbmNlVmFsdWVzQXJlRXF1YWwoKF9fYnJpZGdl IGlkKWdsb2JhbFZhbHVlLmdldCgpLCBuZXdWYWx1ZSkpCisgICAgICAgIGlmIChwcmVmZXJlbmNl VmFsdWVzQXJlRXF1YWwoKF9fYnJpZGdlIGlkKXN5c3RlbVZhbHVlLmdldCgpLCBuZXdWYWx1ZSkg fHwgcHJlZmVyZW5jZVZhbHVlc0FyZUVxdWFsKChfX2JyaWRnZSBpZClnbG9iYWxWYWx1ZS5nZXQo KSwgbmV3VmFsdWUpIHx8IHByZWZlcmVuY2VWYWx1ZXNBcmVFcXVhbCgoX19icmlkZ2UgaWQpaG9z dFZhbHVlLmdldCgpLCBuZXdWYWx1ZSkpCiAgICAgICAgICAgICBbbV9vYnNlcnZlciBwcmVmZXJl bmNlRGlkQ2hhbmdlOm5pbCBrZXk6a2V5IGVuY29kZWRWYWx1ZTplbmNvZGVkU3RyaW5nXTsKIAog ICAgICAgICBpZiAocHJlZmVyZW5jZVZhbHVlc0FyZUVxdWFsKChfX2JyaWRnZSBpZClkb21haW5W YWx1ZS5nZXQoKSwgbmV3VmFsdWUpKQo= 453102 2022-02-24 08:43:15 -0800 2022-02-24 10:01:51 -0800 Patch bug-237098-20220224084314.patch text/plain 6197 gavin.p U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYxNzhkZTU5NzE1MDhkYjFh NWQ0YjU3ZDJlNTdkMzExMjU3MGE4YzQuLmRjODcwNDk4ODVmNWY4NWQ2MDBhZjE3MWVkYzRkNGZh Yzg5NDllODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDItMjQgIEdhdmluIFBo aWxsaXBzICA8Z2F2aW4ucEBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBDYXB0aXZlUG9ydGFs TW9kZSBwcmVmZXJlbmNlcyB0byBBbnlIb3N0IGluIG9yZGVyIHRvIHN1cHBvcnQgQ0ZQcmVmcyBE aXJlY3QgTW9kZSBwcm9wYWdhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM3MDk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTW92ZSBvdXIgQ2FwdGl2ZVBvcnRhbE1vZGUgcHJlZmVyZW5jZSB0byBB bnlIb3N0IGluIG9yZGVyIHRvIGNvcnJlY3RseSBzdXBwb3J0CisgICAgICAgIENGUHJlZnMgRGly ZWN0IE1vZGUgcHJvcGFnYXRpb24uIFdlIGFsc28gbm93IGRpc3BhdGNoIGEgQ0ZOb3RpZmljYXRp b24gdG8gZW5zdXJlIG91ciBwcmVmZXJlbmNlCisgICAgICAgIG9ic2VydmVyIGlzIGFsd2F5cyBu b3RpZmllZCBvZiB0aGUgY2hhbmdlLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1ByZWZl cmVuY2VPYnNlcnZlci5tbToKKyAgICAgICAgKC1bV0tVc2VyRGVmYXVsdHMgZmluZFByZWZlcmVu Y2VDaGFuZ2VzQW5kTm90aWZ5Rm9yS2V5czp0b1ZhbHVlc0ZvcktleXM6XSk6CisKKyAgICAgICAg KiBTaGFyZWQvQ29jb2EvQXV4aWxpYXJ5UHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0 OjpBdXhpbGlhcnlQcm9jZXNzOjpzZXRQcmVmZXJlbmNlVmFsdWUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLU3lzdGVtUHJlZmVyZW5jZXMubW06CisgICAgICAgICgrW19XS1N5 c3RlbVByZWZlcmVuY2VzIGlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkXSk6CisgICAgICAgICgr W19XS1N5c3RlbVByZWZlcmVuY2VzIHNldENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDpdKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNhcHRpdmVQb3J0YWxNb2RlQ29uZmlnVXBkYXRlQ2Fs bGJhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cmVnaXN0ZXJOb3RpZmlj YXRpb25PYnNlcnZlcnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6dW5yZWdp c3Rlck5vdGlmaWNhdGlvbk9ic2VydmVycyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmg6CisKIDIwMjItMDItMjMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW90ZVZpZGVvRnJhbWVPYmplY3RIZWFwOjpnZXRWaWRlb0ZyYW1lQnVm ZmVyIGNhbiB1c2UgYmFzZSBjbGFzcyBwaXhlbEJ1ZmZlciBhY2Nlc3NvcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1N5c3RlbVByZWZlcmVuY2VzLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1N5c3RlbVByZWZlcmVuY2Vz Lm1tCmluZGV4IDg5MTc1M2UxM2ExOGQ2ZTA2ZTk0N2RjZDc2MGIyYTAwNmVkNmIyMTkuLmVmMDM3 MzE4YmI5Y2NkM2UwOTBmMjcyYWIwN2QzNGUwYmVhZmE0YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tTeXN0ZW1QcmVmZXJlbmNlcy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLU3lzdGVtUHJlZmVyZW5jZXMubW0K QEAgLTM2LDE1ICszNiwxNiBAQCBjb25zdGV4cHIgYXV0byBDYXB0aXZlUG9ydGFsQ29uZmlndXJh dGlvbklnbm9yZUZpbGVOYW1lID0gQCJjb20uYXBwbGUuV2ViS2l0LmNwbQogKyAoQk9PTClpc0Nh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZAogewogICAgIGF1dG8gY2hhbmdlZE5vdGlmaWNhdGlvbktl eSA9IGFkb3B0Q0YoQ0ZTdHJpbmdDcmVhdGVXaXRoQ1N0cmluZyhrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCBXS0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEtleSwga0NGU3RyaW5nRW5jb2RpbmdVVEY4KSk7 Ci0gICAgYXV0byBwcmVmZXJlbmNlVmFsdWUgPSBhZG9wdENGKENGUHJlZmVyZW5jZXNDb3B5VmFs dWUoY2hhbmdlZE5vdGlmaWNhdGlvbktleS5nZXQoKSwga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNh dGlvbiwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNDdXJyZW50SG9z dCkpOworICAgIGF1dG8gcHJlZmVyZW5jZVZhbHVlID0gYWRvcHRDRihDRlByZWZlcmVuY2VzQ29w eVZhbHVlKGNoYW5nZWROb3RpZmljYXRpb25LZXkuZ2V0KCksIGtDRlByZWZlcmVuY2VzQW55QXBw bGljYXRpb24sIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9z dCkpOwogICAgIHJldHVybiBwcmVmZXJlbmNlVmFsdWUuZ2V0KCkgPT0ga0NGQm9vbGVhblRydWU7 CiB9CiAKICsgKHZvaWQpc2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkOihCT09MKWVuYWJsZWQK IHsKICAgICBhdXRvIGNoYW5nZWROb3RpZmljYXRpb25LZXkgPSBhZG9wdENGKENGU3RyaW5nQ3Jl YXRlV2l0aENTdHJpbmcoa0NGQWxsb2NhdG9yRGVmYXVsdCwgV0tDYXB0aXZlUG9ydGFsTW9kZUVu YWJsZWRLZXksIGtDRlN0cmluZ0VuY29kaW5nVVRGOCkpOwotICAgIENGUHJlZmVyZW5jZXNTZXRW YWx1ZShjaGFuZ2VkTm90aWZpY2F0aW9uS2V5LmdldCgpLCBlbmFibGVkID8ga0NGQm9vbGVhblRy dWUgOiBrQ0ZCb29sZWFuRmFsc2UsIGtDRlByZWZlcmVuY2VzQW55QXBwbGljYXRpb24sIGtDRlBy ZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQ3VycmVudEhvc3QpOwotICAgIENG UHJlZmVyZW5jZXNTeW5jaHJvbml6ZShrQ0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9uLCBrQ0ZQ cmVmZXJlbmNlc0FueVVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9zdCk7CisgICAgQ0ZQcmVmZXJl bmNlc1NldFZhbHVlKGNoYW5nZWROb3RpZmljYXRpb25LZXkuZ2V0KCksIGVuYWJsZWQgPyBrQ0ZC b29sZWFuVHJ1ZSA6IGtDRkJvb2xlYW5GYWxzZSwga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlv biwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsKKyAg ICBDRlByZWZlcmVuY2VzU3luY2hyb25pemUoa0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiwg a0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsKKyAgICBD Rk5vdGlmaWNhdGlvbkNlbnRlclBvc3ROb3RpZmljYXRpb24oQ0ZOb3RpZmljYXRpb25DZW50ZXJH ZXREYXJ3aW5Ob3RpZnlDZW50ZXIoKSwgKF9fYnJpZGdlIENGU3RyaW5nUmVmKVdLQ2FwdGl2ZVBv cnRhbE1vZGVDb250YWluZXJDb25maWd1cmF0aW9uQ2hhbmdlZE5vdGlmaWNhdGlvbiwgbnVsbHB0 ciwgbnVsbHB0ciwgdHJ1ZSk7CiB9CiAKICsgKEJPT0wpaXNDYXB0aXZlUG9ydGFsTW9kZUlnbm9y ZWQ6KE5TU3RyaW5nICopY29udGFpbmVyUGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KaW5kZXggNTY5NmRhMzg5ODg1Mjdj N2FlNjkzYjhmYzcxZDZiYjVmNGFlODYwNC4uODYxZDAwYTk1ODBiNGYzODYyY2FjOTEzZWFjOWNl NDEyNTI3MWYwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi UHJvY2Vzc1Bvb2xDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJQcm9jZXNzUG9vbENvY29hLm1tCkBAIC02MjQsMTMgKzYyNCwxMSBAQCB2b2lkIFdlYlByb2Nl c3NQb29sOjpyZW1vdGVXZWJJbnNwZWN0b3JFbmFibGVkQ2FsbGJhY2soQ0ZOb3RpZmljYXRpb25D ZW50ZXJSZWYsCiB9CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiB2b2lkIFdl YlByb2Nlc3NQb29sOjpjYXB0aXZlUG9ydGFsTW9kZUNvbmZpZ1VwZGF0ZUNhbGxiYWNrKENGTm90 aWZpY2F0aW9uQ2VudGVyUmVmLCB2b2lkKiBvYnNlcnZlciwgQ0ZTdHJpbmdSZWYsIGNvbnN0IHZv aWQqLCBDRkRpY3Rpb25hcnlSZWYpCiB7CiAgICAgaWYgKGF1dG8gcG9vbCA9IGV4dHJhY3RXZWJQ cm9jZXNzUG9vbChvYnNlcnZlcikpCiAgICAgICAgIHBvb2wtPmNhcHRpdmVQb3J0YWxNb2RlU3Rh dGVDaGFuZ2VkKCk7CiB9Ci0jZW5kaWYKIAogI2lmIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9NT0RF KQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6c3RhcnRPYnNlcnZpbmdQcmVmZXJlbmNlQ2hhbmdlcygp CkBAIC03NDUsOSArNzQzLDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cmVnaXN0ZXJOb3RpZmlj YXRpb25PYnNlcnZlcnMoKQogICAgICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6Oldl YlByb2Nlc3M6OlBvd2VyU291cmNlRGlkQ2hhbmdlKGhhc0FDKSk7CiAgICAgfSk7CiAKLSNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQogICAgIGFkZENGTm90aWZpY2F0aW9uT2JzZXJ2ZXIoY2FwdGl2 ZVBvcnRhbE1vZGVDb25maWdVcGRhdGVDYWxsYmFjaywgKF9fYnJpZGdlIENGU3RyaW5nUmVmKVdL Q2FwdGl2ZVBvcnRhbE1vZGVDb250YWluZXJDb25maWd1cmF0aW9uQ2hhbmdlZE5vdGlmaWNhdGlv bik7Ci0jZW5kaWYKIAogI2lmIEhBVkUoUEVSX0FQUF9BQ0NFU1NJQklMSVRZX1BSRUZFUkVOQ0VT KQogICAgIGFkZENGTm90aWZpY2F0aW9uT2JzZXJ2ZXIoYWNjZXNzaWJpbGl0eVByZWZlcmVuY2Vz Q2hhbmdlZENhbGxiYWNrLCBrQVhTUmVkdWNlTW90aW9uQ2hhbmdlZE5vdGlmaWNhdGlvbik7CkBA IC03OTMsOSArNzg5LDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6dW5yZWdpc3Rlck5vdGlmaWNh dGlvbk9ic2VydmVycygpCiAKICAgICBtX3Bvd2VyU291cmNlTm90aWZpZXIgPSBudWxscHRyOwog ICAgIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgcmVtb3ZlQ0ZOb3RpZmljYXRpb25P YnNlcnZlcigoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpV0tDYXB0aXZlUG9ydGFsTW9kZUNvbnRhaW5l ckNvbmZpZ3VyYXRpb25DaGFuZ2VkTm90aWZpY2F0aW9uKTsKLSNlbmRpZgogCiAjaWYgSEFWRShQ RVJfQVBQX0FDQ0VTU0lCSUxJVFlfUFJFRkVSRU5DRVMpCiAgICAgcmVtb3ZlQ0ZOb3RpZmljYXRp b25PYnNlcnZlcihrQVhTUmVkdWNlTW90aW9uQ2hhbmdlZE5vdGlmaWNhdGlvbik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCAwZDEyMDE1YmJhNDNmZGJmMzc5 OWY2YjBjN2ZlM2QwMjI4MmI4NjkxLi43MDE2YTQ3NTY1OWExZDc1YTA0MTRiODU4ZTkzOTA4NmNk YWUwODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTU4 Niw5ICs1ODYsNyBAQCBwcml2YXRlOgogI2VuZGlmCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCiAgICAgc3RhdGljIHZvaWQgY2FwdGl2ZVBvcnRhbE1vZGVDb25maWdVcGRhdGVD YWxsYmFjayhDRk5vdGlmaWNhdGlvbkNlbnRlclJlZiwgdm9pZCogb2JzZXJ2ZXIsIENGU3RyaW5n UmVmIG5hbWUsIGNvbnN0IHZvaWQqIHBvc3RpbmdPYmplY3QsIENGRGljdGlvbmFyeVJlZiB1c2Vy SW5mbyk7Ci0jZW5kaWYKICAgICAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBzdGF0aWMgdm9p ZCBhY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXNDaGFuZ2VkQ2FsbGJhY2soQ0ZOb3RpZmljYXRpb25D ZW50ZXJSZWYsIHZvaWQqIG9ic2VydmVyLCBDRlN0cmluZ1JlZiBuYW1lLCBjb25zdCB2b2lkKiBw b3N0aW5nT2JqZWN0LCBDRkRpY3Rpb25hcnlSZWYgdXNlckluZm8pOwo= 453105 2022-02-24 09:00:11 -0800 2022-02-24 17:45:55 -0800 Patch bug-237098-20220224090010.patch text/plain 5666 gavin.p U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYxNzhkZTU5NzE1MDhkYjFh NWQ0YjU3ZDJlNTdkMzExMjU3MGE4YzQuLmRjODcwNDk4ODVmNWY4NWQ2MDBhZjE3MWVkYzRkNGZh Yzg5NDllODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDItMjQgIEdhdmluIFBo aWxsaXBzICA8Z2F2aW4ucEBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBDYXB0aXZlUG9ydGFs TW9kZSBwcmVmZXJlbmNlcyB0byBBbnlIb3N0IGluIG9yZGVyIHRvIHN1cHBvcnQgQ0ZQcmVmcyBE aXJlY3QgTW9kZSBwcm9wYWdhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM3MDk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTW92ZSBvdXIgQ2FwdGl2ZVBvcnRhbE1vZGUgcHJlZmVyZW5jZSB0byBB bnlIb3N0IGluIG9yZGVyIHRvIGNvcnJlY3RseSBzdXBwb3J0CisgICAgICAgIENGUHJlZnMgRGly ZWN0IE1vZGUgcHJvcGFnYXRpb24uIFdlIGFsc28gbm93IGRpc3BhdGNoIGEgQ0ZOb3RpZmljYXRp b24gdG8gZW5zdXJlIG91ciBwcmVmZXJlbmNlCisgICAgICAgIG9ic2VydmVyIGlzIGFsd2F5cyBu b3RpZmllZCBvZiB0aGUgY2hhbmdlLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1ByZWZl cmVuY2VPYnNlcnZlci5tbToKKyAgICAgICAgKC1bV0tVc2VyRGVmYXVsdHMgZmluZFByZWZlcmVu Y2VDaGFuZ2VzQW5kTm90aWZ5Rm9yS2V5czp0b1ZhbHVlc0ZvcktleXM6XSk6CisKKyAgICAgICAg KiBTaGFyZWQvQ29jb2EvQXV4aWxpYXJ5UHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0 OjpBdXhpbGlhcnlQcm9jZXNzOjpzZXRQcmVmZXJlbmNlVmFsdWUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLU3lzdGVtUHJlZmVyZW5jZXMubW06CisgICAgICAgICgrW19XS1N5 c3RlbVByZWZlcmVuY2VzIGlzQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkXSk6CisgICAgICAgICgr W19XS1N5c3RlbVByZWZlcmVuY2VzIHNldENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDpdKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNhcHRpdmVQb3J0YWxNb2RlQ29uZmlnVXBkYXRlQ2Fs bGJhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cmVnaXN0ZXJOb3RpZmlj YXRpb25PYnNlcnZlcnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6dW5yZWdp c3Rlck5vdGlmaWNhdGlvbk9ic2VydmVycyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmg6CisKIDIwMjItMDItMjMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW90ZVZpZGVvRnJhbWVPYmplY3RIZWFwOjpnZXRWaWRlb0ZyYW1lQnVm ZmVyIGNhbiB1c2UgYmFzZSBjbGFzcyBwaXhlbEJ1ZmZlciBhY2Nlc3NvcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1N5c3RlbVByZWZlcmVuY2VzLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1N5c3RlbVByZWZlcmVuY2Vz Lm1tCmluZGV4IDg5MTc1M2UxM2ExOGQ2ZTA2ZTk0N2RjZDc2MGIyYTAwNmVkNmIyMTkuLmVmMDM3 MzE4YmI5Y2NkM2UwOTBmMjcyYWIwN2QzNGUwYmVhZmE0YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tTeXN0ZW1QcmVmZXJlbmNlcy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLU3lzdGVtUHJlZmVyZW5jZXMubW0K QEAgLTM2LDE1ICszNiwxNiBAQCBjb25zdGV4cHIgYXV0byBDYXB0aXZlUG9ydGFsQ29uZmlndXJh dGlvbklnbm9yZUZpbGVOYW1lID0gQCJjb20uYXBwbGUuV2ViS2l0LmNwbQogKyAoQk9PTClpc0Nh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZAogewogICAgIGF1dG8gY2hhbmdlZE5vdGlmaWNhdGlvbktl eSA9IGFkb3B0Q0YoQ0ZTdHJpbmdDcmVhdGVXaXRoQ1N0cmluZyhrQ0ZBbGxvY2F0b3JEZWZhdWx0 LCBXS0NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEtleSwga0NGU3RyaW5nRW5jb2RpbmdVVEY4KSk7 Ci0gICAgYXV0byBwcmVmZXJlbmNlVmFsdWUgPSBhZG9wdENGKENGUHJlZmVyZW5jZXNDb3B5VmFs dWUoY2hhbmdlZE5vdGlmaWNhdGlvbktleS5nZXQoKSwga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNh dGlvbiwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNDdXJyZW50SG9z dCkpOworICAgIGF1dG8gcHJlZmVyZW5jZVZhbHVlID0gYWRvcHRDRihDRlByZWZlcmVuY2VzQ29w eVZhbHVlKGNoYW5nZWROb3RpZmljYXRpb25LZXkuZ2V0KCksIGtDRlByZWZlcmVuY2VzQW55QXBw bGljYXRpb24sIGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9z dCkpOwogICAgIHJldHVybiBwcmVmZXJlbmNlVmFsdWUuZ2V0KCkgPT0ga0NGQm9vbGVhblRydWU7 CiB9CiAKICsgKHZvaWQpc2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkOihCT09MKWVuYWJsZWQK IHsKICAgICBhdXRvIGNoYW5nZWROb3RpZmljYXRpb25LZXkgPSBhZG9wdENGKENGU3RyaW5nQ3Jl YXRlV2l0aENTdHJpbmcoa0NGQWxsb2NhdG9yRGVmYXVsdCwgV0tDYXB0aXZlUG9ydGFsTW9kZUVu YWJsZWRLZXksIGtDRlN0cmluZ0VuY29kaW5nVVRGOCkpOwotICAgIENGUHJlZmVyZW5jZXNTZXRW YWx1ZShjaGFuZ2VkTm90aWZpY2F0aW9uS2V5LmdldCgpLCBlbmFibGVkID8ga0NGQm9vbGVhblRy dWUgOiBrQ0ZCb29sZWFuRmFsc2UsIGtDRlByZWZlcmVuY2VzQW55QXBwbGljYXRpb24sIGtDRlBy ZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQ3VycmVudEhvc3QpOwotICAgIENG UHJlZmVyZW5jZXNTeW5jaHJvbml6ZShrQ0ZQcmVmZXJlbmNlc0FueUFwcGxpY2F0aW9uLCBrQ0ZQ cmVmZXJlbmNlc0FueVVzZXIsIGtDRlByZWZlcmVuY2VzQW55SG9zdCk7CisgICAgQ0ZQcmVmZXJl bmNlc1NldFZhbHVlKGNoYW5nZWROb3RpZmljYXRpb25LZXkuZ2V0KCksIGVuYWJsZWQgPyBrQ0ZC b29sZWFuVHJ1ZSA6IGtDRkJvb2xlYW5GYWxzZSwga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlv biwga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsKKyAg ICBDRlByZWZlcmVuY2VzU3luY2hyb25pemUoa0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiwg a0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KTsKKyAgICBD Rk5vdGlmaWNhdGlvbkNlbnRlclBvc3ROb3RpZmljYXRpb24oQ0ZOb3RpZmljYXRpb25DZW50ZXJH ZXREYXJ3aW5Ob3RpZnlDZW50ZXIoKSwgKF9fYnJpZGdlIENGU3RyaW5nUmVmKVdLQ2FwdGl2ZVBv cnRhbE1vZGVDb250YWluZXJDb25maWd1cmF0aW9uQ2hhbmdlZE5vdGlmaWNhdGlvbiwgbnVsbHB0 ciwgbnVsbHB0ciwgdHJ1ZSk7CiB9CiAKICsgKEJPT0wpaXNDYXB0aXZlUG9ydGFsTW9kZUlnbm9y ZWQ6KE5TU3RyaW5nICopY29udGFpbmVyUGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KaW5kZXggNTY5NmRhMzg5ODg1Mjdj N2FlNjkzYjhmYzcxZDZiYjVmNGFlODYwNC4uN2VhMmZhMmYzNDYxOTE0ZTM5NDY5ZmVmMGQ4NWIz NWRkZTViOWJhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi UHJvY2Vzc1Bvb2xDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJQcm9jZXNzUG9vbENvY29hLm1tCkBAIC02MjQsNyArNjI0LDcgQEAgdm9pZCBXZWJQcm9jZXNz UG9vbDo6cmVtb3RlV2ViSW5zcGVjdG9yRW5hYmxlZENhbGxiYWNrKENGTm90aWZpY2F0aW9uQ2Vu dGVyUmVmLAogfQogI2VuZGlmCiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorI2lmIFBMQVRG T1JNKENPQ09BKQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6Y2FwdGl2ZVBvcnRhbE1vZGVDb25maWdV cGRhdGVDYWxsYmFjayhDRk5vdGlmaWNhdGlvbkNlbnRlclJlZiwgdm9pZCogb2JzZXJ2ZXIsIENG U3RyaW5nUmVmLCBjb25zdCB2b2lkKiwgQ0ZEaWN0aW9uYXJ5UmVmKQogewogICAgIGlmIChhdXRv IHBvb2wgPSBleHRyYWN0V2ViUHJvY2Vzc1Bvb2wob2JzZXJ2ZXIpKQpAQCAtNzQ1LDcgKzc0NSw3 IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnJlZ2lzdGVyTm90aWZpY2F0aW9uT2JzZXJ2ZXJzKCkK ICAgICAgICAgc2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpQb3dlclNv dXJjZURpZENoYW5nZShoYXNBQykpOwogICAgIH0pOwogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKKyNpZiBQTEFURk9STShDT0NPQSkKICAgICBhZGRDRk5vdGlmaWNhdGlvbk9ic2VydmVyKGNh cHRpdmVQb3J0YWxNb2RlQ29uZmlnVXBkYXRlQ2FsbGJhY2ssIChfX2JyaWRnZSBDRlN0cmluZ1Jl ZilXS0NhcHRpdmVQb3J0YWxNb2RlQ29udGFpbmVyQ29uZmlndXJhdGlvbkNoYW5nZWROb3RpZmlj YXRpb24pOwogI2VuZGlmCiAKQEAgLTc5Myw3ICs3OTMsNyBAQCB2b2lkIFdlYlByb2Nlc3NQb29s Ojp1bnJlZ2lzdGVyTm90aWZpY2F0aW9uT2JzZXJ2ZXJzKCkKIAogICAgIG1fcG93ZXJTb3VyY2VO b3RpZmllciA9IG51bGxwdHI7CiAgICAgCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyNpZiBQ TEFURk9STShDT0NPQSkKICAgICByZW1vdmVDRk5vdGlmaWNhdGlvbk9ic2VydmVyKChfX2JyaWRn ZSBDRlN0cmluZ1JlZilXS0NhcHRpdmVQb3J0YWxNb2RlQ29udGFpbmVyQ29uZmlndXJhdGlvbkNo YW5nZWROb3RpZmljYXRpb24pOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5oCmluZGV4IDBkMTIwMTViYmE0M2ZkYmYzNzk5ZjZiMGM3ZmUzZDAyMjgyYjg2 OTEuLjI4YzBmZmUyOGE5ZGViYTdjZTcyNTYxNjM4MDg0YWI3MDE1NzYyNDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAtNTg2LDcgKzU4Niw3IEBAIHByaXZh dGU6CiAjZW5kaWYKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBzdGF0aWMgdm9pZCBjYXB0aXZlUG9ydGFsTW9kZUNvbmZpZ1VwZGF0 ZUNhbGxiYWNrKENGTm90aWZpY2F0aW9uQ2VudGVyUmVmLCB2b2lkKiBvYnNlcnZlciwgQ0ZTdHJp bmdSZWYgbmFtZSwgY29uc3Qgdm9pZCogcG9zdGluZ09iamVjdCwgQ0ZEaWN0aW9uYXJ5UmVmIHVz ZXJJbmZvKTsKICNlbmRpZgogICAgIAo=