207913 2020-02-18 15:00:56 -0800 Add support for WebInspector WebSocket handshake in the new WebSocket code path 2020-02-18 17:07:12 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cgarcia commit-queue webkit-bug-importer oldest_to_newest 1620351 0 youennf 2020-02-18 15:00:56 -0800 Add support for WebInspector WebSocket handshake in the new WebSocket code path 1620364 1 391099 youennf 2020-02-18 15:12:23 -0800 Created attachment 391099 Patch 1620446 2 391099 commit-queue 2020-02-18 17:06:31 -0800 Comment on attachment 391099 Patch Clearing flags on attachment: 391099 Committed r256890: <https://trac.webkit.org/changeset/256890> 1620447 3 commit-queue 2020-02-18 17:06:33 -0800 All reviewed patches have been landed. Closing bug. 1620448 4 webkit-bug-importer 2020-02-18 17:07:12 -0800 <rdar://problem/59572849> 391099 2020-02-18 15:12:23 -0800 2020-02-18 17:06:31 -0800 Patch bug-207913-20200218151222.patch text/plain 9792 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFlN2MxN2Y0OGZlYTEyY2Ji YmFhMzE3YTk5ZTU3OTE4Zjg0YjI4NmIuLjdlMmJhMGUyNzdlOTMxNWUzNGUyOGEwNDgyOTBkNzNj MDc3OGI2YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjAtMDItMTggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBXZWJJ bnNwZWN0b3IgV2ViU29ja2V0IGhhbmRzaGFrZSBpbiB0aGUgbmV3IFdlYlNvY2tldCBjb2RlIHBh dGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzkx MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW5l dmVyIGNyZWF0aW5nIHRoZSBXZWJTb2NrZXRUYXNrLCBwYXNzIHRoZSByZXF1ZXN0IGFjdHVhbGx5 IHVzZWQgZm9yIGhhbmRzaGFrZSB0byB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgV2hlbmV2ZXIg YmVpbmcgY29ubmVjdGVkLCBwYXNzIHRoZSByZXF1ZXN0IGFjdHVhbGx5IHVzZWQgZm9yIGhhbmRz aGFrZSB0byB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgSW4gY2FzZSBvZiBmYWlsdXJlIGJlZm9y ZSB0aGUgd2ViIHNvY2tldCBpcyBjb25uZWN0ZWQsIHdlIHNlbmQgdGhlIHJlc3BvbnNlIGlmIHdl IGNhbiBnZXQgYSBub24gbnVsbCBmcm9tIHRoZSB0YXNrLgorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr U29ja2V0Q2hhbm5lbDo6ZGlkU2VuZEhhbmRzaGFrZVJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrU29ja2V0Q2hhbm5lbDo6ZGlkUmVjZWl2ZUhhbmRzaGFrZVJlc3BvbnNlKToKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU29ja2V0Q2hhbm5lbC5oOgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL2NvY29hL1dlYlNvY2tldFRhc2tDb2NvYS5tbToKKyAgICAgICAgKFdl YktpdDo6V2ViU29ja2V0VGFzazo6V2ViU29ja2V0VGFzayk6CisgICAgICAgIChXZWJLaXQ6Oldl YlNvY2tldFRhc2s6OmRpZENvbm5lY3QpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9X ZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU29ja2V0Q2hhbm5lbDo6 Y29ubmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tldENoYW5uZWw6OmRpZENvbm5lY3Qp OgorICAgICAgICAoV2ViS2l0OjpXZWJTb2NrZXRDaGFubmVsOjpkaWRTZW5kSGFuZHNoYWtlUmVx dWVzdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNvY2tldENoYW5uZWw6OmRpZFJlY2VpdmVIYW5k c2hha2VSZXNwb25zZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENo YW5uZWwuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5t ZXNzYWdlcy5pbjoKKwogMjAyMC0wMi0xOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgTmV0d29ya0RhdGFUYXNrIHNob3VsZCBub3QgZXhwZWN0IGl0cyBzZXNz aW9uIHdyYXBwZXIgdG8gYmUgYWx3YXlzIGxpdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuY3BwIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggOGI3YjUzNWI1NDIy MmYyNGE4MTQ1M2E1NTZjNzgwMGJhMTg2NzhhOC4uYmI5ZjE0NTlmMzAyNmUzMjE0ZWRjZjM0YTE0 NjU4YjA0YjRiMDc4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrU29ja2V0Q2hhbm5lbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTEyMyw2ICsxMjMsMTcgQEAgdm9pZCBOZXR3 b3JrU29ja2V0Q2hhbm5lbDo6ZGlkUmVjZWl2ZU1lc3NhZ2VFcnJvcihjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSkKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJTb2NrZXRDaGFubmVsOjpEaWRSZWNl aXZlTWVzc2FnZUVycm9yIHsgZXJyb3JNZXNzYWdlIH0pOwogfQogCit2b2lkIE5ldHdvcmtTb2Nr ZXRDaGFubmVsOjpkaWRTZW5kSGFuZHNoYWtlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJiByZXF1 ZXN0KQoreworICAgIHNlbmQoTWVzc2FnZXM6OldlYlNvY2tldENoYW5uZWw6OkRpZFNlbmRIYW5k c2hha2VSZXF1ZXN0IHsgcmVxdWVzdCB9KTsKK30KKwordm9pZCBOZXR3b3JrU29ja2V0Q2hhbm5l bDo6ZGlkUmVjZWl2ZUhhbmRzaGFrZVJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2UmJiByZXNwb25z ZSkKK3sKKyAgICByZXNwb25zZS5zYW5pdGl6ZUhUVFBIZWFkZXJGaWVsZHMoUmVzb3VyY2VSZXNw b25zZTo6U2FuaXRpemF0aW9uVHlwZTo6Q3Jvc3NPcmlnaW5TYWZlKTsKKyAgICBzZW5kKE1lc3Nh Z2VzOjpXZWJTb2NrZXRDaGFubmVsOjpEaWRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2UgeyByZXNw b25zZSB9KTsKK30KKwogSVBDOjpDb25uZWN0aW9uKiBOZXR3b3JrU29ja2V0Q2hhbm5lbDo6bWVz c2FnZVNlbmRlckNvbm5lY3Rpb24oKSBjb25zdAogewogICAgIHJldHVybiAmbV9jb25uZWN0aW9u VG9XZWJQcm9jZXNzLmNvbm5lY3Rpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1NvY2tldENoYW5uZWwuaAppbmRleCAwZmNjNTE5MjgwOTBjOGUwZjg5 NWNhNTA5OTAwMGE0NTM3MTVkYjQwLi5lYjQ4ZGZhOGMxMzhkNzQ2Y2FjMTZkN2YzMjc4YWJmNmU4 NzI2YmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtT b2NrZXRDaGFubmVsLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U29ja2V0Q2hhbm5lbC5oCkBAIC02Nyw2ICs2Nyw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRS ZWNlaXZlQmluYXJ5RGF0YShjb25zdCB1aW50OF90KiBkYXRhLCBzaXplX3QgbGVuZ3RoKTsKICAg ICB2b2lkIGRpZENsb3NlKHVuc2lnbmVkIHNob3J0IGNvZGUsIGNvbnN0IFN0cmluZyYgcmVhc29u KTsKICAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRXJyb3IoY29uc3QgU3RyaW5nJik7CisgICAg dm9pZCBkaWRTZW5kSGFuZHNoYWtlUmVxdWVzdChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJik7 CisgICAgdm9pZCBkaWRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VS ZXNwb25zZSYmKTsKIAogICAgIHZvaWQgc2VuZFN0cmluZyhjb25zdCBTdHJpbmcmLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgc2VuZERhdGEoY29uc3QgSVBDOjpEYXRh UmVmZXJlbmNlJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL1dlYlNvY2tldFRhc2tDb2NvYS5oCmlu ZGV4IGY2Y2Q3YTkyOGI5NzM4ODE2YzM4OWE5NTdjOGE5MWRlOGMyNWIyNzMuLjZkYmE5ODI2ZDQ3 NzNhYTRlYzMxMGQ4MjM5MWU2NDY5OWMwOGRkNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EuaApAQCAtNjUsNiAr NjUsNyBAQCBwcml2YXRlOgogICAgIE5ldHdvcmtTb2NrZXRDaGFubmVsJiBtX2NoYW5uZWw7CiAg ICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRhc2s+IG1fdGFzazsKICAgICBib29s IG1fcmVjZWl2ZWREaWRDbG9zZSB7IGZhbHNlIH07CisgICAgYm9vbCBtX3JlY2VpdmVkRGlkQ29u bmVjdCB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2ViU29ja2V0VGFza0NvY29hLm1t IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2Eu bW0KaW5kZXggMGI5Yzk1NDYxOTNhZWIzMjgyMWEyMmM5YzU5YzJkNDdiNTkwMDE5Mi4uOTYyNTEy Y2E1NjZlOThhZmViNjhiNjIzOTdhZmJiZmJmMmVhNmIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EubW0KKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XZWJTb2NrZXRUYXNrQ29jb2EubW0KQEAg LTMxLDkgKzMxLDEzIEBACiAjaW1wb3J0ICJEYXRhUmVmZXJlbmNlLmgiCiAjaW1wb3J0ICJOZXR3 b3JrU29ja2V0Q2hhbm5lbC5oIgogI2ltcG9ydCA8Rm91bmRhdGlvbi9OU1VSTFNlc3Npb24uaD4K KyNpbXBvcnQgPFdlYkNvcmUvUmVzb3VyY2VSZXF1ZXN0Lmg+CisjaW1wb3J0IDxXZWJDb3JlL1Jl c291cmNlUmVzcG9uc2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvV2ViU29ja2V0Q2hhbm5lbC5oPgog I2ltcG9ydCA8d3RmL0Jsb2NrUHRyLmg+CiAKK3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOworCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAogV2ViU29ja2V0VGFzazo6V2ViU29ja2V0VGFzayhOZXR3b3Jr U29ja2V0Q2hhbm5lbCYgY2hhbm5lbCwgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbldlYlNvY2tldFRh c2s+JiYgdGFzaykKQEAgLTQxLDYgKzQ1LDcgQEAgV2ViU29ja2V0VGFzazo6V2ViU29ja2V0VGFz ayhOZXR3b3JrU29ja2V0Q2hhbm5lbCYgY2hhbm5lbCwgUmV0YWluUHRyPE5TVVJMU2Vzc2kKICAg ICAsIG1fdGFzayhXVEZNb3ZlKHRhc2spKQogewogICAgIHJlYWROZXh0TWVzc2FnZSgpOworICAg IG1fY2hhbm5lbC5kaWRTZW5kSGFuZHNoYWtlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QgeyBbbV90 YXNrIGN1cnJlbnRSZXF1ZXN0XSB9KTsKIH0KIAogV2ViU29ja2V0VGFzazo6fldlYlNvY2tldFRh c2soKQpAQCAtNTcsNiArNjIsMTMgQEAgdm9pZCBXZWJTb2NrZXRUYXNrOjpyZWFkTmV4dE1lc3Nh Z2UoKQogICAgICAgICAgICAgLy8gSWYgY2xvc2VDb2RlIGlzIG5vdCB6ZXJvLCB3ZSBhcmUgY2xv c2luZyB0aGUgY29ubmVjdGlvbiBhbmQgZGlkQ2xvc2Ugd2lsbCBiZSBjYWxsZWQgZm9yIHVzLgog ICAgICAgICAgICAgaWYgKFttX3Rhc2sgY2xvc2VDb2RlXSkKICAgICAgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgICAgIGlmICghbV9yZWNlaXZlZERpZENvbm5lY3QpIHsKKyAgICAgICAg ICAgICAgICBSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlIHsgW21fdGFzayByZXNwb25zZV0gfTsK KyAgICAgICAgICAgICAgICBpZiAoIXJlc3BvbnNlLmlzTnVsbCgpKQorICAgICAgICAgICAgICAg ICAgICBtX2NoYW5uZWwuZGlkUmVjZWl2ZUhhbmRzaGFrZVJlc3BvbnNlKFdURk1vdmUocmVzcG9u c2UpKTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgbV9jaGFubmVsLmRpZFJlY2VpdmVN ZXNzYWdlRXJyb3IoW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSk7CiAgICAgICAgICAgICBk aWRDbG9zZShXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpDbG9zZUV2ZW50Q29kZUFibm9ybWFs Q2xvc3VyZSwgZW1wdHlTdHJpbmcoKSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC04OCw3ICsx MDAsOSBAQCB2b2lkIFdlYlNvY2tldFRhc2s6OnJlc3VtZSgpCiB2b2lkIFdlYlNvY2tldFRhc2s6 OmRpZENvbm5lY3QoY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIHsKICAgICAvLyBGSVhNRTogc3Vw cG9ydCBleHRlbnNpb25zLgorICAgIG1fcmVjZWl2ZWREaWRDb25uZWN0ID0gdHJ1ZTsKICAgICBt X2NoYW5uZWwuZGlkQ29ubmVjdChwcm90b2NvbCwgeyB9KTsKKyAgICBtX2NoYW5uZWwuZGlkUmVj ZWl2ZUhhbmRzaGFrZVJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2UgeyBbbV90YXNrIHJlc3BvbnNl XSB9KTsKIH0KIAogdm9pZCBXZWJTb2NrZXRUYXNrOjpkaWRDbG9zZSh1bnNpZ25lZCBzaG9ydCBj b2RlLCBjb25zdCBTdHJpbmcmIHJlYXNvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5uZWwuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggOTIxNWM1NTNmMWU0M2Y3 MDcxYzIxMGZiYThkOWM5YjA5YWU2MmJiYS4uYmZiY2U2MjNlYzJjODVjNzZkM2EyMmFmMzdkNjE2 ZDkwMWVjNzgzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViU29ja2V0Q2hhbm5lbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdv cmsvV2ViU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTExNSw4ICsxMTUsNiBAQCBXZWJTb2NrZXRDaGFu bmVsOjpDb25uZWN0U3RhdHVzIFdlYlNvY2tldENoYW5uZWw6OmNvbm5lY3QoY29uc3QgVVJMJiB1 cmwsIGNvbnN0CiAgICAgICAgIG1fY2xpZW50LT5kaWRVcGdyYWRlVVJMKCk7CiAKICAgICBtX2lu c3BlY3Rvci5kaWRDcmVhdGVXZWJTb2NrZXQobV9kb2N1bWVudC5nZXQoKSwgdXJsKTsKLSAgICAv LyBGSVhNRTogR2V0IHRoZSByZWFsIHJlcXVlc3QgZnJvbSBuZXR3b3JraW5nIHByb2Nlc3MKLSAg ICBtX2luc3BlY3Rvci53aWxsU2VuZFdlYlNvY2tldEhhbmRzaGFrZVJlcXVlc3QobV9kb2N1bWVu dC5nZXQoKSwgKnJlcXVlc3QpOwogCiAgICAgTWVzc2FnZVNlbmRlcjo6c2VuZChNZXNzYWdlczo6 TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OkNyZWF0ZVNvY2tldENoYW5uZWwgeyAqcmVx dWVzdCwgcHJvdG9jb2wsIG1faWRlbnRpZmllciB9KTsKICAgICByZXR1cm4gQ29ubmVjdFN0YXR1 czo6T0s7CkBAIC0yNDQsOSArMjQyLDYgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRDb25u ZWN0KFN0cmluZyYmIHN1YnByb3RvY29sLCBTdHJpbmcmJiBleHRlbnNpb25zKQogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgLy8gRklYTUU6IEdldCB0aGUgcmVhbCByZXNwb25zZSBmcm9t IG5ldHdvcmtpbmcgcHJvY2VzcwotICAgIG1faW5zcGVjdG9yLmRpZFJlY2VpdmVXZWJTb2NrZXRI YW5kc2hha2VSZXNwb25zZShtX2RvY3VtZW50LmdldCgpLCB7IH0pOwotCiAgICAgbV9zdWJwcm90 b2NvbCA9IFdURk1vdmUoc3VicHJvdG9jb2wpOwogICAgIG1fZXh0ZW5zaW9ucyA9IFdURk1vdmUo ZXh0ZW5zaW9ucyk7CiAgICAgbV9jbGllbnQtPmRpZENvbm5lY3QoKTsKQEAgLTM3MSw0ICszNjYs MjYgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjplbnF1ZXVlVGFzayhGdW5jdGlvbjx2b2lkKCk+ JiYgdGFzaykKICAgICBtX3BlbmRpbmdUYXNrcy5hcHBlbmQoV1RGTW92ZSh0YXNrKSk7CiB9CiAK K3ZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkU2VuZEhhbmRzaGFrZVJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0JiYgcmVxdWVzdCkKK3sKKyAgICBpZiAobV9pc1N1c3BlbmRlZCkgeworICAgICAgICBl bnF1ZXVlVGFzayhbdGhpcywgcmVxdWVzdCA9IFdURk1vdmUocmVxdWVzdCldKCkgbXV0YWJsZSB7 CisgICAgICAgICAgICBkaWRTZW5kSGFuZHNoYWtlUmVxdWVzdChXVEZNb3ZlKHJlcXVlc3QpKTsK KyAgICAgICAgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgbV9pbnNwZWN0b3Iud2ls bFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KG1fZG9jdW1lbnQuZ2V0KCksIHJlcXVlc3Qp OworfQorCit2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZFJlY2VpdmVIYW5kc2hha2VSZXNwb25z ZShSZXNvdXJjZVJlc3BvbnNlJiYgcmVzcG9uc2UpCit7CisgICAgaWYgKG1faXNTdXNwZW5kZWQp IHsKKyAgICAgICAgZW5xdWV1ZVRhc2soW3RoaXMsIHJlc3BvbnNlID0gV1RGTW92ZShyZXNwb25z ZSldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBkaWRSZWNlaXZlSGFuZHNoYWtlUmVzcG9uc2Uo V1RGTW92ZShyZXNwb25zZSkpOworICAgICAgICB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KyAgICBtX2luc3BlY3Rvci5kaWRSZWNlaXZlV2ViU29ja2V0SGFuZHNoYWtlUmVzcG9uc2UobV9k b2N1bWVudC5nZXQoKSwgcmVzcG9uc2UpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5u ZWwuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5uZWwu aAppbmRleCAwMTQ1MWIwNzM3YzE5MzUzY2NjNTg0YjFmMjkxNjkyYzU5ZDlmNDI0Li5hZTM1YmRj Nzk3NzE2OTcxYzBjNTg0YjI4NGRkZjEyOTVmNTQzMTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJTb2NrZXRDaGFubmVsLmgKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5oCkBAIC04NSw2ICs4NSw4 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRSZWNlaXZlQmluYXJ5RGF0YShJUEM6OkRhdGFSZWZl cmVuY2UmJik7CiAgICAgdm9pZCBkaWRDbG9zZSh1bnNpZ25lZCBzaG9ydCBjb2RlLCBTdHJpbmcm Jik7CiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZUVycm9yKFN0cmluZyYmKTsKKyAgICB2b2lk IGRpZFNlbmRIYW5kc2hha2VSZXF1ZXN0KFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmKTsKKyAg ICB2b2lkIGRpZFJlY2VpdmVIYW5kc2hha2VSZXNwb25zZShXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiYpOwogCiAgICAgLy8gTWVzc2FnZVNlbmRlcgogICAgIElQQzo6Q29ubmVjdGlvbiogbWVz c2FnZVNlbmRlckNvbm5lY3Rpb24oKSBjb25zdCBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5uZWwubWVzc2FnZXMuaW4gYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJTb2NrZXRDaGFubmVsLm1lc3NhZ2Vz LmluCmluZGV4IDcwZjc3YjkyZDY5ZmE4NTFhY2ZjZTBlOTJkZDBhODdmM2MwNDcwNzQuLjg0NmUy YTQ5ZTg0MWI0NzA2NjJkNDFlZWFhODc1YWZkZTdlNGZmYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlNvY2tldENoYW5uZWwubWVzc2FnZXMuaW4KKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViU29ja2V0Q2hhbm5lbC5tZXNz YWdlcy5pbgpAQCAtMjYsNCArMjYsNyBAQCBtZXNzYWdlcyAtPiBXZWJTb2NrZXRDaGFubmVsIHsK ICAgICBEaWRSZWNlaXZlVGV4dChTdHJpbmcgbWVzc2FnZSkKICAgICBEaWRSZWNlaXZlQmluYXJ5 RGF0YShJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSkKICAgICBEaWRSZWNlaXZlTWVzc2FnZUVycm9y KFN0cmluZyBlcnJvck1lc3NhZ2UpCisKKyAgICBEaWRTZW5kSGFuZHNoYWtlUmVxdWVzdChXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCkKKyAgICBEaWRSZWNlaXZlSGFuZHNoYWtlUmVz cG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZXNwb25zZSkKIH0K