237981 2022-03-16 14:34:47 -0700 Disable push features in CaptivePortal mode 2022-03-17 14:30:14 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham cdumez webkit-bug-importer oldest_to_newest 1851992 0 bfulgham 2022-03-16 14:34:47 -0700 We should not support push features when running in a Captive Portal. <rdar://88897228> 1852003 1 454897 bfulgham 2022-03-16 14:51:16 -0700 Created attachment 454897 Patch 1852467 2 455020 bfulgham 2022-03-17 13:49:37 -0700 Created attachment 455020 Patch for landing 1852490 3 ews-feeder 2022-03-17 14:30:09 -0700 Committed r291443 (248567@main): <https://commits.webkit.org/248567@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455020. 454897 2022-03-16 14:51:16 -0700 2022-03-17 13:49:35 -0700 Patch bug-237981-20220316145115.patch text/plain 3649 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGMxNzRiMmZkOGI5YmRkNmUw ODU1MDNjMDY0NTRhZTI1MGI0Y2RhOTguLjZkZTYyMmNiYjZjOWQxNzA3ZTkzYzNlODBhMzk0NWYz NWMwODkzOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDMtMTYgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzYWJsZSBwdXNoIGZlYXR1 cmVzIGluIENhcHRpdmVQb3J0YWwgbW9kZSAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNzk4MQorICAgICAgICA8cmRhcjovLzg4ODk3MjI4PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHNob3VsZCBu b3Qgc3VwcG9ydCBwdXNoIGZlYXR1cmVzIHdoZW4gcnVubmluZyBpbiBhIENhcHRpdmUgUG9ydGFs LgorCisgICAgICAgIFRlc3RzOiBUZXN0V2ViS2l0QVBJCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVBy ZWZlcmVuY2VzKToKKwogMjAyMi0wMy0xNiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWpp aUBzb255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dW1dlYkdMXSBDcmFzaCBpbiBXZWJLaXQ6 OldDQ29udGVudEJ1ZmZlcjo6cGxhdGZvcm1MYXllcldpbGxCZURlc3Ryb3llZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGViNDhjN2IyZDEz ODM5MmFiYmYxNDExOGY4ZTI1M2MwYWU5ZjRlMjIuLmI4YTU2YWIxMTYyZDZlZDg5MWRjOTRmMzMx NzliNDMxYTE4ZTBlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC00MDk2LDYgKzQwOTYsOSBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZl cmVuY2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogI2lmIEVOQUJMRShOT1RJ RklDQVRJT05TKQogICAgICAgICBzZXR0aW5ncy5zZXROb3RpZmljYXRpb25zRW5hYmxlZChmYWxz ZSk7CiAjZW5kaWYKKyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgICAgIHNldHRpbmdz LnNldFB1c2hBUElFbmFibGVkKGZhbHNlKTsKKyNlbmRpZgogI2lmIEVOQUJMRShXRUJYUikKICAg ICAgICAgc2V0dGluZ3Muc2V0V2ViWFJFbmFibGVkKGZhbHNlKTsKICAgICAgICAgc2V0dGluZ3Mu c2V0V2ViWFJBdWdtZW50ZWRSZWFsaXR5TW9kdWxlRW5hYmxlZChmYWxzZSk7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDljMDNmMTAwZjMwYzM2 M2YzYTYwZmVjYWMzOGRmZDdlMDk5ZWI2MC4uODg4M2EzZDk4MjE0NGQxZjY5YzNhODEwOGM4MWIy YmM2YjkzMGQ0NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdo YW1AYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgcHVzaCBmZWF0dXJlcyBpbiBDYXB0aXZl UG9ydGFsIG1vZGUgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzc5ODEKKyAgICAgICAgPHJkYXI6Ly84ODg5NzIyOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBzaG91bGQgbm90IHN1cHBvcnQgcHVz aCBmZWF0dXJlcyB3aGVuIHJ1bm5pbmcgaW4gYSBDYXB0aXZlIFBvcnRhbC4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24u bW06CisKIDIwMjItMDMtMTUgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgog CiAgICAgICAgIFtNZXJnZS1RdWV1ZV0gUmVuYW1lIHBhdGNoX3Jldmlld2VyCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNz U3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBmYThmNjU3NWI2ODgwOTFmZmJhY2NkYzNkNTBjN2My ZmQzYjBlYzc4Li5iZTMxNTAwNGViMWRiM2RhY2I3MWIyMjVkMjAwY2I3YzEzNGFlZDg3IDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2Fw T25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTc4MzIsNiArNzgzMiw5IEBAIHN0YXRp YyB2b2lkIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZShXS1dlYlZp ZXcgKndlYlZpZXcsIFNob3VsCiAgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhbmF2aWdhdG9y LmdldFVzZXJNZWRpYSJfcyksIGZhbHNlKTsgLy8gTGVnYWN5IEdldFVzZXJNZWRpYSAoY3VycmVu dGx5IGFsd2F5cyBkaXNhYmxlZCkuCiAgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhd2luZG93 Lk1hdGhNTEVsZW1lbnQiX3MpLCBzaG91bGRCZUVuYWJsZWQgPT0gU2hvdWxkQmVFbmFibGVkOjpZ ZXMpOyAvLyBNYXRoTUwuCiAgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhd2luZG93Lk1hdGhN TE1hdGhFbGVtZW50Il9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVz KTsgLy8gTWF0aE1MLgorICAgIEVYUEVDVF9FUShydW5KU0NoZWNrKCIhIXdpbmRvdy5QdXNoTWFu YWdlciJfcyksIHNob3VsZEJlRW5hYmxlZCA9PSBTaG91bGRCZUVuYWJsZWQ6Olllcyk7IC8vIFB1 c2ggQVBJLgorICAgIEVYUEVDVF9FUShydW5KU0NoZWNrKCIhIXdpbmRvdy5QdXNoU3Vic2NyaXB0 aW9uIl9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gUHVz aCBBUEkuCisgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhd2luZG93LlB1c2hTdWJzY3JpcHRp b25PcHRpb25zIl9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsg Ly8gUHVzaCBBUEkuCiAgICAgU3RyaW5nIG1hdGhNTENoZWNrID0gbWFrZVN0cmluZygiZG9jdW1l bnQuY3JlYXRlRWxlbWVudE5TKCdodHRwOi8vd3d3LnczLm9yZy8xOTk4L01hdGgvTWF0aE1MJywn bXNwYWNlJykuX19wcm90b19fID09ICIsIHNob3VsZEJlRW5hYmxlZCA9PSBTaG91bGRCZUVuYWJs ZWQ6OlllcyA/ICJNYXRoTUxFbGVtZW50IiA6ICJFbGVtZW50IiwgIi5wcm90b3R5cGUiKTsKICAg ICBFWFBFQ1RfRVEocnVuSlNDaGVjayhtYXRoTUxDaGVjayksIHRydWUpOyAvLyBNYXRoTUwuCiB9 Cg== 455020 2022-03-17 13:49:37 -0700 2022-03-17 14:30:12 -0700 Patch for landing bug-237981-20220317134936.patch text/plain 7720 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGMxNzRiMmZkOGI5YmRkNmUw ODU1MDNjMDY0NTRhZTI1MGI0Y2RhOTguLmQ3NDk0Y2ZlYWNlYmM2NGMzZjUyNzhiM2ZiNzk2YzA0 MWQzMjMxYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDMtMTcgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRGlzYWJsZSBwdXNoIGZlYXR1 cmVzIGluIENhcHRpdmVQb3J0YWwgbW9kZSAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNzk4MQorICAgICAgICA8cmRhcjovLzg4ODk3MjI4PgorCisg ICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFdlIHNob3VsZCBub3Qg c3VwcG9ydCBwdXNoIGZlYXR1cmVzIHdoZW4gcnVubmluZyBpbiBhIENhcHRpdmUgUG9ydGFsLgor CisgICAgICAgIFRlc3RzOiBUZXN0V2ViS2l0QVBJCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZl cmVuY2VzKToKKwogMjAyMi0wMy0xNiAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dW1dlYkdMXSBDcmFzaCBpbiBXZWJLaXQ6OldD Q29udGVudEJ1ZmZlcjo6cGxhdGZvcm1MYXllcldpbGxCZURlc3Ryb3llZCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGViNDhjN2IyZDEzODM5 MmFiYmYxNDExOGY4ZTI1M2MwYWU5ZjRlMjIuLmI4YTU2YWIxMTYyZDZlZDg5MWRjOTRmMzMxNzli NDMxYTE4ZTBlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCkBAIC00MDk2LDYgKzQwOTYsOSBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZlcmVu Y2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmIHN0b3JlKQogI2lmIEVOQUJMRShOT1RJRklD QVRJT05TKQogICAgICAgICBzZXR0aW5ncy5zZXROb3RpZmljYXRpb25zRW5hYmxlZChmYWxzZSk7 CiAjZW5kaWYKKyNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCisgICAgICAgIHNldHRpbmdzLnNl dFB1c2hBUElFbmFibGVkKGZhbHNlKTsKKyNlbmRpZgogI2lmIEVOQUJMRShXRUJYUikKICAgICAg ICAgc2V0dGluZ3Muc2V0V2ViWFJFbmFibGVkKGZhbHNlKTsKICAgICAgICAgc2V0dGluZ3Muc2V0 V2ViWFJBdWdtZW50ZWRSZWFsaXR5TW9kdWxlRW5hYmxlZChmYWxzZSk7CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDljMDNmMTAwZjMwYzM2M2Yz YTYwZmVjYWMzOGRmZDdlMDk5ZWI2MC4uZjZlYzEwMWFhMzY0NWU2ZDQxMzMyMzZmMmRjMjg0ZGZk MmNlYjk2MCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTE3ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUgcHVzaCBmZWF0dXJlcyBpbiBDYXB0aXZlUG9y dGFsIG1vZGUgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzc5ODEKKyAgICAgICAgPHJkYXI6Ly84ODg5NzIyOD4KKworICAgICAgICBSZXZpZXdlZCBi eSBDaHJpcyBEdW1lei4KKworICAgICAgICBXZSBzaG91bGQgbm90IHN1cHBvcnQgcHVzaCBmZWF0 dXJlcyB3aGVuIHJ1bm5pbmcgaW4gYSBDYXB0aXZlIFBvcnRhbC4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisK IDIwMjItMDMtMTUgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAg ICAgIFtNZXJnZS1RdWV1ZV0gUmVuYW1lIHBhdGNoX3Jldmlld2VyCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9u Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9u TmF2aWdhdGlvbi5tbQppbmRleCBmYThmNjU3NWI2ODgwOTFmZmJhY2NkYzNkNTBjN2MyZmQzYjBl Yzc4Li42MTExMWYyNGUxODBlMDFiNGY4YjM2YWQ4OWYwY2YwYzU2MzEwY2Q3IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJv Y2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTc4MzIsNiArNzgzMiw5IEBAIHN0YXRpYyB2b2lk IGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZShXS1dlYlZpZXcgKndl YlZpZXcsIFNob3VsCiAgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhbmF2aWdhdG9yLmdldFVz ZXJNZWRpYSJfcyksIGZhbHNlKTsgLy8gTGVnYWN5IEdldFVzZXJNZWRpYSAoY3VycmVudGx5IGFs d2F5cyBkaXNhYmxlZCkuCiAgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhd2luZG93Lk1hdGhN TEVsZW1lbnQiX3MpLCBzaG91bGRCZUVuYWJsZWQgPT0gU2hvdWxkQmVFbmFibGVkOjpZZXMpOyAv LyBNYXRoTUwuCiAgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhd2luZG93Lk1hdGhNTE1hdGhF bGVtZW50Il9zKSwgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8g TWF0aE1MLgorICAgIEVYUEVDVF9FUShydW5KU0NoZWNrKCIhIXdpbmRvdy5QdXNoTWFuYWdlciJf cyksIGlzU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50ICE9IElzU2hvd2luZ0luaXRpYWxFbXB0 eURvY3VtZW50OjpZZXMgJiYgc2hvdWxkQmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVz KTsgLy8gUHVzaCBBUEkuCisgICAgRVhQRUNUX0VRKHJ1bkpTQ2hlY2soIiEhd2luZG93LlB1c2hT dWJzY3JpcHRpb24iX3MpLCBpc1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudCAhPSBJc1Nob3dp bmdJbml0aWFsRW1wdHlEb2N1bWVudDo6WWVzICYmIHNob3VsZEJlRW5hYmxlZCA9PSBTaG91bGRC ZUVuYWJsZWQ6Olllcyk7IC8vIFB1c2ggQVBJLgorICAgIEVYUEVDVF9FUShydW5KU0NoZWNrKCIh IXdpbmRvdy5QdXNoU3Vic2NyaXB0aW9uT3B0aW9ucyJfcyksIGlzU2hvd2luZ0luaXRpYWxFbXB0 eURvY3VtZW50ICE9IElzU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50OjpZZXMgJiYgc2hvdWxk QmVFbmFibGVkID09IFNob3VsZEJlRW5hYmxlZDo6WWVzKTsgLy8gUHVzaCBBUEkuCiAgICAgU3Ry aW5nIG1hdGhNTENoZWNrID0gbWFrZVN0cmluZygiZG9jdW1lbnQuY3JlYXRlRWxlbWVudE5TKCdo dHRwOi8vd3d3LnczLm9yZy8xOTk4L01hdGgvTWF0aE1MJywnbXNwYWNlJykuX19wcm90b19fID09 ICIsIHNob3VsZEJlRW5hYmxlZCA9PSBTaG91bGRCZUVuYWJsZWQ6OlllcyA/ICJNYXRoTUxFbGVt ZW50IiA6ICJFbGVtZW50IiwgIi5wcm90b3R5cGUiKTsKICAgICBFWFBFQ1RfRVEocnVuSlNDaGVj ayhtYXRoTUxDaGVjayksIHRydWUpOyAvLyBNYXRoTUwuCiB9CkBAIC03ODQ5LDE0ICs3ODUyLDI2 IEBAIHN0YXRpYyB2b2lkIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9k ZShXS1dlYlZpZXcgKndlYlZpZXcsIFNob3VsCiAKIEBlbmQKIAordm9pZCBjb25maWd1cmVDYXB0 aXZlUG9ydGFsV0tXZWJWaWV3Q29uZmlndXJhdGlvbihXS1dlYlZpZXdDb25maWd1cmF0aW9uICpj b25maWcpCit7CisgICAgW2NvbmZpZy5wcmVmZXJlbmNlcyBfc2V0TWVkaWFEZXZpY2VzRW5hYmxl ZDpZRVNdOworICAgIGNvbmZpZy5wcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1 cmVDb25uZWN0aW9uID0gTk87CisgICAgW2NvbmZpZy5wcmVmZXJlbmNlcyBfc2V0Tm90aWZpY2F0 aW9uc0VuYWJsZWQ6WUVTXTsKKworICAgIGZvciAoX1dLRXhwZXJpbWVudGFsRmVhdHVyZSAqZmVh dHVyZSBpbiBbV0tQcmVmZXJlbmNlcyBfZXhwZXJpbWVudGFsRmVhdHVyZXNdKSB7CisgICAgICAg IGlmIChbZmVhdHVyZS5rZXkgaXNFcXVhbFRvU3RyaW5nOkAiUHVzaEFQSUVuYWJsZWQiXSkgewor ICAgICAgICAgICAgW2NvbmZpZy5wcmVmZXJlbmNlcyBfc2V0RW5hYmxlZDpZRVMgZm9yRmVhdHVy ZTpmZWF0dXJlXTsKKyAgICAgICAgfQorICAgIH0KK30KKwogVEVTVChQcm9jZXNzU3dhcCwgTmF2 aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiB7CiAgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9 IGFkb3B0TlMoW1tDYXB0aXZlUG9ydGFsTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKIAog ICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1 cmF0aW9uIG5ld10pOwogICAgIEVYUEVDVF9GQUxTRSh3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQo KS5kZWZhdWx0V2VicGFnZVByZWZlcmVuY2VzLl9jYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOwot ICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKS5wcmVmZXJlbmNlcyBfc2V0TWVkaWFEZXZp Y2VzRW5hYmxlZDpZRVNdOwotICAgIHdlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpLnByZWZlcmVu Y2VzLl9tZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5lY3Rpb24gPSBOTzsKKyAgICBjb25m aWd1cmVDYXB0aXZlUG9ydGFsV0tXZWJWaWV3Q29uZmlndXJhdGlvbih3ZWJWaWV3Q29uZmlndXJh dGlvbi5nZXQoKSk7CiAgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpLnVzZXJDb250ZW50 Q29udHJvbGxlciBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxlci5nZXQoKSBu YW1lOkAidGVzdEhhbmRsZXIiXTsKIAogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dl YlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29u ZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOwpAQCAtNzk4Niw5ICs4MDAx LDggQEAgVEVTVChQcm9jZXNzU3dhcCwgQ2Fubm90RGlzYWJsZUNhcHRpdmVQb3J0YWxNb2RlV2l0 aG91dEJyb3dzZXJFbnRpdGxlbWVudCkKIHsKICAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9u ID0gYWRvcHROUyhbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBuZXddKTsKICAgICBFWFBFQ1RfRkFM U0Uod2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkuZGVmYXVsdFdlYnBhZ2VQcmVmZXJlbmNlcy5f Y2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKKyAgICBjb25maWd1cmVDYXB0aXZlUG9ydGFsV0tX ZWJWaWV3Q29uZmlndXJhdGlvbih3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKSk7CiAgICAgW3dl YlZpZXdDb25maWd1cmF0aW9uLmdldCgpLmRlZmF1bHRXZWJwYWdlUHJlZmVyZW5jZXMgX3NldENh cHRpdmVQb3J0YWxNb2RlRW5hYmxlZDpZRVNdOwotICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbi5n ZXQoKS5wcmVmZXJlbmNlcyBfc2V0TWVkaWFEZXZpY2VzRW5hYmxlZDpZRVNdOwotICAgIHdlYlZp ZXdDb25maWd1cmF0aW9uLmdldCgpLnByZWZlcmVuY2VzLl9tZWRpYUNhcHR1cmVSZXF1aXJlc1Nl Y3VyZUNvbm5lY3Rpb24gPSBOTzsKIAogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dl YlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29u ZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIGF1dG8gZGVsZWdh dGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwpAQCAtODAzMSw5ICs4 MDQ1LDggQEAgVEVTVChQcm9jZXNzU3dhcCwgQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkQnlEZWZh dWx0VGhlbk9wdE91dCkKIHsKICAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHRO UyhbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBuZXddKTsKICAgICBFWFBFQ1RfRkFMU0Uod2ViVmll d0NvbmZpZ3VyYXRpb24uZ2V0KCkuZGVmYXVsdFdlYnBhZ2VQcmVmZXJlbmNlcy5fY2FwdGl2ZVBv cnRhbE1vZGVFbmFibGVkKTsKKyAgICBjb25maWd1cmVDYXB0aXZlUG9ydGFsV0tXZWJWaWV3Q29u ZmlndXJhdGlvbih3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKSk7CiAgICAgW3dlYlZpZXdDb25m aWd1cmF0aW9uLmdldCgpLmRlZmF1bHRXZWJwYWdlUHJlZmVyZW5jZXMgX3NldENhcHRpdmVQb3J0 YWxNb2RlRW5hYmxlZDpZRVNdOwotICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKS5wcmVm ZXJlbmNlcyBfc2V0TWVkaWFEZXZpY2VzRW5hYmxlZDpZRVNdOwotICAgIHdlYlZpZXdDb25maWd1 cmF0aW9uLmdldCgpLnByZWZlcmVuY2VzLl9tZWRpYUNhcHR1cmVSZXF1aXJlc1NlY3VyZUNvbm5l Y3Rpb24gPSBOTzsKIAogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlv bjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9w dE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwpAQCAtODA4OCw4ICs4MTAxLDggQEAg VEVTVChQcm9jZXNzU3dhcCwgQ2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkQnlEZWZhdWx0VGhlbk9w dE91dCkKIAogICAgIC8vIGNhcHRpdmUgcG9ydGFsIG1vZGUgc2hvdWxkIGJlIGRpc2FibGVkIGlu IG5ldyBXZWJWaWV3cyBzaW5jZSBpdCBpcyBub3QgZW5hYmxlZCBnbG9iYWxseS4KICAgICBhdXRv IHdlYlZpZXdDb25maWd1cmF0aW9uMiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g bmV3XSk7Ci0gICAgW3dlYlZpZXdDb25maWd1cmF0aW9uMi5nZXQoKS5wcmVmZXJlbmNlcyBfc2V0 TWVkaWFEZXZpY2VzRW5hYmxlZDpZRVNdOwotICAgIHdlYlZpZXdDb25maWd1cmF0aW9uMi5nZXQo KS5wcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1cmVDb25uZWN0aW9uID0gTk87 CisgICAgY29uZmlndXJlQ2FwdGl2ZVBvcnRhbFdLV2ViVmlld0NvbmZpZ3VyYXRpb24od2ViVmll d0NvbmZpZ3VyYXRpb24yLmdldCgpKTsKKyAgICBFWFBFQ1RfVFJVRShbd2ViVmlld0NvbmZpZ3Vy YXRpb24yLmdldCgpLmRlZmF1bHRXZWJwYWdlUHJlZmVyZW5jZXMgX2NhcHRpdmVQb3J0YWxNb2Rl RW5hYmxlZF0gPT0gTk8pOwogICAgIGF1dG8gd2ViVmlldzIgPSBhZG9wdE5TKFtbV0tXZWJWaWV3 IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3Vy YXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24yLmdldCgpXSk7CiAgICAgW3dlYlZpZXcyIHNldE5h dmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAgICAgRVhQRUNUX1RSVUUoaXNKSVRF bmFibGVkKHdlYlZpZXcyLmdldCgpKSk7Cg==