238601 2022-03-31 05:05:33 -0700 Persistent notifications should work in document scopes as well as service worker global scopes 2022-04-01 01:38:20 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cdumez webkit-bug-importer oldest_to_newest 1856774 0 youennf 2022-03-31 05:05:33 -0700 Persistent notifications should work in document scopes as well as service worker global scopes 1856775 1 456227 youennf 2022-03-31 05:10:44 -0700 Created attachment 456227 Patch 1857185 2 ews-feeder 2022-04-01 01:04:39 -0700 Committed r292207 (249110@main): <https://commits.webkit.org/249110@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456227. 1857186 3 webkit-bug-importer 2022-04-01 01:05:17 -0700 <rdar://problem/91150515> 456227 2022-03-31 05:10:44 -0700 2022-04-01 01:38:20 -0700 Patch bug-238601-20220331141042.patch text/plain 15743 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWYzZGIyNzczNTQ0ZjQ0 N2I2OGIzNjM2YjEwMDg1N2U5ZTE0MDA1My4uZTFlMWFiNDA1Yjc3MDBlYmEyMGVmYjJjMTJjZGY5 ZmQ5ODg2YzA1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAzLTMxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJzaXN0ZW50IG5vdGlm aWNhdGlvbnMgc2hvdWxkIHdvcmsgaW4gZG9jdW1lbnQgc2NvcGVzIGFzIHdlbGwgYXMgc2Vydmlj ZSB3b3JrZXIgZ2xvYmFsIHNjb3BlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM4NjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGEgbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMIGluIE5v dGlmaWNhdGlvbiB0byBpZGVudGlmeSB3aGV0aGVyIGEgbm90ZmljYXRpb24gaXMgcGVyc2lzdGVu dCBvciBub3QuCisgICAgICAgIFNldCB0aGF0IGZpZWxkIHdoZW4gY3JlYXRpbmcgYSBub3RpZmlj YXRpb24gZnJvbSBOb3RpZmljYXRpb25EYXRhIG9yIGZyb20gU2VydmljZVdvcmtlclJlZ2lzdHJh dGlvbjo6c2hvd05vdGlmaWNhdGlvbi4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL3dvcmtl cnMvc2VydmljZS9zaG93bm90aWZpY2F0aW9uLWFsbG93ZWQtZG9jdW1lbnQuaHRtbAorCisgICAg ICAgICogTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpOb3RpZmljYXRpb246OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmlj YXRpb246OmRhdGEgY29uc3QpOgorICAgICAgICAqIE1vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3Rp ZmljYXRpb24uaDoKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9u OjpzaG93Tm90aWZpY2F0aW9uKToKKwogMjAyMi0wMy0zMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbi5nZXROb3Rp ZmljYXRpb25zIHNob3VsZCBsaXN0IGFsbCBwZXJzaXN0ZW50IG5vdGlmaWNhdGlvbnMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggMDU3NDU4MWY1ZjhkNzdiYWY2ZjAwZWVjNWJiODFmYTBhZDhhOTNiZS4uN2MwMjU0NjQ0 NTg1ZmU2MjMyMTRkNDNlNjAxMjRjYmEyZmE2MTI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBA QAorMjAyMi0wMy0zMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAg ICAgUGVyc2lzdGVudCBub3RpZmljYXRpb25zIHNob3VsZCB3b3JrIGluIGRvY3VtZW50IHNjb3Bl cyBhcyB3ZWxsIGFzIHNlcnZpY2Ugd29ya2VyIGdsb2JhbCBzY29wZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODYwMQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNhc2Ugb2Ygbm90aWZpY2F0aW9u IG1lc3NhZ2UgY29taW5nIGZyb20gYSBXZWJQYWdlLCBjaGVjayB3aGV0aGVyIHRoZSBub3RpZmlj YXRpb24gaXMgcGVyc2lzdGVudCBvciBub3QuCisgICAgICAgIElmIHBlcnNpc3RlbnQsIGdvIHRv IFNlcnZpY2VXb3JrZXJOb3RpZmljYXRpb25IYW5kbGVyLCBvdGhlcndpc2UgdXNlIHRoZSBjdXJy ZW50IGNvZGUgcGF0aCB0aHJvdWdoIFdlYlBhZ2VQcm94eS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9Ob3RpZmljYXRpb25zL1NlcnZpY2VXb3JrZXJOb3RpZmljYXRpb25IYW5kbGVyLmg6CisgICAg ICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlck1lc3Nh Z2VIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uTWFuYWdlck1l c3NhZ2VIYW5kbGVyOjpzaG93Tm90aWZpY2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViTm90 aWZpY2F0aW9uTWFuYWdlck1lc3NhZ2VIYW5kbGVyOjpjYW5jZWxOb3RpZmljYXRpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJOb3RpZmljYXRpb25NYW5hZ2VyTWVzc2FnZUhhbmRsZXI6OmNsZWFy Tm90aWZpY2F0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlvbk1hbmFnZXJN ZXNzYWdlSGFuZGxlcjo6ZGlkRGVzdHJveU5vdGlmaWNhdGlvbik6CisKIDIwMjItMDMtMzEgIFlv dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb24uZ2V0Tm90aWZpY2F0aW9ucyBzaG91bGQgbGlzdCBhbGwgcGVyc2lzdGVudCBu b3RpZmljYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNh dGlvbnMvTm90aWZpY2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0 aW9ucy9Ob3RpZmljYXRpb24uY3BwCmluZGV4IDBkOWU0NzE2Y2JhMjhlOTE3MDFlYTM5YTI5Zjc1 MDVkZGZiZWUzNjkuLmEzODMzNDBiNmFhMTU4OGM3ZGRkM2MzM2UyZjM1ZWFjMTVkNDFhM2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmlj YXRpb24uY3BwCkBAIC01Myw5ICs1MywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFdURl9N QUtFX0lTT19BTExPQ0FURURfSU1QTChOb3RpZmljYXRpb24pOwogCi1SZWY8Tm90aWZpY2F0aW9u PiBOb3RpZmljYXRpb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBT dHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMpCitSZWY8Tm90aWZpY2F0aW9uPiBOb3Rp ZmljYXRpb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBTdHJpbmcm JiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMsIGNvbnN0IFVSTCYgc2VydmljZVdvcmtlclJlZ2lz dHJhdGlvblVSTCkKIHsKICAgICBhdXRvIG5vdGlmaWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90 aWZpY2F0aW9uKGNvbnRleHQsIFdURk1vdmUodGl0bGUpLCBXVEZNb3ZlKG9wdGlvbnMpKSk7Cisg ICAgbm90aWZpY2F0aW9uLT5tX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25VUkwgPSBzZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uVVJMOwogICAgIG5vdGlmaWNhdGlvbi0+c3VzcGVuZElmTmVlZGVk KCk7CiAgICAgbm90aWZpY2F0aW9uLT5zaG93U29vbigpOwogICAgIHJldHVybiBub3RpZmljYXRp b247CkBAIC02Nyw2ICs2OCw3IEBAIFJlZjxOb3RpZmljYXRpb24+IE5vdGlmaWNhdGlvbjo6Y3Jl YXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIE5vdGlmaWNhCiAgICAgYXV0byBu b3RpZmljYXRpb24gPSBhZG9wdFJlZigqbmV3IE5vdGlmaWNhdGlvbihjb250ZXh0LCBXVEZNb3Zl KGRhdGEudGl0bGUpLCBXVEZNb3ZlKG9wdGlvbnMpKSk7CiAgICAgbm90aWZpY2F0aW9uLT5zdXNw ZW5kSWZOZWVkZWQoKTsKICAgICBub3RpZmljYXRpb24tPm1fcmVsYXRlZE5vdGlmaWNhdGlvbklk ZW50aWZpZXIgPSBkYXRhLm5vdGlmaWNhdGlvbklEOworICAgIG5vdGlmaWNhdGlvbi0+bV9zZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMID0gV1RGTW92ZShkYXRhLnNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25VUkwpOwogICAgIHJldHVybiBub3RpZmljYXRpb247CiB9CiAKQEAgLTMwMiwxMSAr MzA0LDYgQEAgTm90aWZpY2F0aW9uRGF0YSBOb3RpZmljYXRpb246OmRhdGEoKSBjb25zdAogICAg IGF1dG8gc2Vzc2lvbklEID0gY29udGV4dC5zZXNzaW9uSUQoKTsKICAgICBSRUxFQVNFX0FTU0VS VChzZXNzaW9uSUQpOwogCi0gICAgVVJMIHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25VUkw7Ci0j aWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIGlmIChpczxTZXJ2aWNlV29ya2VyR2xvYmFs U2NvcGU+KGNvbnRleHQpKQotICAgICAgICBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMID0g ZG93bmNhc3Q8U2VydmljZVdvcmtlckdsb2JhbFNjb3BlPihjb250ZXh0KS5yZWdpc3RyYXRpb24o KS5kYXRhKCkuc2NvcGVVUkw7Ci0jZW5kaWYKICAgICByZXR1cm4gewogICAgICAgICBtX3RpdGxl Lmlzb2xhdGVkQ29weSgpLAogICAgICAgICBtX2JvZHkuaXNvbGF0ZWRDb3B5KCksCkBAIC0zMTUs NyArMzEyLDcgQEAgTm90aWZpY2F0aW9uRGF0YSBOb3RpZmljYXRpb246OmRhdGEoKSBjb25zdAog ICAgICAgICBtX2xhbmcsCiAgICAgICAgIG1fZGlyZWN0aW9uLAogICAgICAgICBzY3JpcHRFeGVj dXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCktPnRvU3RyaW5nKCkuaXNvbGF0ZWRDb3B5 KCksCi0gICAgICAgIFdURk1vdmUoc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTCkuaXNvbGF0 ZWRDb3B5KCksCisgICAgICAgIG1fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTC5pc29sYXRl ZENvcHkoKSwKICAgICAgICAgaWRlbnRpZmllcigpLAogICAgICAgICAqc2Vzc2lvbklELAogICAg ICAgICBNb25vdG9uaWNUaW1lOjpub3coKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5oCmluZGV4IGNmNjM0NDcxMmQ0YjU5OTNmY2Mw NjgyZGY0NjE0ODc2M2VjMjc0MzguLmMyZjRkYmE0MTRiZmE4MTI4MmNmNzZmMTZjNmVjMjgxZGQ0 MTdiYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9O b3RpZmljYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNhdGlvbnMv Tm90aWZpY2F0aW9uLmgKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAgICAgICBTdHJpbmcg dGFnOwogICAgICAgICBTdHJpbmcgaWNvbjsKICAgICB9OwotICAgIHN0YXRpYyBSZWY8Tm90aWZp Y2F0aW9uPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIFN0cmluZyYmIHRpdGxlLCBP cHRpb25zJiYpOworICAgIHN0YXRpYyBSZWY8Tm90aWZpY2F0aW9uPiBjcmVhdGUoU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCYsIFN0cmluZyYmIHRpdGxlLCBPcHRpb25zJiYsIGNvbnN0IFVSTCYgc2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTCA9IHsgfSk7CiAgICAgc3RhdGljIFJlZjxOb3RpZmlj YXRpb24+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgTm90aWZpY2F0aW9uRGF0YSYm KTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZpcnR1YWwgfk5vdGlmaWNhdGlvbigpOwpAQCAtMTQx LDYgKzE0MSw3IEBAIHByaXZhdGU6CiAgICAgTm90aWZpY2F0aW9uU291cmNlIG1fbm90aWZpY2F0 aW9uU291cmNlOwogICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyIG1fY29udGV4 dElkZW50aWZpZXI7CiAgICAgc3RkOjpvcHRpb25hbDxVVUlEPiBtX3JlbGF0ZWROb3RpZmljYXRp b25JZGVudGlmaWVyOworICAgIFVSTCBtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25VUkw7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbi5jcHAKaW5kZXgg NmU3MTY1MzQ2OTc2NDRjNDRjY2UxNDA3MDhjYzdjYTNhZWNkMDI3NS4uMGIyNzBjYjQ4Yjc5MTgy ZjI2MTNlMzQ4OTRlZDk2NjBkOWNmOWU3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29y a2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uLmNwcApAQCAt MjkyLDcgKzI5Miw3IEBAIHZvaWQgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbjo6c2hvd05vdGlm aWNhdGlvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0CiAKICAgICAvLyBUaGUgTm90 aWZpY2F0aW9uIGlzIGtlcHQgYWxpdmUgYnkgdmlydHVlIG9mIGJlaW5nIHNob3coKSduIHNvb24u CiAgICAgLy8gRklYTUU6IFdoZW4gaW1wbGVtZW50aW5nIGdldE5vdGlmaWNhdGlvbnMoKSwgc3Rv cmUgdGhpcyBOb3RpZmljYXRpb24gaW4gdGhlIHJlZ2lzdHJhdGlvbidzIG5vdGlmaWNhdGlvbiBs aXN0LgotICAgIGF1dG8gbm90aWZpY2F0aW9uID0gTm90aWZpY2F0aW9uOjpjcmVhdGUoY29udGV4 dCwgV1RGTW92ZSh0aXRsZSksIFdURk1vdmUob3B0aW9ucykpOworICAgIGF1dG8gbm90aWZpY2F0 aW9uID0gTm90aWZpY2F0aW9uOjpjcmVhdGUoY29udGV4dCwgV1RGTW92ZSh0aXRsZSksIFdURk1v dmUob3B0aW9ucyksIG1fcmVnaXN0cmF0aW9uRGF0YS5zY29wZVVSTCk7CiAKICAgICBjb250ZXh0 LmV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpET01NYW5pcHVsYXRpb24sIFtwcm9t aXNlID0gV1RGTW92ZShwcm9taXNlKV0oKSBtdXRhYmxlIHsKICAgICAgICAgcHJvbWlzZS5yZXNv bHZlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25z L1NlcnZpY2VXb3JrZXJOb3RpZmljYXRpb25IYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Ob3RpZmljYXRpb25zL1NlcnZpY2VXb3JrZXJOb3RpZmljYXRpb25IYW5kbGVyLmgKaW5k ZXggYThlM2IxZjY5YzNjNzBjODE5ODk2NzJkZWY3NDViNDE3ZjAwNDEzZS4uMTViZjhkYzM5NDlh YWIyZjAwOWUwYzMzYTc3ZjYxMGJmYTQ5YjMyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvTm90aWZpY2F0aW9ucy9TZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvU2VydmljZVdvcmtl ck5vdGlmaWNhdGlvbkhhbmRsZXIuaApAQCAtMzgsMTUgKzM4LDE4IEBAIGNsYXNzIFNlcnZpY2VX b3JrZXJOb3RpZmljYXRpb25IYW5kbGVyIGZpbmFsIDogcHVibGljIE5vdGlmaWNhdGlvbk1hbmFn ZXJNZXNzYWdlCiBwdWJsaWM6CiAgICAgc3RhdGljIFNlcnZpY2VXb3JrZXJOb3RpZmljYXRpb25I YW5kbGVyJiBzaW5nbGV0b24oKTsKIAotcHJpdmF0ZToKLSAgICBleHBsaWNpdCBTZXJ2aWNlV29y a2VyTm90aWZpY2F0aW9uSGFuZGxlcigpID0gZGVmYXVsdDsKLQotICAgIHZvaWQgcmVxdWVzdFN5 c3RlbU5vdGlmaWNhdGlvblBlcm1pc3Npb24oY29uc3QgU3RyaW5nJiwgQ29tcGxldGlvbkhhbmRs ZXI8dm9pZChib29sKT4mJikgZmluYWw7CiAgICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKElQQzo6 Q29ubmVjdGlvbiYsIGNvbnN0IFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkRhdGEmKSBmaW5hbDsKICAg ICB2b2lkIGNhbmNlbE5vdGlmaWNhdGlvbihjb25zdCBVVUlEJiBub3RpZmljYXRpb25JRCkgZmlu YWw7CiAgICAgdm9pZCBjbGVhck5vdGlmaWNhdGlvbnMoY29uc3QgVmVjdG9yPFVVSUQ+JiBub3Rp ZmljYXRpb25JRHMpIGZpbmFsOwogICAgIHZvaWQgZGlkRGVzdHJveU5vdGlmaWNhdGlvbihjb25z dCBVVUlEJiBub3RpZmljYXRpb25JRCkgZmluYWw7CiAKKyAgICBib29sIGhhbmRsZXNOb3RpZmlj YXRpb24oVVVJRCB2YWx1ZSkgY29uc3QgeyByZXR1cm4gbV9ub3RpZmljYXRpb25Ub1Nlc3Npb25N YXAuY29udGFpbnModmFsdWUpOyB9CisKK3ByaXZhdGU6CisgICAgZXhwbGljaXQgU2VydmljZVdv cmtlck5vdGlmaWNhdGlvbkhhbmRsZXIoKSA9IGRlZmF1bHQ7CisKKyAgICB2b2lkIHJlcXVlc3RT eXN0ZW1Ob3RpZmljYXRpb25QZXJtaXNzaW9uKGNvbnN0IFN0cmluZyYsIENvbXBsZXRpb25IYW5k bGVyPHZvaWQoYm9vbCk+JiYpIGZpbmFsOworCiAgICAgV2Vic2l0ZURhdGFTdG9yZSogZGF0YVN0 b3JlRm9yTm90aWZpY2F0aW9uSUQoY29uc3QgVVVJRCYpOwogCiAgICAgSGFzaE1hcDxVVUlELCBQ QUw6OlNlc3Npb25JRD4gbV9ub3RpZmljYXRpb25Ub1Nlc3Npb25NYXA7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFn ZXJNZXNzYWdlSGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Ob3RpZmljYXRp b25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJNZXNzYWdlSGFuZGxlci5jcHAKaW5kZXggNGM2ODRk OWM5ZDM4MWYyYjFkZGM2MWM2YzM2NzdjNjZlZjY4MDVlZS4uMWNmZDMyOGQ2ZjcyM2UzMDU5OTlh MzAwMWU1YWEzNTkwMTY2ZDc1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Tm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyTWVzc2FnZUhhbmRsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9u TWFuYWdlck1lc3NhZ2VIYW5kbGVyLmNwcApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIldlYk5vdGlmaWNhdGlvbk1hbmFnZXJNZXNzYWdlSGFuZGxlci5o IgogCisjaW5jbHVkZSAiU2VydmljZVdvcmtlck5vdGlmaWNhdGlvbkhhbmRsZXIuaCIKICNpbmNs dWRlICJXZWJQYWdlUHJveHkuaCIKIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC00MiwyMSArNDMs NTAgQEAgdm9pZCBXZWJOb3RpZmljYXRpb25NYW5hZ2VyTWVzc2FnZUhhbmRsZXI6OnJlcXVlc3RT eXN0ZW1Ob3RpZmljYXRpb25QZXJtaXNzaW9uKGMKIAogdm9pZCBXZWJOb3RpZmljYXRpb25NYW5h Z2VyTWVzc2FnZUhhbmRsZXI6OnNob3dOb3RpZmljYXRpb24oSVBDOjpDb25uZWN0aW9uJiBjb25u ZWN0aW9uLCBjb25zdCBXZWJDb3JlOjpOb3RpZmljYXRpb25EYXRhJiBkYXRhKQogeworICAgIGlm ICghZGF0YS5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMLmlzRW1wdHkoKSkgeworICAgICAg ICBTZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlcjo6c2luZ2xldG9uKCkuc2hvd05vdGlm aWNhdGlvbihjb25uZWN0aW9uLCBkYXRhKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBt X3dlYlBhZ2VQcm94eS5zaG93Tm90aWZpY2F0aW9uKGNvbm5lY3Rpb24sIGRhdGEpOwogfQogCiB2 b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXJNZXNzYWdlSGFuZGxlcjo6Y2FuY2VsTm90aWZpY2F0 aW9uKGNvbnN0IFVVSUQmIG5vdGlmaWNhdGlvbklEKQogeworICAgIGF1dG8mIHNlcnZpY2VXb3Jr ZXJOb3RpZmljYXRpb25IYW5kbGVyID0gU2VydmljZVdvcmtlck5vdGlmaWNhdGlvbkhhbmRsZXI6 OnNpbmdsZXRvbigpOworICAgIGlmIChzZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlci5o YW5kbGVzTm90aWZpY2F0aW9uKG5vdGlmaWNhdGlvbklEKSkgeworICAgICAgICBzZXJ2aWNlV29y a2VyTm90aWZpY2F0aW9uSGFuZGxlci5jYW5jZWxOb3RpZmljYXRpb24obm90aWZpY2F0aW9uSUQp OworICAgICAgICByZXR1cm47CisgICAgfQogICAgIG1fd2ViUGFnZVByb3h5LmNhbmNlbE5vdGlm aWNhdGlvbihub3RpZmljYXRpb25JRCk7CiB9CiAKIHZvaWQgV2ViTm90aWZpY2F0aW9uTWFuYWdl ck1lc3NhZ2VIYW5kbGVyOjpjbGVhck5vdGlmaWNhdGlvbnMoY29uc3QgVmVjdG9yPFVVSUQ+JiBu b3RpZmljYXRpb25JRHMpCiB7Ci0gICAgbV93ZWJQYWdlUHJveHkuY2xlYXJOb3RpZmljYXRpb25z KG5vdGlmaWNhdGlvbklEcyk7CisgICAgYXV0byYgc2VydmljZVdvcmtlck5vdGlmaWNhdGlvbkhh bmRsZXIgPSBTZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlcjo6c2luZ2xldG9uKCk7CisK KyAgICBWZWN0b3I8VVVJRD4gcGVyc2lzdGVudE5vdGlmaWNhdGlvbnM7CisgICAgVmVjdG9yPFVV SUQ+IHBhZ2VOb3RpZmljYXRpb25zOworICAgIHBlcnNpc3RlbnROb3RpZmljYXRpb25zLnJlc2Vy dmVJbml0aWFsQ2FwYWNpdHkobm90aWZpY2F0aW9uSURzLnNpemUoKSk7CisgICAgcGFnZU5vdGlm aWNhdGlvbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShub3RpZmljYXRpb25JRHMuc2l6ZSgpKTsK KyAgICBmb3IgKGF1dG8mIG5vdGlmaWNhdGlvbklEIDogbm90aWZpY2F0aW9uSURzKSB7CisgICAg ICAgIGlmIChzZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlci5oYW5kbGVzTm90aWZpY2F0 aW9uKG5vdGlmaWNhdGlvbklEKSkKKyAgICAgICAgICAgIHBlcnNpc3RlbnROb3RpZmljYXRpb25z LnVuY2hlY2tlZEFwcGVuZChub3RpZmljYXRpb25JRCk7CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIHBhZ2VOb3RpZmljYXRpb25zLnVuY2hlY2tlZEFwcGVuZChub3RpZmljYXRpb25JRCk7Cisg ICAgfQorICAgIGlmICghcGVyc2lzdGVudE5vdGlmaWNhdGlvbnMuaXNFbXB0eSgpKQorICAgICAg ICBzZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlci5jbGVhck5vdGlmaWNhdGlvbnMocGVy c2lzdGVudE5vdGlmaWNhdGlvbnMpOworICAgIGlmICghcGFnZU5vdGlmaWNhdGlvbnMuaXNFbXB0 eSgpKQorICAgICAgICBtX3dlYlBhZ2VQcm94eS5jbGVhck5vdGlmaWNhdGlvbnMocGFnZU5vdGlm aWNhdGlvbnMpOwogfQogCiB2b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXJNZXNzYWdlSGFuZGxl cjo6ZGlkRGVzdHJveU5vdGlmaWNhdGlvbihjb25zdCBVVUlEJiBub3RpZmljYXRpb25JRCkKIHsK KyAgICBhdXRvJiBzZXJ2aWNlV29ya2VyTm90aWZpY2F0aW9uSGFuZGxlciA9IFNlcnZpY2VXb3Jr ZXJOb3RpZmljYXRpb25IYW5kbGVyOjpzaW5nbGV0b24oKTsKKyAgICBpZiAoc2VydmljZVdvcmtl ck5vdGlmaWNhdGlvbkhhbmRsZXIuaGFuZGxlc05vdGlmaWNhdGlvbihub3RpZmljYXRpb25JRCkp IHsKKyAgICAgICAgc2VydmljZVdvcmtlck5vdGlmaWNhdGlvbkhhbmRsZXIuZGlkRGVzdHJveU5v dGlmaWNhdGlvbihub3RpZmljYXRpb25JRCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAg bV93ZWJQYWdlUHJveHkuZGlkRGVzdHJveU5vdGlmaWNhdGlvbihub3RpZmljYXRpb25JRCk7CiB9 CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCBhOGQyM2Q0ZTVhMDU1Y2FmOTgyYjFlMDM0MGU1NjBmODlkMTM5MmI3Li5jMGVl ZDliZjdhMTk2OWU0ZTgzMzcwMjE1MzhiNWFkZmJkMDM3MDg5IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMjItMDMtMzEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAg ICAgIFBlcnNpc3RlbnQgbm90aWZpY2F0aW9ucyBzaG91bGQgd29yayBpbiBkb2N1bWVudCBzY29w ZXMgYXMgd2VsbCBhcyBzZXJ2aWNlIHdvcmtlciBnbG9iYWwgc2NvcGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg2MDEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvd29ya2Vycy9z ZXJ2aWNlL3Nob3dub3RpZmljYXRpb24tYWxsb3dlZC1kb2N1bWVudC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Nob3dub3RpZmljYXRp b24tYWxsb3dlZC1kb2N1bWVudC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0zMSAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZVdvcmtlclJlZ2lzdHJh dGlvbi5nZXROb3RpZmljYXRpb25zIHNob3VsZCBsaXN0IGFsbCBwZXJzaXN0ZW50IG5vdGlmaWNh dGlvbnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNl L3Nob3dub3RpZmljYXRpb24tYWxsb3dlZC1kb2N1bWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9zaG93bm90aWZpY2F0aW9uLWFsbG93ZWQt ZG9jdW1lbnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkwMThmY2ViZjY3MzJmNzg4MDNiMTkx NjVhZDNiZmZkNmQxYzc2ZGEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3dvcmtlcnMvc2VydmljZS9zaG93bm90aWZpY2F0aW9uLWFsbG93ZWQtZG9jdW1lbnQtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK1RoaXMgdGVzdHMgdGhhdCBhIG5vdGlmaWNhdGlv biBzaG93biBieSBhIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiBpbiBhIGRvY3VtZW50IGNh biBiZSBjbGlja2VkIGFuZCBjbG9zZWQsIHdpdGggdGhvc2UgYWN0aW9ucyBiZWluZyBvYnNlcnZh YmxlIGJ5IHRoZSBzZXJ2aWNlIHdvcmtlcgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz ZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisK KworUEFTUyBOb3RpZmljYXRpb24ucGVybWlzc2lvbiBpcyAiZ3JhbnRlZCIKK1BBU1MgZ290Q2xp Y2tlZCBpcyBmYWxzZQorUEFTUyBnb3RDbG9zZWQgaXMgZmFsc2UKK1BBU1MgZ290Q2xpY2tlZCBp cyB0cnVlCitQQVNTIGdvdENsb3NlZCBpcyBmYWxzZQorUEFTUyBDbG9zZSBoYXMgYmVlbiBvYnNl cnZlZAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2Vydmlj ZS9zaG93bm90aWZpY2F0aW9uLWFsbG93ZWQtZG9jdW1lbnQuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Nob3dub3RpZmljYXRpb24tYWxsb3dlZC1kb2N1bWVu dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjFmNDMyOGY0MDA1MTllMTYzODQ2OTJmODRlODA3ZTNiMjhlOTEw NDIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2Vy dmljZS9zaG93bm90aWZpY2F0aW9uLWFsbG93ZWQtZG9jdW1lbnQuaHRtbApAQCAtMCwwICsxLDc1 IEBACis8aGVhZD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL25vdGlmaWNhdGlvbnMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gZmFpbFRoZVRlc3QobXNnKQoreworICAg IHRlc3RGYWlsZWQobXNnKTsKKyAgICBpZiAodGVzdFJ1bm5lcikKKyAgICAgICAgdGVzdFJ1bm5l ci5ub3RpZnlEb25lKCk7Cit9CisKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgIHRlc3RS dW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIHRlc3RSdW5uZXIuZ3JhbnRXZWJOb3RpZmljYXRp b25QZXJtaXNzaW9uKHRlc3RVUkwpOworICAgIHNldFRpbWVvdXQoImZhaWxUaGVUZXN0KCd0aW1l ZCBvdXQnKSIsIDE1MDAwKTsKK30KKworZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBhIG5v dGlmaWNhdGlvbiBzaG93biBieSBhIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiBpbiBhIGRv Y3VtZW50IGNhbiBiZSBjbGlja2VkIGFuZCBjbG9zZWQsIHdpdGggdGhvc2UgYWN0aW9ucyBiZWlu ZyBvYnNlcnZhYmxlIGJ5IHRoZSBzZXJ2aWNlIHdvcmtlciIpOworCitzaG91bGRCZUVxdWFsVG9T dHJpbmcoIk5vdGlmaWNhdGlvbi5wZXJtaXNzaW9uIiwgImdyYW50ZWQiKTsKKworYXN5bmMgZnVu Y3Rpb24gcmVnaXN0ZXJTZXJ2aWNlV29ya2VyKCkgeworICAgIHZhciByZWdpc3RyYXRpb24gPSBh d2FpdCBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdpc3RlcigncmVzb3VyY2VzL3Nob3dub3Rp ZmljYXRpb24td29ya2VyLmpzJyk7CisKKyAgICBpZiAoIXJlZ2lzdHJhdGlvbikKKyAgICAgICAg cmV0dXJuIHRlc3RGYWlsZWQoIk5vIHJlZ2lzdHJhdGlvbiIpOworCisgICAgaWYgKHJlZ2lzdHJh dGlvbi5hY3RpdmUpIHsKKyAgICAgICAgcmVnaXN0cmF0aW9uLmFjdGl2ZS5wb3N0TWVzc2FnZSgi U3RhcnQiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHZhciBpbnN0YWxsaW5nV29y a2VyID0gcmVnaXN0cmF0aW9uLmluc3RhbGxpbmc7CisgICAgaWYgKCFpbnN0YWxsaW5nV29ya2Vy KQorICAgICAgICBmYWlsVGhlVGVzdCgiTm8gYWN0aXZlICpvciogaW5zdGFsbGluZyB3b3JrZXIi KTsKKworICAgIGluc3RhbGxpbmdXb3JrZXIuYWRkRXZlbnRMaXN0ZW5lcigic3RhdGVjaGFuZ2Ui LCBhc3luYyAoKSA9PiB7CisgICAgICAgIGlmIChpbnN0YWxsaW5nV29ya2VyLnN0YXRlID09PSAi YWN0aXZhdGVkIikgeworICAgICAgICAgICAgYXdhaXQgcmVnaXN0cmF0aW9uLnNob3dOb3RpZmlj YXRpb24oIlRoaXMgaXMgYSBub3RpZmljYXRpb24iLCB7IGJvZHk6ICJib2R5IiwgdGFnOiAidGFn IiB9KTsKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAg ICB0ZXN0UnVubmVyLnNpbXVsYXRlV2ViTm90aWZpY2F0aW9uQ2xpY2tGb3JTZXJ2aWNlV29ya2Vy Tm90aWZpY2F0aW9ucygpOworICAgICAgICB9CisgICAgfSk7Cit9CisKK3ZhciBnb3RDbGlja2Vk ID0gZmFsc2U7Cit2YXIgZ290Q2xvc2VkID0gZmFsc2U7CisKK25hdmlnYXRvci5zZXJ2aWNlV29y a2VyLmFkZEV2ZW50TGlzdGVuZXIoJ21lc3NhZ2UnLCBhc3luYyBldmVudCA9PiB7CisgICAgaWYg KGV2ZW50LmRhdGEgPT0gInNob3dGYWlsZWQiKSB7CisgICAgICAgIGZhaWxUaGVUZXN0KCJVbmV4 cGVjdGVkbHkgcmVjZWl2ZWQgdGhlIGZhaWxlZC10by1zaG93IG1lc3NhZ2UiKTsKKyAgICB9IGVs c2UgaWYgKGV2ZW50LmRhdGEgPT0gImNsaWNrZWQiKSB7CisgICAgICAgIHNob3VsZEJlRmFsc2Uo ImdvdENsaWNrZWQiKTsKKyAgICAgICAgc2hvdWxkQmVGYWxzZSgiZ290Q2xvc2VkIik7CisgICAg ICAgIGdvdENsaWNrZWQgPSB0cnVlOworICAgIH0gZWxzZSBpZiAoZXZlbnQuZGF0YSA9PSAiY2xv c2VkIikgeworICAgICAgICBzaG91bGRCZVRydWUoImdvdENsaWNrZWQiKQorICAgICAgICBzaG91 bGRCZUZhbHNlKCJnb3RDbG9zZWQiKQorICAgICAgICBnb3RDbG9zZWQgPSB0cnVlOworICAgIH0g ZWxzZSB7CisgICAgICAgIHRlc3RGYWlsZWQoIk1lc3NhZ2UgcmVjZWl2ZWQ6ICIgKyBldmVudC5k YXRhKTsKKyAgICB9CisKKyAgICBpZiAoZ290Q2xvc2VkKSB7CisgICAgICAgIHRlc3RQYXNzZWQo IkNsb3NlIGhhcyBiZWVuIG9ic2VydmVkIik7CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5l cikKKyAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgIH0KK30pOworCis8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icmVnaXN0ZXJTZXJ2aWNlV29ya2VyKCki PgorPC9ib2R5Pgo=