234372 2021-12-15 16:21:07 -0800 Some webpushtool improvements 2021-12-15 20:35:19 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson achristensen nham thorton webkit-bug-importer oldest_to_newest 1824574 0 beidson 2021-12-15 16:21:07 -0800 Some webpushtool improvements 1824643 1 447311 beidson 2021-12-15 18:55:23 -0800 Created attachment 447311 Patch v1 1824648 2 447311 achristensen 2021-12-15 19:05:58 -0800 Comment on attachment 447311 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=447311&action=review > Source/WebKit/webpushd/webpushtool/WebPushToolConnection.mm:153 > + CFRunLoopStop(CFRunLoopGetMain()); exit(0)? 1824658 3 beidson 2021-12-15 19:32:51 -0800 (In reply to Alex Christensen from comment #2) > Comment on attachment 447311 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=447311&action=review > > > Source/WebKit/webpushd/webpushtool/WebPushToolConnection.mm:153 > > + CFRunLoopStop(CFRunLoopGetMain()); > > exit(0)? I have future vision for the next enhancement that'll involve a nested runloop 😆 1824678 4 ews-feeder 2021-12-15 20:34:48 -0800 Committed r287125 (245309@main): <https://commits.webkit.org/245309@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447311. 1824679 5 webkit-bug-importer 2021-12-15 20:35:19 -0800 <rdar://problem/86556476> 447311 2021-12-15 18:55:23 -0800 2021-12-15 20:34:51 -0800 Patch v1 patch text/plain 7359 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggM2M0MzQyMzMyOTA1Li4zMGU5ZWExYWNhODMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjkgQEAKKzIwMjEtMTItMTUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgor CisgICAgICAgIFNvbWUgd2VicHVzaHRvb2wgaW1wcm92ZW1lbnRzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MzcyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBNYWtlIHRoZSBsaXN0IG9mIGN1cnJl bnQgY29ubmVjdGlvbnMgYmUgcmVsaWFibHkgb3JkZXJlZAorICAgICAgICAtIElmIHRoZSBpbnZv Y2F0aW9uIGlzIHNvbGVseSBhYm91dCBpbmplY3RpbmcgYSBwdXNoIG1lc3NhZ2UsIGV4aXQgYWZ0 ZXJ3YXJkcworICAgICAgICAtIFNvbWUgb3RoZXIgdGlueSBuaWNldGllcworCisgICAgICAgICog d2VicHVzaGQvV2ViUHVzaERhZW1vbi5tbToKKyAgICAgICAgKFdlYlB1c2hEOjpEYWVtb246OmJy b2FkY2FzdEFsbENvbm5lY3Rpb25JZGVudGl0aWVzKToKKyAgICAgICAgKFdlYlB1c2hEOjpEYWVt b246OmluamVjdFB1c2hNZXNzYWdlRm9yVGVzdGluZyk6CisKKyAgICAgICAgKiB3ZWJwdXNoZC93 ZWJwdXNodG9vbC9XZWJQdXNoVG9vbENvbm5lY3Rpb24uaDoKKyAgICAgICAgKiB3ZWJwdXNoZC93 ZWJwdXNodG9vbC9XZWJQdXNoVG9vbENvbm5lY3Rpb24ubW06CisgICAgICAgIChXZWJQdXNoVG9v bDo6Q29ubmVjdGlvbjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYlB1c2hUb29sOjpDb25uZWN0aW9u OjpDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYlB1c2hUb29sOjpDb25uZWN0aW9uOjpjb25uZWN0 VG9TZXJ2aWNlKToKKyAgICAgICAgKFdlYlB1c2hUb29sOjpDb25uZWN0aW9uOjpzdGFydEFjdGlv bik6CisgICAgICAgIChXZWJQdXNoVG9vbDo6Q29ubmVjdGlvbjo6c2VuZFB1c2hNZXNzYWdlKToK KworICAgICAgICAqIHdlYnB1c2hkL3dlYnB1c2h0b29sL1dlYlB1c2hUb29sTWFpbi5tbToKKyAg ICAgICAgKG1haW4pOgorCiAyMDIxLTEyLTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIFByb3h5U2VydmVyCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW0gYi9Tb3VyY2UvV2ViS2l0 L3dlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW0KaW5kZXggZDliNmVmZmMzZGI4Li5mMzEyMjdlOTVj YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvV2ViUHVzaERhZW1vbi5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hkL1dlYlB1c2hEYWVtb24ubW0KQEAgLTE4OCw4ICsx ODgsMTQgQEAgdm9pZCBEYWVtb246OmJyb2FkY2FzdERlYnVnTWVzc2FnZShKU0M6Ok1lc3NhZ2VM ZXZlbCBtZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYKIHZvaWQgRGFlbW9uOjpicm9hZGNhc3RB bGxDb25uZWN0aW9uSWRlbnRpdGllcygpCiB7CiAgICAgYnJvYWRjYXN0RGVidWdNZXNzYWdlKChK U0M6Ok1lc3NhZ2VMZXZlbCk0LCAiPT09XG5DdXJyZW50IGNvbm5lY3Rpb25zOiIpOwotICAgIGZv ciAoYXV0byYgaXRlcmF0b3IgOiBtX2Nvbm5lY3Rpb25NYXApCi0gICAgICAgIGl0ZXJhdG9yLnZh bHVlLT5icm9hZGNhc3REZWJ1Z01lc3NhZ2UoIiIpOworCisgICAgYXV0byBjb25uZWN0aW9ucyA9 IGNvcHlUb1ZlY3RvcihtX2Nvbm5lY3Rpb25NYXAudmFsdWVzKCkpOworICAgIHN0ZDo6c29ydChj b25uZWN0aW9ucy5iZWdpbigpLCBjb25uZWN0aW9ucy5lbmQoKSwgW10gKGNvbnN0IFJlZjxDbGll bnRDb25uZWN0aW9uPiYgYSwgY29uc3QgUmVmPENsaWVudENvbm5lY3Rpb24+JiBiKSB7CisgICAg ICAgIHJldHVybiBhLT5pZGVudGlmaWVyKCkgPCBiLT5pZGVudGlmaWVyKCk7CisgICAgfSk7CisK KyAgICBmb3IgKGF1dG8mIGl0ZXJhdG9yIDogY29ubmVjdGlvbnMpCisgICAgICAgIGl0ZXJhdG9y LT5icm9hZGNhc3REZWJ1Z01lc3NhZ2UoIiIpOwogICAgIGJyb2FkY2FzdERlYnVnTWVzc2FnZSgo SlNDOjpNZXNzYWdlTGV2ZWwpNCwgIj09PSIpOwogfQogCkBAIC0zNTAsNyArMzU2LDcgQEAgdm9p ZCBEYWVtb246OmluamVjdFB1c2hNZXNzYWdlRm9yVGVzdGluZyhDbGllbnRDb25uZWN0aW9uKiBj b25uZWN0aW9uLCBjb25zdCBQdXMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNvbm5l Y3Rpb24tPmJyb2FkY2FzdERlYnVnTWVzc2FnZShtYWtlU3RyaW5nKCJJbmplY3RlZCBhIHRlc3Qg cHVzaCBtZXNzYXNnZSBmb3IgIiwgbWVzc2FnZS50YXJnZXRBcHBDb2RlU2lnbmluZ0lkZW50aWZp ZXIsICIgYXQgIiwgbWVzc2FnZS5yZWdpc3RyYXRpb25VUkwuc3RyaW5nKCkpKTsKKyAgICBjb25u ZWN0aW9uLT5icm9hZGNhc3REZWJ1Z01lc3NhZ2UobWFrZVN0cmluZygiSW5qZWN0ZWQgYSB0ZXN0 IHB1c2ggbWVzc2FnZSBmb3IgIiwgbWVzc2FnZS50YXJnZXRBcHBDb2RlU2lnbmluZ0lkZW50aWZp ZXIsICIgYXQgIiwgbWVzc2FnZS5yZWdpc3RyYXRpb25VUkwuc3RyaW5nKCkpKTsKICAgICBjb25u ZWN0aW9uLT5icm9hZGNhc3REZWJ1Z01lc3NhZ2UobWVzc2FnZS5tZXNzYWdlKTsKIAogICAgIGF1 dG8gYWRkUmVzdWx0ID0gbV90ZXN0aW5nUHVzaE1lc3NhZ2VzLmVuc3VyZShtZXNzYWdlLnRhcmdl dEFwcENvZGVTaWduaW5nSWRlbnRpZmllciwgW10gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC93ZWJwdXNoZC93ZWJwdXNodG9vbC9XZWJQdXNoVG9vbENvbm5lY3Rpb24uaCBiL1NvdXJjZS9X ZWJLaXQvd2VicHVzaGQvd2VicHVzaHRvb2wvV2ViUHVzaFRvb2xDb25uZWN0aW9uLmgKaW5kZXgg MjRmNDI1Y2UwNWQwLi4zMDZmZDNiMWE2YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2Vi cHVzaGQvd2VicHVzaHRvb2wvV2ViUHVzaFRvb2xDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dl YktpdC93ZWJwdXNoZC93ZWJwdXNodG9vbC9XZWJQdXNoVG9vbENvbm5lY3Rpb24uaApAQCAtNTgs OCArNTgsOCBAQCBlbnVtIGNsYXNzIFdhaXRGb3JTZXJ2aWNlVG9FeGlzdCA6IGJvb2wgewogY2xh c3MgQ29ubmVjdGlvbiA6IHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxDb25uZWN0aW9uPiB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RhdGljIHN0ZDo6dW5pcXVl X3B0cjxDb25uZWN0aW9uPiBjcmVhdGUoQWN0aW9uLCBQcmVmZXJUZXN0U2VydmljZSwgUmVjb25u ZWN0KTsKLSAgICBDb25uZWN0aW9uKEFjdGlvbiwgUHJlZmVyVGVzdFNlcnZpY2UsIFJlY29ubmVj dCk7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxDb25uZWN0aW9uPiBjcmVhdGUoc3RkOjpv cHRpb25hbDxBY3Rpb24+LCBQcmVmZXJUZXN0U2VydmljZSwgUmVjb25uZWN0KTsKKyAgICBDb25u ZWN0aW9uKHN0ZDo6b3B0aW9uYWw8QWN0aW9uPiwgUHJlZmVyVGVzdFNlcnZpY2UsIFJlY29ubmVj dCk7CiAKICAgICB2b2lkIGNvbm5lY3RUb1NlcnZpY2UoV2FpdEZvclNlcnZpY2VUb0V4aXN0KTsK IApAQCAtNzUsNyArNzUsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZW5kQXVkaXRUb2tlbigp OwogCi0gICAgQWN0aW9uIG1fYWN0aW9uOworICAgIHN0ZDo6b3B0aW9uYWw8QWN0aW9uPiBtX2Fj dGlvbjsKICAgICBib29sIG1fcmVjb25uZWN0IHsgZmFsc2UgfTsKICAgICBSZXRhaW5QdHI8eHBj X2Nvbm5lY3Rpb25fdD4gbV9jb25uZWN0aW9uOwogICAgIGNvbnN0IGNoYXIqIG1fc2VydmljZU5h bWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hkL3dlYnB1c2h0b29sL1dlYlB1 c2hUb29sQ29ubmVjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvd2VicHVzaHRvb2wv V2ViUHVzaFRvb2xDb25uZWN0aW9uLm1tCmluZGV4IGMzMzRhZjY0YTliYi4uNDk3YTkxYWFmMzZh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hkL3dlYnB1c2h0b29sL1dlYlB1c2hU b29sQ29ubmVjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hkL3dlYnB1c2h0b29s L1dlYlB1c2hUb29sQ29ubmVjdGlvbi5tbQpAQCAtMzcsNyArMzcsNyBAQAogCiBuYW1lc3BhY2Ug V2ViUHVzaFRvb2wgewogCi1zdGQ6OnVuaXF1ZV9wdHI8Q29ubmVjdGlvbj4gQ29ubmVjdGlvbjo6 Y3JlYXRlKEFjdGlvbiBhY3Rpb24sIFByZWZlclRlc3RTZXJ2aWNlIHByZWZlclRlc3RTZXJ2aWNl LCBSZWNvbm5lY3QgcmVjb25uZWN0KQorc3RkOjp1bmlxdWVfcHRyPENvbm5lY3Rpb24+IENvbm5l Y3Rpb246OmNyZWF0ZShzdGQ6Om9wdGlvbmFsPEFjdGlvbj4gYWN0aW9uLCBQcmVmZXJUZXN0U2Vy dmljZSBwcmVmZXJUZXN0U2VydmljZSwgUmVjb25uZWN0IHJlY29ubmVjdCkKIHsKICAgICByZXR1 cm4gbWFrZVVuaXF1ZTxDb25uZWN0aW9uPihhY3Rpb24sIHByZWZlclRlc3RTZXJ2aWNlLCByZWNv bm5lY3QpOwogfQpAQCAtNTYsNyArNTYsNyBAQCBzdGF0aWMgbWFjaF9wb3J0X3QgbWF5YmVDb25u ZWN0VG9TZXJ2aWNlKGNvbnN0IGNoYXIqIHNlcnZpY2VOYW1lKQogICAgIHJldHVybiBNQUNIX1BP UlRfTlVMTDsKIH0KIAotQ29ubmVjdGlvbjo6Q29ubmVjdGlvbihBY3Rpb24gYWN0aW9uLCBQcmVm ZXJUZXN0U2VydmljZSBwcmVmZXJUZXN0U2VydmljZSwgUmVjb25uZWN0IHJlY29ubmVjdCkKK0Nv bm5lY3Rpb246OkNvbm5lY3Rpb24oc3RkOjpvcHRpb25hbDxBY3Rpb24+IGFjdGlvbiwgUHJlZmVy VGVzdFNlcnZpY2UgcHJlZmVyVGVzdFNlcnZpY2UsIFJlY29ubmVjdCByZWNvbm5lY3QpCiAgICAg OiBtX2FjdGlvbihhY3Rpb24pCiAgICAgLCBtX3JlY29ubmVjdChyZWNvbm5lY3QgPT0gUmVjb25u ZWN0OjpZZXMpCiB7CkBAIC0xMTAsNiArMTEwLDcgQEAgdm9pZCBDb25uZWN0aW9uOjpjb25uZWN0 VG9TZXJ2aWNlKFdhaXRGb3JTZXJ2aWNlVG9FeGlzdCB3YWl0Rm9yU2VydmljZVRvRXhpc3QpCiAg ICAgICAgIH0KICAgICB9CiAKKyAgICBwcmludGYoIkNvbm5lY3RpbmcgdG8gc2VydmljZSAnJXMn XG4iLCBtX3NlcnZpY2VOYW1lKTsKICAgICB4cGNfY29ubmVjdGlvbl9hY3RpdmF0ZShtX2Nvbm5l Y3Rpb24uZ2V0KCkpOwogCiAgICAgc2VuZEF1ZGl0VG9rZW4oKTsKQEAgLTExOCwxMSArMTE5LDEz IEBAIHZvaWQgQ29ubmVjdGlvbjo6Y29ubmVjdFRvU2VydmljZShXYWl0Rm9yU2VydmljZVRvRXhp c3Qgd2FpdEZvclNlcnZpY2VUb0V4aXN0KQogCiB2b2lkIENvbm5lY3Rpb246OnN0YXJ0QWN0aW9u KCkKIHsKLSAgICBzd2l0Y2ggKG1fYWN0aW9uKSB7Ci0gICAgY2FzZSBBY3Rpb246OlN0cmVhbURl YnVnTWVzc2FnZXM6Ci0gICAgICAgIHN0YXJ0RGVidWdTdHJlYW1BY3Rpb24oKTsKLSAgICAgICAg YnJlYWs7Ci0gICAgfTsKKyAgICBpZiAobV9hY3Rpb24pIHsKKyAgICAgICAgc3dpdGNoICgqbV9h Y3Rpb24pIHsKKyAgICAgICAgY2FzZSBBY3Rpb246OlN0cmVhbURlYnVnTWVzc2FnZXM6CisgICAg ICAgICAgICBzdGFydERlYnVnU3RyZWFtQWN0aW9uKCk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgfTsKKyAgICB9CiAKICAgICBpZiAobV9wdXNoTWVzc2FnZSkKICAgICAgICAgc2VuZFB1 c2hNZXNzYWdlKCk7CkBAIC0xNDAsOCArMTQzLDE0IEBAIHZvaWQgQ29ubmVjdGlvbjo6c2VuZFB1 c2hNZXNzYWdlKCkKICAgICB4cGNfZGljdGlvbmFyeV9zZXRfdmFsdWUoZGljdGlvbmFyeS5nZXQo KSwgV2ViS2l0OjpXZWJQdXNoRDo6cHJvdG9jb2xFbmNvZGVkTWVzc2FnZUtleSwgV2ViS2l0Ojp2 ZWN0b3JUb1hQQ0RhdGEoZW5jb2Rlci50YWtlQnVmZmVyKCkpLmdldCgpKTsKICAgICB4cGNfZGlj dGlvbmFyeV9zZXRfdWludDY0KGRpY3Rpb25hcnkuZ2V0KCksIFdlYktpdDo6V2ViUHVzaEQ6OnBy b3RvY29sTWVzc2FnZVR5cGVLZXksIHN0YXRpY19jYXN0PHVpbnQ2NF90PihXZWJLaXQ6OldlYlB1 c2hEOjpNZXNzYWdlVHlwZTo6SW5qZWN0UHVzaE1lc3NhZ2VGb3JUZXN0aW5nKSk7CiAKKyAgICBw cmludGYoIkluamVjdGluZyBwdXNoIG1lc3NhZ2VcbiIpOworCisgICAgLy8gSWYgd2UgaGF2ZSBu byBhY3Rpb24gZm9yIHRoaXMgaW52b2NhdGlvbiAoc3VjaCBhcyBzdHJlYW1pbmcgZGVidWcgbWVz c2FnZXMpIHRoZW4gd2UgY2FuIGV4aXQgYWZ0ZXIgdGhlIHB1c2ggaW5qZWN0aW9uIGNvbXBsZXRl cworICAgIF9fYmxvY2sgYm9vbCBzaG91bGRFeGl0QWZ0ZXJJbmplY3QgPSAhbV9hY3Rpb247CiAg ICAgeHBjX2Nvbm5lY3Rpb25fc2VuZF9tZXNzYWdlX3dpdGhfcmVwbHkobV9jb25uZWN0aW9uLmdl dCgpLCBkaWN0aW9uYXJ5LmdldCgpLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeKHhwY19v YmplY3RfdCByZXN1bHRNZXNzYWdlKSB7Ci0gICAgICAgIC8vIFRoaXMgcmVwbHkgaGFuZGxlciBp bnRlbnRpb25hbGx5IGxlZnQgYmxhbmsKKyAgICAgICAgcHJpbnRmKCJQdXNoIG1lc3NhZ2UgaW5q ZWN0ZWRcbiIpOworICAgICAgICBpZiAoc2hvdWxkRXhpdEFmdGVySW5qZWN0KQorICAgICAgICAg ICAgQ0ZSdW5Mb29wU3RvcChDRlJ1bkxvb3BHZXRNYWluKCkpOwogICAgIH0pOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hkL3dlYnB1c2h0b29sL1dlYlB1c2hUb29sTWFp bi5tbSBiL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvd2VicHVzaHRvb2wvV2ViUHVzaFRvb2xNYWlu Lm1tCmluZGV4IGY4NmYwZmU4NzFjOS4uOTU4OWM0OTYxZjkwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L3dlYnB1c2hkL3dlYnB1c2h0b29sL1dlYlB1c2hUb29sTWFpbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L3dlYnB1c2hkL3dlYnB1c2h0b29sL1dlYlB1c2hUb29sTWFpbi5tbQpAQCAtMTg3 LDcgKzE4Nyw3IEBAIGludCBtYWluKGludCwgY29uc3QgY2hhciAqKikKICAgICAgICAgcHJpbnRV c2FnZUFuZFRlcm1pbmF0ZShAIlVuYWJsZSB0byBpbnN0YWxsIHBsaXN0IHRvIGhvc3QgdGhlIHNl cnZpY2UiKTsKICNlbmRpZgogCi0gICAgYXV0byBjb25uZWN0aW9uID0gV2ViUHVzaFRvb2w6OkNv bm5lY3Rpb246OmNyZWF0ZSgqYWN0aW9uLCBwcmVmZXJUZXN0U2VydmljZSwgcmVjb25uZWN0KTsK KyAgICBhdXRvIGNvbm5lY3Rpb24gPSBXZWJQdXNoVG9vbDo6Q29ubmVjdGlvbjo6Y3JlYXRlKGFj dGlvbiwgcHJlZmVyVGVzdFNlcnZpY2UsIHJlY29ubmVjdCk7CiAgICAgaWYgKHB1c2hNZXNzYWdl KQogICAgICAgICBjb25uZWN0aW9uLT5zZXRQdXNoTWVzc2FnZShXVEZNb3ZlKHB1c2hNZXNzYWdl KSk7CiAK