151960 2015-12-07 12:56:17 -0800 [WK2] Regression(r187691): If a page is showing an auth pane in one tab, any new tabs with same page hang until credentials are entered in first tab 2015-12-07 14:44:57 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen ap beidson commit-queue koivisto webkit-bug-importer oldest_to_newest 1146960 0 cdumez 2015-12-07 12:56:17 -0800 If a page is showing an auth pane in one tab, any new tabs with same page hang until credentials are entered in first tab. This is a regression from <http://trac.webkit.org/changeset/187691>. 1146961 1 cdumez 2015-12-07 12:56:44 -0800 rdar://problem/23618112 1146966 2 266800 cdumez 2015-12-07 13:02:19 -0800 Created attachment 266800 Patch 1146969 3 266800 achristensen 2015-12-07 13:06:04 -0800 Comment on attachment 266800 Patch r=me 1146973 4 266800 ap 2015-12-07 13:16:11 -0800 Comment on attachment 266800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=266800&action=review > Source/WebKit2/ChangeLog:14 > + same domain, no matter what tab they are for. This can be confusing > + so we now only coalesce authentication challenges within each tab, > + by leveraging the pageID (in addition to the domain). Hmm, so this means that the user will once again get a ton of authentication requests when relaunching Safari. That's not a good experience either. 1146974 5 cdumez 2015-12-07 13:20:50 -0800 (In reply to comment #4) > Comment on attachment 266800 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=266800&action=review > > > Source/WebKit2/ChangeLog:14 > > + same domain, no matter what tab they are for. This can be confusing > > + so we now only coalesce authentication challenges within each tab, > > + by leveraging the pageID (in addition to the domain). > > Hmm, so this means that the user will once again get a ton of authentication > requests when relaunching Safari. That's not a good experience either. Well, before coalescing, they would get several auth panes per tab. Now they can get maximum one auth pane per tab. I think this is a good compromise. The situation where you end up having blank tabs stuck due to an authentication request in another tab (that is not visible) is worse IMHO. 1147023 6 266800 commit-queue 2015-12-07 14:44:52 -0800 Comment on attachment 266800 Patch Clearing flags on attachment: 266800 Committed r193654: <http://trac.webkit.org/changeset/193654> 1147024 7 commit-queue 2015-12-07 14:44:57 -0800 All reviewed patches have been landed. Closing bug. 266800 2015-12-07 13:02:19 -0800 2015-12-07 14:44:52 -0800 Patch bug-151960-20151207130150.patch text/plain 7863 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzNjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjdlZTlhY2JjY2NjZWU1 ZWY0ZGJhNGYwMGRjOTk1NmFkODYyNzViMS4uYWJjNjJlMTU1MDc2ZDQ3MDJhNjA0NGNiNmMyZThk ZThkYWVkNmViMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTEyLTA3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gUmVncmVzc2lvbihy MTg3NjkxKTogSWYgYSBwYWdlIGlzIHNob3dpbmcgYW4gYXV0aCBwYW5lIGluIG9uZSB0YWIsIGFu eSBuZXcgdGFicyB3aXRoIHNhbWUgcGFnZSBoYW5nIHVudGlsIGNyZWRlbnRpYWxzIGFyZSBlbnRl cmVkIGluIGZpcnN0IHRhYgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTUxOTYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMzYxODExMj4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMTg3Njkx LCBpZiBhIHBhZ2UgaXMgc2hvd2luZyBhbiBhdXRoIHBhbmUgaW4gb25lIHRhYiwgYW55IG5ldwor ICAgICAgICB0YWJzIHdpdGggc2FtZSBwYWdlIGhhbmcgdW50aWwgY3JlZGVudGlhbHMgYXJlIGVu dGVyZWQgaW4gZmlyc3QgdGFiLgorICAgICAgICBUaGlzIGlzIGJlY2F1c2Ugd2UgY29hbGVzY2lu ZyBhbGwgYXV0aGVudGljYXRpb24gY2hhbGxlbmdlcyBmcm9tIHRoZQorICAgICAgICBzYW1lIGRv bWFpbiwgbm8gbWF0dGVyIHdoYXQgdGFiIHRoZXkgYXJlIGZvci4gVGhpcyBjYW4gYmUgY29uZnVz aW5nCisgICAgICAgIHNvIHdlIG5vdyBvbmx5IGNvYWxlc2NlIGF1dGhlbnRpY2F0aW9uIGNoYWxs ZW5nZXMgd2l0aGluIGVhY2ggdGFiLAorICAgICAgICBieSBsZXZlcmFnaW5nIHRoZSBwYWdlSUQg KGluIGFkZGl0aW9uIHRvIHRoZSBkb21haW4pLgorCisgICAgICAgICogU2hhcmVkL0F1dGhlbnRp Y2F0aW9uL0F1dGhlbnRpY2F0aW9uTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkF1dGhl bnRpY2F0aW9uTWFuYWdlcjo6c2hvdWxkQ29hbGVzY2VDaGFsbGVuZ2UpOgorICAgICAgICAoV2Vi S2l0OjpBdXRoZW50aWNhdGlvbk1hbmFnZXI6OmNvYWxlc2NlQ2hhbGxlbmdlc01hdGNoaW5nKToK KyAgICAgICAgKFdlYktpdDo6QXV0aGVudGljYXRpb25NYW5hZ2VyOjpkaWRSZWNlaXZlQXV0aGVu dGljYXRpb25DaGFsbGVuZ2UpOgorICAgICAgICAqIFNoYXJlZC9BdXRoZW50aWNhdGlvbi9BdXRo ZW50aWNhdGlvbk1hbmFnZXIuaDoKKwogMjAxNS0xMi0wNyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bTWFjXSBzb2NrZXRwYWlyIGFzc2Vy dGlvbiBmYWlsdXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQXV0aGVudGlj YXRpb24vQXV0aGVudGljYXRpb25NYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9B dXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdGlvbk1hbmFnZXIuY3BwCmluZGV4IGE1MTg0Yzk5Njc3 ODIyYmRiNmZjZDJkOTc0YjM4ZWYyZmMyNmE3M2IuLjk1OTI3NmVhOTdhZTc4ODM3Njg2MWQ0NzU1 ZjUzNTIzNDgzYzhmOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BdXRoZW50 aWNhdGlvbi9BdXRoZW50aWNhdGlvbk1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9BdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdGlvbk1hbmFnZXIuY3BwCkBAIC03NiwxMyAr NzYsMTMgQEAgdWludDY0X3QgQXV0aGVudGljYXRpb25NYW5hZ2VyOjphZGRDaGFsbGVuZ2VUb0No YWxsZW5nZU1hcChjb25zdCBDaGFsbGVuZ2UmIGNoYWwKICAgICByZXR1cm4gY2hhbGxlbmdlSUQ7 CiB9CiAKLWJvb2wgQXV0aGVudGljYXRpb25NYW5hZ2VyOjpzaG91bGRDb2FsZXNjZUNoYWxsZW5n ZSh1aW50NjRfdCBjaGFsbGVuZ2VJRCwgY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGNo YWxsZW5nZSkgY29uc3QKK2Jvb2wgQXV0aGVudGljYXRpb25NYW5hZ2VyOjpzaG91bGRDb2FsZXNj ZUNoYWxsZW5nZSh1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGNoYWxsZW5nZUlELCBjb25zdCBB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdlKSBjb25zdAogewogICAgIGlmICghY2Fu Q29hbGVzY2VDaGFsbGVuZ2UoY2hhbGxlbmdlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgZm9yIChhdXRvJiBpdGVtIDogbV9jaGFsbGVuZ2VzKSB7Ci0gICAgICAgIGlmIChpdGVtLmtl eSAhPSBjaGFsbGVuZ2VJRCAmJiBQcm90ZWN0aW9uU3BhY2U6OmNvbXBhcmUoY2hhbGxlbmdlLnBy b3RlY3Rpb25TcGFjZSgpLCBpdGVtLnZhbHVlLmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UoKSkp CisgICAgICAgIGlmIChpdGVtLmtleSAhPSBjaGFsbGVuZ2VJRCAmJiBpdGVtLnZhbHVlLnBhZ2VJ RCA9PSBwYWdlSUQgJiYgUHJvdGVjdGlvblNwYWNlOjpjb21wYXJlKGNoYWxsZW5nZS5wcm90ZWN0 aW9uU3BhY2UoKSwgaXRlbS52YWx1ZS5jaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCkpKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAgLTEwMCw3 ICsxMDAsNyBAQCBWZWN0b3I8dWludDY0X3Q+IEF1dGhlbnRpY2F0aW9uTWFuYWdlcjo6Y29hbGVz Y2VDaGFsbGVuZ2VzTWF0Y2hpbmcodWludDY0X3QgY2hhbAogICAgICAgICByZXR1cm4gY2hhbGxl bmdlc1RvQ29hbGVzY2U7CiAKICAgICBmb3IgKGF1dG8mIGl0ZW0gOiBtX2NoYWxsZW5nZXMpIHsK LSAgICAgICAgaWYgKGl0ZW0ua2V5ICE9IGNoYWxsZW5nZUlEICYmIFByb3RlY3Rpb25TcGFjZTo6 Y29tcGFyZShjaGFsbGVuZ2UuY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZSgpLCBpdGVtLnZhbHVl LmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UoKSkpCisgICAgICAgIGlmIChpdGVtLmtleSAhPSBj aGFsbGVuZ2VJRCAmJiBpdGVtLnZhbHVlLnBhZ2VJRCA9PSBjaGFsbGVuZ2UucGFnZUlEICYmIFBy b3RlY3Rpb25TcGFjZTo6Y29tcGFyZShjaGFsbGVuZ2UuY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFj ZSgpLCBpdGVtLnZhbHVlLmNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UoKSkpCiAgICAgICAgICAg ICBjaGFsbGVuZ2VzVG9Db2FsZXNjZS5hcHBlbmQoaXRlbS5rZXkpOwogICAgIH0KIApAQCAtMTEy LDE0ICsxMTIsMTUgQEAgdm9pZCBBdXRoZW50aWNhdGlvbk1hbmFnZXI6OmRpZFJlY2VpdmVBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZShXZWJGcmFtZSogZnJhbWUsIGMKICAgICBBU1NFUlQoZnJhbWUp OwogICAgIEFTU0VSVChmcmFtZS0+cGFnZSgpKTsKIAotICAgIHVpbnQ2NF90IGNoYWxsZW5nZUlE ID0gYWRkQ2hhbGxlbmdlVG9DaGFsbGVuZ2VNYXAoe2F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlCisg ICAgYXV0byBwYWdlSUQgPSBmcmFtZS0+cGFnZSgpLT5wYWdlSUQoKTsKKyAgICB1aW50NjRfdCBj aGFsbGVuZ2VJRCA9IGFkZENoYWxsZW5nZVRvQ2hhbGxlbmdlTWFwKHtwYWdlSUQsIGF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlCiAjaWYgVVNFKE5FVFdPUktfU0VTU0lPTikKICAgICAgICAgLCBDaGFs bGVuZ2VDb21wbGV0aW9uSGFuZGxlcigpCiAjZW5kaWYKICAgICB9KTsKIAotICAgIC8vIENvYWxl c2NlIGNoYWxsZW5nZXMgaW4gdGhlIHNhbWUgcHJvdGVjdGlvbiBzcGFjZS4KLSAgICBpZiAoc2hv dWxkQ29hbGVzY2VDaGFsbGVuZ2UoY2hhbGxlbmdlSUQsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KSkKKyAgICAvLyBDb2FsZXNjZSBjaGFsbGVuZ2VzIGluIHRoZSBzYW1lIHByb3RlY3Rpb24gc3Bh Y2UgYW5kIGluIHRoZSBzYW1lIHBhZ2UuCisgICAgaWYgKHNob3VsZENvYWxlc2NlQ2hhbGxlbmdl KHBhZ2VJRCwgY2hhbGxlbmdlSUQsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSkKICAgICAgICAg cmV0dXJuOwogICAgIAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5 OjpEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoZnJhbWUtPmZyYW1lSUQoKSwgYXV0 aGVudGljYXRpb25DaGFsbGVuZ2UsIGNoYWxsZW5nZUlEKSwgZnJhbWUtPnBhZ2UoKS0+cGFnZUlE KCkpOwpAQCAtMTMxLDggKzEzMiwxMCBAQCB2b2lkIEF1dGhlbnRpY2F0aW9uTWFuYWdlcjo6ZGlk UmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHVpbnQ2NF90IHBhZ2VJRCwgdQogICAgIEFT U0VSVChwYWdlSUQpOwogICAgIEFTU0VSVChmcmFtZUlEKTsKIAotICAgIHVpbnQ2NF90IGNoYWxs ZW5nZUlEID0gYWRkQ2hhbGxlbmdlVG9DaGFsbGVuZ2VNYXAoe2F1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlLCBjb21wbGV0aW9uSGFuZGxlcn0pOwotICAgIGlmIChzaG91bGRDb2FsZXNjZUNoYWxsZW5n ZShjaGFsbGVuZ2VJRCwgYXV0aGVudGljYXRpb25DaGFsbGVuZ2UpKQorICAgIHVpbnQ2NF90IGNo YWxsZW5nZUlEID0gYWRkQ2hhbGxlbmdlVG9DaGFsbGVuZ2VNYXAoe3BhZ2VJRCwgYXV0aGVudGlj YXRpb25DaGFsbGVuZ2UsIGNvbXBsZXRpb25IYW5kbGVyfSk7CisKKyAgICAvLyBDb2FsZXNjZSBj aGFsbGVuZ2VzIGluIHRoZSBzYW1lIHByb3RlY3Rpb24gc3BhY2UgYW5kIGluIHRoZSBzYW1lIHBh Z2UuCisgICAgaWYgKHNob3VsZENvYWxlc2NlQ2hhbGxlbmdlKHBhZ2VJRCwgY2hhbGxlbmdlSUQs IGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6RGlkUmVjZWl2ZUF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHBhZ2VJRCwgZnJhbWVJRCwgYXV0aGVudGljYXRpb25DaGFs bGVuZ2UsIGNoYWxsZW5nZUlEKSk7CkBAIC0xNDMsMTIgKzE0NiwxNCBAQCB2b2lkIEF1dGhlbnRp Y2F0aW9uTWFuYWdlcjo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHVpbnQ2NF90 IHBhZ2VJRCwgdQogICAgIEFTU0VSVChwYWdlSUQpOwogICAgIEFTU0VSVChmcmFtZUlEKTsKIAot ICAgIHVpbnQ2NF90IGNoYWxsZW5nZUlEID0gYWRkQ2hhbGxlbmdlVG9DaGFsbGVuZ2VNYXAoe2F1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlCisgICAgdWludDY0X3QgY2hhbGxlbmdlSUQgPSBhZGRDaGFs bGVuZ2VUb0NoYWxsZW5nZU1hcCh7cGFnZUlELCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZQogI2lm IFVTRShORVRXT1JLX1NFU1NJT04pCiAgICAgICAgICwgQ2hhbGxlbmdlQ29tcGxldGlvbkhhbmRs ZXIoKQogI2VuZGlmCiAgICAgfSk7Ci0gICAgaWYgKHNob3VsZENvYWxlc2NlQ2hhbGxlbmdlKGNo YWxsZW5nZUlELCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkpCisKKyAgICAvLyBDb2FsZXNjZSBj aGFsbGVuZ2VzIGluIHRoZSBzYW1lIHByb3RlY3Rpb24gc3BhY2UgYW5kIGluIHRoZSBzYW1lIHBh Z2UuCisgICAgaWYgKHNob3VsZENvYWxlc2NlQ2hhbGxlbmdlKHBhZ2VJRCwgY2hhbGxlbmdlSUQs IGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6RGlkUmVjZWl2ZUF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHBhZ2VJRCwgZnJhbWVJRCwgYXV0aGVudGljYXRpb25DaGFs bGVuZ2UsIGNoYWxsZW5nZUlEKSk7CkBAIC0xNTcsOCArMTYyLDExIEBAIHZvaWQgQXV0aGVudGlj YXRpb25NYW5hZ2VyOjpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UodWludDY0X3Qg cGFnZUlELCB1CiAjaWYgIVVTRShORVRXT1JLX1NFU1NJT04pCiB2b2lkIEF1dGhlbnRpY2F0aW9u TWFuYWdlcjo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKERvd25sb2FkKiBkb3du bG9hZCwgY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlKQogewotICAgIHVpbnQ2NF90IGNoYWxsZW5nZUlEID0gYWRkQ2hhbGxlbmdlVG9DaGFsbGVu Z2VNYXAoe2F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlfSk7Ci0gICAgaWYgKHNob3VsZENvYWxlc2Nl Q2hhbGxlbmdlKGNoYWxsZW5nZUlELCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkpCisgICAgdWlu dDY0X3QgZHVtbXlQYWdlSUQgPSAwOworICAgIHVpbnQ2NF90IGNoYWxsZW5nZUlEID0gYWRkQ2hh bGxlbmdlVG9DaGFsbGVuZ2VNYXAoe2R1bW15UGFnZUlELCBhdXRoZW50aWNhdGlvbkNoYWxsZW5n ZX0pOworCisgICAgLy8gQ29hbGVzY2UgY2hhbGxlbmdlcyBpbiB0aGUgc2FtZSBwcm90ZWN0aW9u IHNwYWNlIGFuZCBpbiB0aGUgc2FtZSBwYWdlLgorICAgIGlmIChzaG91bGRDb2FsZXNjZUNoYWxs ZW5nZShkdW1teVBhZ2VJRCwgY2hhbGxlbmdlSUQsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgZG93bmxvYWQtPnNlbmQoTWVzc2FnZXM6OkRvd25sb2Fk UHJveHk6OkRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShhdXRoZW50aWNhdGlvbkNo YWxsZW5nZSwgY2hhbGxlbmdlSUQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdGlvbk1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9BdXRoZW50aWNhdGlvbi9BdXRoZW50aWNhdGlvbk1hbmFnZXIuaAppbmRleCAwNTli MWY3MDdmY2UxZGI2NjU5MzZmN2FhNDIzYTIxNDNmM2MwMWQ2Li44MTNkOTBiMDFjZDEzNThhYTEy YzQ5MWM2M2I1Zjg5YmE2OWVkY2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv QXV0aGVudGljYXRpb24vQXV0aGVudGljYXRpb25NYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL0F1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0aW9uTWFuYWdlci5oCkBAIC03NCw2 ICs3NCw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBzdHJ1Y3QgQ2hhbGxlbmdlIHsKKyAg ICAgICAgdWludDY0X3QgcGFnZUlEOwogICAgICAgICBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNo YWxsZW5nZSBjaGFsbGVuZ2U7CiAjaWYgVVNFKE5FVFdPUktfU0VTU0lPTikKICAgICAgICAgQ2hh bGxlbmdlQ29tcGxldGlvbkhhbmRsZXIgY29tcGxldGlvbkhhbmRsZXI7CkBAIC04Niw3ICs4Nyw3 IEBAIHByaXZhdGU6CiAgICAgYm9vbCB0cnlVc2VDZXJ0aWZpY2F0ZUluZm9Gb3JDaGFsbGVuZ2Uo Y29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmLCBjb25zdCBXZWJDb3JlOjpD ZXJ0aWZpY2F0ZUluZm8mKTsKIAogICAgIHVpbnQ2NF90IGFkZENoYWxsZW5nZVRvQ2hhbGxlbmdl TWFwKGNvbnN0IENoYWxsZW5nZSYpOwotICAgIGJvb2wgc2hvdWxkQ29hbGVzY2VDaGFsbGVuZ2Uo dWludDY0X3QgY2hhbGxlbmdlSUQsIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlJikgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb2FsZXNjZUNoYWxsZW5nZSh1aW50NjRfdCBw YWdlSUQsIHVpbnQ2NF90IGNoYWxsZW5nZUlELCBjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSYpIGNvbnN0OwogCiAgICAgdm9pZCB1c2VDcmVkZW50aWFsRm9yU2luZ2xlQ2hh bGxlbmdlKHVpbnQ2NF90IGNoYWxsZW5nZUlELCBjb25zdCBXZWJDb3JlOjpDcmVkZW50aWFsJiwg Y29uc3QgV2ViQ29yZTo6Q2VydGlmaWNhdGVJbmZvJik7CiAgICAgdm9pZCBjb250aW51ZVdpdGhv dXRDcmVkZW50aWFsRm9yU2luZ2xlQ2hhbGxlbmdlKHVpbnQ2NF90IGNoYWxsZW5nZUlEKTsK