208994 2020-03-12 07:36:52 -0700 [SOUP] Notify web process about WebSocket handshake request and response 2020-03-13 03:38:13 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned achristensen aperez bugs-noreply webkit-bug-importer youennf oldest_to_newest 1629175 0 cgarcia 2020-03-12 07:36:52 -0700 That will make WebSockets appear again in the web inspector. 1629177 1 393373 cgarcia 2020-03-12 07:40:40 -0700 Created attachment 393373 Patch 1629182 2 393375 cgarcia 2020-03-12 07:54:35 -0700 Created attachment 393375 Patch for landing 1629561 3 cgarcia 2020-03-13 03:38:00 -0700 Committed r258393: <https://trac.webkit.org/changeset/258393> 1629562 4 webkit-bug-importer 2020-03-13 03:38:13 -0700 <rdar://problem/60412383> 393373 2020-03-12 07:40:40 -0700 2020-03-12 07:54:35 -0700 Patch wk2-soup-web-sockets-inspector.diff text/plain 3190 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYzBkMzVmOTU2MzMuLjE4MmI0NmNjZTE4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDIwLTAzLTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbU09VUF0gTm90aWZ5IHdlYiBwcm9jZXNzIGFib3V0IFdlYlNvY2tl dCBoYW5kc2hha2UgcmVxdWVzdCBhbmQgcmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODk5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgbWFrZXMgV2ViU29ja2V0cyBhcHBlYXIgYWdh aW4gaW4gd2ViIGluc3BlY3Rvci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvV2Vi U29ja2V0VGFza1NvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTb2NrZXRUYXNrOjpXZWJT b2NrZXRUYXNrKTogU2F2ZSB0aGUgaGFuZHNoYWtlIG1lc3NhZ2UgYW5kIG5vdGlmeSB0aGUgY2hh bm5lbCB3aGVuIHRoZSByZXF1ZXN0IGlzIHNlbnQuCisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tl dFRhc2s6OmRpZENvbm5lY3QpOiBOb3RpZnkgdGhlIGNoYW5uZWwgdGhhdCBoYW5kc2hha2UgcmVz cG9uc2UgaGFzIGJlZW4gcmVjZWl2ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tldFRhc2s6 OmRpZEZhaWwpOiBOb3RpZnkgdGhlIGNoYW5uZWwgdGhhdCBoYW5kc2hha2UgcmVzcG9uc2UgaGFz IGJlZW4gcmVjZWl2ZWQgaWYgaGFuZHNoYWtlIGZhaWxlZC4KKwogMjAyMC0wMy0xMiAgQnJlbnQg RnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wIHVudXNlZCBFbmFi bGVFbnVtZXJhdGluZ0FsbE5ldHdvcmtJbnRlcmZhY2VzIC8gRGlzYWJsZUVudW1lcmF0aW5nQWxs TmV0d29ya0ludGVyZmFjZXMgSVBDIG1lc3NhZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL3NvdXAvV2ViU29ja2V0VGFza1NvdXAuY3BwIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9zb3VwL1dlYlNvY2tldFRhc2tTb3VwLmNwcAppbmRleCA2YTdiNzk4 NTcxOC4uNzEyYTc3NmU3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3Mvc291cC9XZWJTb2NrZXRUYXNrU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zb3VwL1dlYlNvY2tldFRhc2tTb3VwLmNwcApAQCAtMzcsNiArMzcsNyBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKIAogV2ViU29ja2V0VGFzazo6V2ViU29ja2V0VGFzayhOZXR3b3JrU29j a2V0Q2hhbm5lbCYgY2hhbm5lbCwgU291cFNlc3Npb24qIHNlc3Npb24sIFNvdXBNZXNzYWdlKiBt c2csIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpCiAgICAgOiBtX2NoYW5uZWwoY2hhbm5lbCkKKyAg ICAsIG1faGFuZHNoYWtlTWVzc2FnZShtc2cpCiAgICAgLCBtX2NhbmNlbGxhYmxlKGFkb3B0R1Jl ZihnX2NhbmNlbGxhYmxlX25ldygpKSkKIHsKICAgICBhdXRvIHByb3RvY29sTGlzdCA9IHByb3Rv Y29sLnNwbGl0KCcsJyk7CkBAIC02NSw2ICs2NiwxMCBAQCBXZWJTb2NrZXRUYXNrOjpXZWJTb2Nr ZXRUYXNrKE5ldHdvcmtTb2NrZXRDaGFubmVsJiBjaGFubmVsLCBTb3VwU2Vzc2lvbiogc2Vzc2lv bgogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHRhc2stPmRpZEZhaWwoU3RyaW5n Ojpmcm9tVVRGOChlcnJvci0+bWVzc2FnZSkpOwogICAgICAgICB9LCB0aGlzKTsKKworICAgIFJl c291cmNlUmVxdWVzdCByZXF1ZXN0OworICAgIHJlcXVlc3QudXBkYXRlRnJvbVNvdXBNZXNzYWdl KG1zZyk7CisgICAgbV9jaGFubmVsLmRpZFNlbmRIYW5kc2hha2VSZXF1ZXN0KFdURk1vdmUocmVx dWVzdCkpOwogfQogCiBXZWJTb2NrZXRUYXNrOjp+V2ViU29ja2V0VGFzaygpCkBAIC0xMDksNiAr MTE0LDExIEBAIHZvaWQgV2ViU29ja2V0VGFzazo6ZGlkQ29ubmVjdChHUmVmUHRyPFNvdXBXZWJz b2NrZXRDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2Fw cGVkKG1fY29ubmVjdGlvbi5nZXQoKSwgImNsb3NlZCIsIHJlaW50ZXJwcmV0X2Nhc3Q8R0NhbGxi YWNrPihkaWRDbG9zZUNhbGxiYWNrKSwgdGhpcyk7CiAKICAgICBtX2NoYW5uZWwuZGlkQ29ubmVj dChzb3VwX3dlYnNvY2tldF9jb25uZWN0aW9uX2dldF9wcm90b2NvbChtX2Nvbm5lY3Rpb24uZ2V0 KCkpLCBhY2NlcHRlZEV4dGVuc2lvbnMoKSk7CisKKyAgICBSZXNvdXJjZVJlc3BvbnNlIHJlc3Bv bnNlOworICAgIHJlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShtX2hhbmRzaGFrZU1lc3Nh Z2UuZ2V0KCkpOworICAgIG1fY2hhbm5lbC5kaWRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2UoV1RG TW92ZShyZXNwb25zZSkpOworICAgIG1faGFuZHNoYWtlTWVzc2FnZSA9IG51bGxwdHI7CiB9CiAK IHZvaWQgV2ViU29ja2V0VGFzazo6ZGlkUmVjZWl2ZU1lc3NhZ2VDYWxsYmFjayhXZWJTb2NrZXRU YXNrKiB0YXNrLCBTb3VwV2Vic29ja2V0RGF0YVR5cGUgZGF0YVR5cGUsIEdCeXRlcyogbWVzc2Fn ZSkKQEAgLTE0Myw2ICsxNTMsMTIgQEAgdm9pZCBXZWJTb2NrZXRUYXNrOjpkaWRGYWlsKGNvbnN0 IFN0cmluZyYgZXJyb3JNZXNzYWdlKQogICAgICAgICByZXR1cm47CiAKICAgICBtX3JlY2VpdmVk RGlkRmFpbCA9IHRydWU7CisgICAgaWYgKG1faGFuZHNoYWtlTWVzc2FnZSkgeworICAgICAgICBS ZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlOworICAgICAgICByZXNwb25zZS51cGRhdGVGcm9tU291 cE1lc3NhZ2UobV9oYW5kc2hha2VNZXNzYWdlLmdldCgpKTsKKyAgICAgICAgbV9jaGFubmVsLmRp ZFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZShXVEZNb3ZlKHJlc3BvbnNlKSk7CisgICAgICAgIG1f aGFuZHNoYWtlTWVzc2FnZSA9IG51bGxwdHI7CisgICAgfQogICAgIG1fY2hhbm5lbC5kaWRSZWNl aXZlTWVzc2FnZUVycm9yKGVycm9yTWVzc2FnZSk7CiAgICAgaWYgKCFtX2Nvbm5lY3Rpb24pIHsK ICAgICAgICAgZGlkQ2xvc2UoU09VUF9XRUJTT0NLRVRfQ0xPU0VfQUJOT1JNQUwsIHsgfSk7Cg== 393375 2020-03-12 07:54:35 -0700 2020-03-12 08:20:17 -0700 Patch for landing wk2-soup-web-sockets-inspector.diff text/plain 4157 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYzBkMzVmOTU2MzMuLmYxZmM4MjQwMGQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDIwLTAzLTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbU09VUF0gTm90aWZ5IHdlYiBwcm9jZXNzIGFib3V0IFdlYlNvY2tl dCBoYW5kc2hha2UgcmVxdWVzdCBhbmQgcmVzcG9uc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODk5NAorCisgICAgICAgIFJldmlld2VkIGJ5IFlv dWVubiBGYWJsZXQuCisKKyAgICAgICAgVGhpcyBtYWtlcyBXZWJTb2NrZXRzIGFwcGVhciBhZ2Fp biBpbiB3ZWIgaW5zcGVjdG9yLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9XZWJT b2NrZXRUYXNrU291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tldFRhc2s6OldlYlNv Y2tldFRhc2spOiBTYXZlIHRoZSBoYW5kc2hha2UgbWVzc2FnZSBhbmQgbm90aWZ5IHRoZSBjaGFu bmVsIHdoZW4gdGhlIHJlcXVlc3QgaXMgc2VudC4KKyAgICAgICAgKFdlYktpdDo6V2ViU29ja2V0 VGFzazo6ZGlkQ29ubmVjdCk6IE5vdGlmeSB0aGUgY2hhbm5lbCB0aGF0IGhhbmRzaGFrZSByZXNw b25zZSBoYXMgYmVlbiByZWNlaXZlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViU29ja2V0VGFzazo6 ZGlkRmFpbCk6IE5vdGlmeSB0aGUgY2hhbm5lbCB0aGF0IGhhbmRzaGFrZSByZXNwb25zZSBoYXMg YmVlbiByZWNlaXZlZCBpZiBoYW5kc2hha2UKKyAgICAgICAgZmFpbGVkLgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL3NvdXAvV2ViU29ja2V0VGFza1NvdXAuaDoKKwogMjAyMC0wMy0xMiAgQnJl bnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wIHVudXNlZCBF bmFibGVFbnVtZXJhdGluZ0FsbE5ldHdvcmtJbnRlcmZhY2VzIC8gRGlzYWJsZUVudW1lcmF0aW5n QWxsTmV0d29ya0ludGVyZmFjZXMgSVBDIG1lc3NhZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvV2ViU29ja2V0VGFza1NvdXAuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL1dlYlNvY2tldFRhc2tTb3VwLmNwcAppbmRleCA2YTdi Nzk4NTcxOC4uMGZmMWMxYTQ1OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvc291cC9XZWJTb2NrZXRUYXNrU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9zb3VwL1dlYlNvY2tldFRhc2tTb3VwLmNwcApAQCAtMjksNiArMjksOCBAQAog I2luY2x1ZGUgIkRhdGFSZWZlcmVuY2UuaCIKICNpbmNsdWRlICJOZXR3b3JrU29ja2V0Q2hhbm5l bC5oIgogI2luY2x1ZGUgPFdlYkNvcmUvSFRUUFBhcnNlcnMuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L1Jlc291cmNlUmVxdWVzdC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5o PgogI2luY2x1ZGUgPFdlYkNvcmUvV2ViU29ja2V0Q2hhbm5lbC5oPgogI2luY2x1ZGUgPHd0Zi9n bGliL0dVbmlxdWVQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CkBA IC0zNyw2ICszOSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBXZWJTb2NrZXRUYXNrOjpXZWJT b2NrZXRUYXNrKE5ldHdvcmtTb2NrZXRDaGFubmVsJiBjaGFubmVsLCBTb3VwU2Vzc2lvbiogc2Vz c2lvbiwgU291cE1lc3NhZ2UqIG1zZywgY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKICAgICA6IG1f Y2hhbm5lbChjaGFubmVsKQorICAgICwgbV9oYW5kc2hha2VNZXNzYWdlKG1zZykKICAgICAsIG1f Y2FuY2VsbGFibGUoYWRvcHRHUmVmKGdfY2FuY2VsbGFibGVfbmV3KCkpKQogewogICAgIGF1dG8g cHJvdG9jb2xMaXN0ID0gcHJvdG9jb2wuc3BsaXQoJywnKTsKQEAgLTY1LDYgKzY4LDEwIEBAIFdl YlNvY2tldFRhc2s6OldlYlNvY2tldFRhc2soTmV0d29ya1NvY2tldENoYW5uZWwmIGNoYW5uZWws IFNvdXBTZXNzaW9uKiBzZXNzaW9uCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg dGFzay0+ZGlkRmFpbChTdHJpbmc6OmZyb21VVEY4KGVycm9yLT5tZXNzYWdlKSk7CiAgICAgICAg IH0sIHRoaXMpOworCisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3Q7CisgICAg cmVxdWVzdC51cGRhdGVGcm9tU291cE1lc3NhZ2UobXNnKTsKKyAgICBtX2NoYW5uZWwuZGlkU2Vu ZEhhbmRzaGFrZVJlcXVlc3QoV1RGTW92ZShyZXF1ZXN0KSk7CiB9CiAKIFdlYlNvY2tldFRhc2s6 On5XZWJTb2NrZXRUYXNrKCkKQEAgLTEwOSw2ICsxMTYsMTEgQEAgdm9pZCBXZWJTb2NrZXRUYXNr OjpkaWRDb25uZWN0KEdSZWZQdHI8U291cFdlYnNvY2tldENvbm5lY3Rpb24+JiYgY29ubmVjdGlv bikKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9jb25uZWN0aW9uLmdldCgpLCAiY2xv c2VkIiwgcmVpbnRlcnByZXRfY2FzdDxHQ2FsbGJhY2s+KGRpZENsb3NlQ2FsbGJhY2spLCB0aGlz KTsKIAogICAgIG1fY2hhbm5lbC5kaWRDb25uZWN0KHNvdXBfd2Vic29ja2V0X2Nvbm5lY3Rpb25f Z2V0X3Byb3RvY29sKG1fY29ubmVjdGlvbi5nZXQoKSksIGFjY2VwdGVkRXh0ZW5zaW9ucygpKTsK KworICAgIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2U7CisgICAgcmVzcG9uc2Uu dXBkYXRlRnJvbVNvdXBNZXNzYWdlKG1faGFuZHNoYWtlTWVzc2FnZS5nZXQoKSk7CisgICAgbV9j aGFubmVsLmRpZFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZShXVEZNb3ZlKHJlc3BvbnNlKSk7Cisg ICAgbV9oYW5kc2hha2VNZXNzYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBXZWJTb2NrZXRUYXNr OjpkaWRSZWNlaXZlTWVzc2FnZUNhbGxiYWNrKFdlYlNvY2tldFRhc2sqIHRhc2ssIFNvdXBXZWJz b2NrZXREYXRhVHlwZSBkYXRhVHlwZSwgR0J5dGVzKiBtZXNzYWdlKQpAQCAtMTQzLDYgKzE1NSwx MiBAQCB2b2lkIFdlYlNvY2tldFRhc2s6OmRpZEZhaWwoY29uc3QgU3RyaW5nJiBlcnJvck1lc3Nh Z2UpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fcmVjZWl2ZWREaWRGYWlsID0gdHJ1ZTsKKyAg ICBpZiAobV9oYW5kc2hha2VNZXNzYWdlKSB7CisgICAgICAgIFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UgcmVzcG9uc2U7CisgICAgICAgIHJlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZSht X2hhbmRzaGFrZU1lc3NhZ2UuZ2V0KCkpOworICAgICAgICBtX2NoYW5uZWwuZGlkUmVjZWl2ZUhh bmRzaGFrZVJlc3BvbnNlKFdURk1vdmUocmVzcG9uc2UpKTsKKyAgICAgICAgbV9oYW5kc2hha2VN ZXNzYWdlID0gbnVsbHB0cjsKKyAgICB9CiAgICAgbV9jaGFubmVsLmRpZFJlY2VpdmVNZXNzYWdl RXJyb3IoZXJyb3JNZXNzYWdlKTsKICAgICBpZiAoIW1fY29ubmVjdGlvbikgewogICAgICAgICBk aWRDbG9zZShTT1VQX1dFQlNPQ0tFVF9DTE9TRV9BQk5PUk1BTCwgeyB9KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9XZWJTb2NrZXRUYXNrU291cC5oIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL1dlYlNvY2tldFRhc2tTb3VwLmgKaW5k ZXggNWVmN2I0OGU0MjAuLjRmMDc2YmY1ODMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3NvdXAvV2ViU29ja2V0VGFza1NvdXAuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL3NvdXAvV2ViU29ja2V0VGFza1NvdXAuaApAQCAtNjAsNiArNjAsNyBA QCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZENsb3NlQ2FsbGJhY2soV2ViU29ja2V0VGFz ayopOwogCiAgICAgTmV0d29ya1NvY2tldENoYW5uZWwmIG1fY2hhbm5lbDsKKyAgICBHUmVmUHRy PFNvdXBNZXNzYWdlPiBtX2hhbmRzaGFrZU1lc3NhZ2U7CiAgICAgR1JlZlB0cjxTb3VwV2Vic29j a2V0Q29ubmVjdGlvbj4gbV9jb25uZWN0aW9uOwogICAgIEdSZWZQdHI8R0NhbmNlbGxhYmxlPiBt X2NhbmNlbGxhYmxlOwogICAgIGJvb2wgbV9yZWNlaXZlZERpZEZhaWwgeyBmYWxzZSB9Owo=