230479 2021-09-20 07:17:12 -0700 Ensure that capture attribution works even for URLS without hostnames 2021-09-27 09:05:03 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf darius.chris.k eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1795064 0 youennf 2021-09-20 07:17:12 -0700 <rdar://81832853> 1795070 1 438676 youennf 2021-09-20 07:24:04 -0700 Created attachment 438676 Patch 1795438 2 ews-feeder 2021-09-21 00:18:11 -0700 Committed r282803 (241935@main): <https://commits.webkit.org/241935@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438676. 1797497 3 youennf 2021-09-27 09:05:03 -0700 *** Bug 230830 has been marked as a duplicate of this bug. *** 438676 2021-09-20 07:24:04 -0700 2021-09-21 00:18:12 -0700 Patch bug-230479-20210920162402.patch text/plain 10736 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxYjlkZWI2YjVhNWFkMWY5 MjMyZWU1MGE1M2Q3NzQwNzFmNTU0N2IuLmNiY2Y3OTM4OWFmZGYxMDFiMzZhMDM4OGZhYmE3YmQw ZTQ1YTYxNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDktMjAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEVuc3VyZSB0aGF0IGNhcHR1cmUg YXR0cmlidXRpb24gd29ya3MgZXZlbiBmb3IgVVJMUyB3aXRob3V0IGhvc3RuYW1lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDc5CisgICAgICAg IDxyZGFyOi8vODE4MzI4NTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU29tZSBVUkxzIGFsbG93IHRvIGNhbGwgZ2V0VXNlck1lZGlhIGJ1dCBkbyBu b3QgaGF2ZSBvcmlnaW5zLCBsaWtlIGN1c3RvbSBzY2hlbWUgVVJMcy4KKyAgICAgICAgSW4gdGhh dCBjYXNlLCB0aGUgYXR0cmlidXRpb24gc3RhdHVzIGNhbGwgd2FzIGZhaWxpbmcgcHJldmlvdXNs eSBhcyB3ZSB3ZXJlIG5vdCBhYmxlIHRvIGdldCBhIHZpc2libGUgbmFtZSB0byBwcm92aWRlLgor ICAgICAgICBXZSBtaW1pY2sgd2hhdCB3ZSBhcmUgZG9pbmcgZm9yIHRoZSBkZWZhdWx0IHByb21w dCBieSB1c2luZyB0aGUgdmlzaWJsZSBhcHBsaWNhdGlvbiBuYW1lIGlmIHRoZSBvcmlnaW4gaXMg bm90IGF2YWlsYWJsZS4KKyAgICAgICAgU2luY2Ugd2UgZG8gdGhlIHN5c3RlbSBhdHRyaWJ1dGlv biBpbiBHUFVQcm9jZXNzLCB3ZSBub3cgc2VuZCB0aGUgdmlzaWJsZSBuYW1lIHRvIEdQVVByb2Nl c3Mgd2hlbiBjcmVhdGluZyBpdC4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQuCisgICAgICAg IFdlIGRvIG5vdCBoYXZlIHN5c3RlbSBzdGF0dXMgYXR0cmlidXRvbiBvbiBNYWNPUyBvciBzaW11 bGF0b3Igc28gd2UgY2Fubm90IHRlc3QgaXQgYXV0b21hdGljYWxseS4KKworICAgICAgICAqIEdQ VVByb2Nlc3MvR1BVUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3M6Omlu aXRpYWxpemVHUFVQcm9jZXNzKToKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3MuaDoK KyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzczo6YXBwbGljYXRpb25WaXNpYmxlTmFtZSBjb25z dCk6CisgICAgICAgICogR1BVUHJvY2Vzcy9HUFVQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNw cDoKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl IGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6R1BVUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6 ZGVjb2RlKToKKyAgICAgICAgKiBHUFVQcm9jZXNzL0dQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaDoKKyAgICAgICAgKiBHUFVQcm9jZXNzL2NvY29hL0dQVUNvbm5lY3Rpb25Ub1dlYlByb2Nl c3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 c2V0Q2FwdHVyZUF0dHJpYnV0aW9uU3RyaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2Ev R1BVUHJvY2Vzc1Byb3h5Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OkdQVVByb2Nlc3NQcm94 eTo6cGxhdGZvcm1Jbml0aWFsaXplR1BVUHJvY2Vzc1BhcmFtZXRlcnMpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9NZWRpYVBlcm1pc3Npb25VdGlsaXRpZXMubW06CisgICAgICAgIChXZWJL aXQ6OmFwcGxpY2F0aW9uVmlzaWJsZU5hbWVGcm9tT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6 YXBwbGljYXRpb25WaXNpYmxlTmFtZSk6CisgICAgICAgIChXZWJLaXQ6OmFsZXJ0TWVzc2FnZVRl eHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9NZWRpYVBlcm1pc3Npb25VdGlsaXRpZXMuaDoKKwog MjAyMS0wOS0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBUZWFjaCBgV2ViS2l0OjpjcmVhdGVTaGFyZWFibGVCaXRtYXBgIHRvIHNuYXBzaG90IHZp ZGVvIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJv Y2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5jcHAKaW5kZXgg Y2YyOGQxMWZlMTFhZjk2MDkyNGQ5NjVjZTE2MTgyYjVmZDUxOGFhYS4uMDg3MzNjYzAyZGVmZTQz NzA4NzZkMWRjZjNiYmFmN2MyNDQ5MTJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL0dQVVByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQ cm9jZXNzLmNwcApAQCAtMjQ5LDYgKzI0OSw4IEBAIHZvaWQgR1BVUHJvY2Vzczo6aW5pdGlhbGl6 ZUdQVVByb2Nlc3MoR1BVUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAg ICAgV2ViS2l0Ojpsb2dDaGFubmVscygpLmluaXRpYWxpemVMb2dDaGFubmVsc0lmTmVjZXNzYXJ5 KHBhcmFtZXRlcnMud2ViS2l0TG9nZ2luZ0NoYW5uZWxzKTsKICNlbmRpZgogCisgICAgbV9hcHBs aWNhdGlvblZpc2libGVOYW1lID0gV1RGTW92ZShwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uVmlzaWJs ZU5hbWUpOworCiAgICAgLy8gTWF0Y2ggdGhlIFFvUyBvZiB0aGUgVUlQcm9jZXNzIHNpbmNlIHRo ZSBHUFUgcHJvY2VzcyBpcyBkb2luZyByZW5kZXJpbmcgb24gaXRzIGJlaGFsZi4KICAgICBXVEY6 OlRocmVhZDo6c2V0Q3VycmVudFRocmVhZElzVXNlckludGVyYWN0aXZlKDApOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oIGIvU291cmNlL1dlYktp dC9HUFVQcm9jZXNzL0dQVVByb2Nlc3MuaAppbmRleCBjNmM3OTAyMGViNGU2NzZkMmNmNjVmNzc3 MTUxM2YwMjA0NTM0ZDE2Li4wMjBiZTY5YWRhNmVmMjQyZTNjNGNiN2Y4YmY4NWQ3MGQxNjdhNWY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzcy5oCisrKyBi L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzLmgKQEAgLTk3LDYgKzk3LDggQEAg cHVibGljOgogCiAgICAgdm9pZCB0cnlFeGl0SWZVbnVzZWRBbmRVbmRlck1lbW9yeVByZXNzdXJl KCk7CiAKKyAgICBjb25zdCBTdHJpbmcmIGFwcGxpY2F0aW9uVmlzaWJsZU5hbWUoKSBjb25zdCB7 IHJldHVybiBtX2FwcGxpY2F0aW9uVmlzaWJsZU5hbWU7IH0KKwogcHJpdmF0ZToKICAgICB2b2lk IGxvd01lbW9yeUhhbmRsZXIoQ3JpdGljYWwsIFN5bmNocm9ub3VzKTsKIApAQCAtMjA5LDYgKzIx MSw3IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKFZPUkJJUykKICAgICBib29sIG1fdm9yYmlzRW5h YmxlZCB7IGZhbHNlIH07CiAjZW5kaWYKKyAgICBTdHJpbmcgbV9hcHBsaWNhdGlvblZpc2libGVO YW1lOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXgg YWU5ZDQ3MDQ0ODUwMzIwYTNiMzFhZjhmYmFlZGJhZWJlZGE2ZjQzNy4uYzRlOWRkNDI3ZDkzZGEx NDI1NWEzMDRmN2UzYmE2NDJhMDU1NmI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL0dQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNjIsNiAr NjIsOCBAQCB2b2lkIEdQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVu Y29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCB3dGZMb2dnaW5nQ2hhbm5lbHM7 CiAgICAgZW5jb2RlciA8PCB3ZWJDb3JlTG9nZ2luZ0NoYW5uZWxzOwogICAgIGVuY29kZXIgPDwg d2ViS2l0TG9nZ2luZ0NoYW5uZWxzOworCisgICAgZW5jb2RlciA8PCBhcHBsaWNhdGlvblZpc2li bGVOYW1lOwogfQogCiBib29sIEdQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZShJ UEM6OkRlY29kZXImIGRlY29kZXIsIEdQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHJlc3Vs dCkKQEAgLTExNyw2ICsxMTksOSBAQCBib29sIEdQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6 OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEdQVVByb2Nlc3NDcmVhdAogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUocmVzdWx0LndlYktpdExvZ2dpbmdDaGFubmVscykpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmFwcGxpY2F0aW9u VmlzaWJsZU5hbWUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICByZXR1cm4gdHJ1ZTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9HUFVQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzLmgKaW5kZXggNWE2NjYxNzA0YjRkY2ZiMmExZmEzZTMwOTRmYzEzMWRl MGVjZGQzNy4uYzljMWViZTliZjZhOGIyNzA0OTgxYWVlZDg2M2RhYmM5YmIxZDFjNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL0dQVVByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvR1BVUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVycy5oCkBAIC02MSw2ICs2MSw4IEBAIHN0cnVjdCBHUFVQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzIHsKICAgICBTdHJpbmcgd2ViQ29yZUxvZ2dpbmdDaGFubmVsczsKICAgICBTdHJpbmcg d2ViS2l0TG9nZ2luZ0NoYW5uZWxzOwogCisgICAgU3RyaW5nIGFwcGxpY2F0aW9uVmlzaWJsZU5h bWU7CisKICAgICB2b2lkIGVuY29kZShJUEM6OkVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMg V0FSTl9VTlVTRURfUkVUVVJOIGJvb2wgZGVjb2RlKElQQzo6RGVjb2RlciYsIEdQVVByb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMmKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVBy b2Nlc3MvY29jb2EvR1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzc0NvY29hLm1tIGIvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL2NvY29hL0dQVUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3NDb2NvYS5tbQpp bmRleCBmMDhjMjlmMTNhNDFkODBlNDBmMjc4YjdjMDU2ZGUwY2I1NDA2ZTE0Li40NjI0MTc0NWFi MTYwNDI3YjkxZWRmZGIzZjlmYmQ5NTViN2IxMWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3MvY29jb2EvR1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzc0NvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9jb2NvYS9HUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNz Q29jb2EubW0KQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lmIEVOQUJMRShHUFVfUFJPQ0VTUykKIAor I2ltcG9ydCAiTWVkaWFQZXJtaXNzaW9uVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJTeXN0ZW1TdGF0 dXNTUEkuaCIKICNpbXBvcnQgPFdlYkNvcmUvTG9jYWxpemVkU3RyaW5ncy5oPgogI2ltcG9ydCA8 V2ViQ29yZS9SZWdpc3RyYWJsZURvbWFpbi5oPgpAQCAtNDMsMTUgKzQ0LDE1IEBAIGJvb2wgR1BV Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c2V0Q2FwdHVyZUF0dHJpYnV0aW9uU3RyaW5nKCkKICAg ICBpZiAoIVtQQUw6OmdldFNURHluYW1pY0FjdGl2aXR5QXR0cmlidXRpb25QdWJsaXNoZXJDbGFz cygpIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0Q3VycmVudEF0dHJpYnV0aW9uU3Ry aW5nV2l0aEZvcm1hdDphdWRpdFRva2VuOildKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAg IGF1dG8gZG9tYWluID0gV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4geyBtX2NhcHR1cmVPcmln aW4tPmRhdGEoKSB9OwotICAgIGlmIChkb21haW4uaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KICAgICBhdXRvIGF1ZGl0VG9rZW4gPSBncHVQcm9jZXNzKCkucGFyZW50UHJvY2Vz c0Nvbm5lY3Rpb24oKS0+Z2V0QXVkaXRUb2tlbigpOwogICAgIGlmICghYXVkaXRUb2tlbikKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgUmV0YWluUHRyPE5TU3RyaW5nPiBmb3JtYXRTdHJp bmcgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpXRUJfVUlfU1RSSU5HKCLigJwlQOKAnSBp biDigJwlJUDigJ0iLCAiVGhlIGRvbWFpbiBhbmQgYXBwbGljYXRpb24gdXNpbmcgdGhlIGNhbWVy YSBhbmQvb3IgbWljcm9waG9uZS4gVGhlIGZpcnN0IGFyZ3VtZW50IGlzIGRvbWFpbiwgdGhlIHNl Y29uZCBpcyB0aGUgYXBwbGljYXRpb24gbmFtZSAoaU9TIG9ubHkpLiIpLCAoTlNTdHJpbmcgKilk b21haW4uc3RyaW5nKCldOworICAgIGF1dG8gKnZpc2libGVOYW1lID0gYXBwbGljYXRpb25WaXNp YmxlTmFtZUZyb21PcmlnaW4obV9jYXB0dXJlT3JpZ2luLT5kYXRhKCkpOworICAgIGlmICghdmlz aWJsZU5hbWUpCisgICAgICAgIHZpc2libGVOYW1lID0gZ3B1UHJvY2VzcygpLmFwcGxpY2F0aW9u VmlzaWJsZU5hbWUoKTsKKworICAgIFJldGFpblB0cjxOU1N0cmluZz4gZm9ybWF0U3RyaW5nID0g W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6V0VCX1VJX1NUUklORygi4oCcJUDigJ0gaW4g4oCc JSVA4oCdIiwgIlRoZSBkb21haW4gYW5kIGFwcGxpY2F0aW9uIHVzaW5nIHRoZSBjYW1lcmEgYW5k L29yIG1pY3JvcGhvbmUuIFRoZSBmaXJzdCBhcmd1bWVudCBpcyBkb21haW4sIHRoZSBzZWNvbmQg aXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUgKGlPUyBvbmx5KS4iKSwgdmlzaWJsZU5hbWVdOwogCiAg ICAgW1BBTDo6Z2V0U1REeW5hbWljQWN0aXZpdHlBdHRyaWJ1dGlvblB1Ymxpc2hlckNsYXNzKCkg c2V0Q3VycmVudEF0dHJpYnV0aW9uU3RyaW5nV2l0aEZvcm1hdDpmb3JtYXRTdHJpbmcuZ2V0KCkg YXVkaXRUb2tlbjphdWRpdFRva2VuLnZhbHVlKCldOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9HUFVQcm9jZXNzUHJveHlDb2NvYS5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0dQVVByb2Nlc3NQcm94eUNvY29hLm1tCmluZGV4IDQz MTJkMWIwMGM5YjI4ZTlmZjkxNjMxNDZhZTExNmYzMzAyYTQ4YTYuLjdmNzBiNjk4ZGNiZmYxOGQ2 NGY3MDA0MDM5MzM5MWY0MGY2NjUzM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL0dQVVByb2Nlc3NQcm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL0dQVVByb2Nlc3NQcm94eUNvY29hLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAj aWYgRU5BQkxFKEdQVV9QUk9DRVNTKQogCiAjaW5jbHVkZSAiR1BVUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVycy5oIgorI2luY2x1ZGUgIk1lZGlhUGVybWlzc2lvblV0aWxpdGllcy5oIgogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIApAQCAtMzksNiArNDAsOCBAQCB2b2lkIEdQVVByb2Nlc3NQcm94eTo6 cGxhdGZvcm1Jbml0aWFsaXplR1BVUHJvY2Vzc1BhcmFtZXRlcnMoR1BVUHJvY2Vzc0NyZWF0aW9u UAogICAgIHBhcmFtZXRlcnMud2ViQ29yZUxvZ2dpbmdDaGFubmVscyA9IFtbTlNVc2VyRGVmYXVs dHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHN0cmluZ0ZvcktleTpAIldlYkNvcmVMb2dnaW5nIl07 CiAgICAgcGFyYW1ldGVycy53ZWJLaXRMb2dnaW5nQ2hhbm5lbHMgPSBbW05TVXNlckRlZmF1bHRz IHN0YW5kYXJkVXNlckRlZmF1bHRzXSBzdHJpbmdGb3JLZXk6QCJXZWJLaXQyTG9nZ2luZyJdOwog I2VuZGlmCisKKyAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uVmlzaWJsZU5hbWUgPSBhcHBsaWNh dGlvblZpc2libGVOYW1lKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL01lZGlhUGVybWlzc2lvblV0aWxpdGllcy5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL01lZGlhUGVybWlzc2lvblV0aWxpdGllcy5tbQppbmRleCAxNGU5Yzhh YjViYmZjYmZmYTA0ZGRiODVjYmIyNzE5NTIwYzA1ZWFlLi5jNWEzOTc1ODc5YzY5OGFmZDlhOGE3 MmVmYzM0YmEzY2U0ZDc1NmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9NZWRpYVBlcm1pc3Npb25VdGlsaXRpZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvTWVkaWFQZXJtaXNzaW9uVXRpbGl0aWVzLm1tCkBAIC0xMTAsMTYgKzExMCwy NyBAQCBzdGF0aWMgTlNTdHJpbmcqIHZpc2libGVEb21haW4oY29uc3QgU3RyaW5nJiBob3N0KQog ICAgIHJldHVybiBzdGFydHNXaXRoTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGRvbWFpbiwgInd3 dy4iKSA/IGRvbWFpbi5zdWJzdHJpbmcoNCkgOiBkb21haW47CiB9CiAKK05TU3RyaW5nICphcHBs aWNhdGlvblZpc2libGVOYW1lRnJvbU9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdp bkRhdGEmIG9yaWdpbikKK3sKKyAgICBpZiAob3JpZ2luLnByb3RvY29sICE9ICJodHRwIiAmJiBv cmlnaW4ucHJvdG9jb2wgIT0gImh0dHBzIikKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIHJl dHVybiB2aXNpYmxlRG9tYWluKG9yaWdpbi5ob3N0KTsKK30KKworTlNTdHJpbmcgKmFwcGxpY2F0 aW9uVmlzaWJsZU5hbWUoKQoreworICAgIE5TQnVuZGxlICphcHBCdW5kbGUgPSBbTlNCdW5kbGUg bWFpbkJ1bmRsZV07CisgICAgTlNTdHJpbmcgKmRpc3BsYXlOYW1lID0gYXBwQnVuZGxlLmluZm9E aWN0aW9uYXJ5WyhfX2JyaWRnZSBOU1N0cmluZyAqKV9rQ0ZCdW5kbGVEaXNwbGF5TmFtZUtleV07 CisgICAgTlNTdHJpbmcgKnJlYWRhYmxlTmFtZSA9IGFwcEJ1bmRsZS5pbmZvRGljdGlvbmFyeVso X19icmlkZ2UgTlNTdHJpbmcgKilrQ0ZCdW5kbGVOYW1lS2V5XTsKKyAgICByZXR1cm4gZGlzcGxh eU5hbWUgPzogcmVhZGFibGVOYW1lOworfQorCiBzdGF0aWMgTlNTdHJpbmcgKmFsZXJ0TWVzc2Fn ZVRleHQoTWVkaWFQZXJtaXNzaW9uUmVhc29uIHJlYXNvbiwgY29uc3QgV2ViQ29yZTo6U2VjdXJp dHlPcmlnaW5EYXRhJiBvcmlnaW4pCiB7Ci0gICAgTlNTdHJpbmcgKnZpc2libGVPcmlnaW47Ci0g ICAgaWYgKG9yaWdpbi5wcm90b2NvbCAhPSAiaHR0cCIgJiYgb3JpZ2luLnByb3RvY29sICE9ICJo dHRwcyIpIHsKLSAgICAgICAgTlNCdW5kbGUgKmFwcEJ1bmRsZSA9IFtOU0J1bmRsZSBtYWluQnVu ZGxlXTsKLSAgICAgICAgTlNTdHJpbmcgKmRpc3BsYXlOYW1lID0gYXBwQnVuZGxlLmluZm9EaWN0 aW9uYXJ5WyhfX2JyaWRnZSBOU1N0cmluZyAqKV9rQ0ZCdW5kbGVEaXNwbGF5TmFtZUtleV07Ci0g ICAgICAgIE5TU3RyaW5nICpyZWFkYWJsZU5hbWUgPSBhcHBCdW5kbGUuaW5mb0RpY3Rpb25hcnlb KF9fYnJpZGdlIE5TU3RyaW5nICopa0NGQnVuZGxlTmFtZUtleV07Ci0gICAgICAgIHZpc2libGVP cmlnaW4gPSBkaXNwbGF5TmFtZSA/OiByZWFkYWJsZU5hbWU7Ci0gICAgfSBlbHNlCi0gICAgICAg IHZpc2libGVPcmlnaW4gPSB2aXNpYmxlRG9tYWluKG9yaWdpbi5ob3N0KTsKKyAgICBOU1N0cmlu ZyAqdmlzaWJsZU9yaWdpbiA9IGFwcGxpY2F0aW9uVmlzaWJsZU5hbWVGcm9tT3JpZ2luKG9yaWdp bik7CisgICAgaWYgKCF2aXNpYmxlT3JpZ2luKQorICAgICAgICB2aXNpYmxlT3JpZ2luID0gYXBw bGljYXRpb25WaXNpYmxlTmFtZSgpOwogCiAgICAgc3dpdGNoIChyZWFzb24pIHsKICAgICBjYXNl IE1lZGlhUGVybWlzc2lvblJlYXNvbjo6Q2FtZXJhOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvTWVkaWFQZXJtaXNzaW9uVXRpbGl0aWVzLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9NZWRpYVBlcm1pc3Npb25VdGlsaXRpZXMuaAppbmRleCA1YTMxNTE2OTVjYzRkOGU0 MDM0NzA2NGZjZmFlNDU4MWZkN2ZhMTk1Li40MWVhNDFkZmQ0NzQ2YWZjYjdmYjMyNzQ1ZDgzZmQ3 ZWY4NDJlYzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYVBlcm1p c3Npb25VdGlsaXRpZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9NZWRpYVBlcm1p c3Npb25VdGlsaXRpZXMuaApAQCAtNjIsNiArNjIsOCBAQCBib29sIGNoZWNrU2FuZGJveFJlcXVp cmVtZW50Rm9yVHlwZShNZWRpYVBlcm1pc3Npb25UeXBlKTsKIGJvb2wgY2hlY2tVc2FnZURlc2Ny aXB0aW9uU3RyaW5nRm9yVHlwZShNZWRpYVBlcm1pc3Npb25UeXBlKTsKIGJvb2wgY2hlY2tVc2Fn ZURlc2NyaXB0aW9uU3RyaW5nRm9yU3BlZWNoUmVjb2duaXRpb24oKTsKIAorTlNTdHJpbmcgKmFw cGxpY2F0aW9uVmlzaWJsZU5hbWVGcm9tT3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luRGF0YSYpOworTlNTdHJpbmcgKmFwcGxpY2F0aW9uVmlzaWJsZU5hbWUoKTsKIHZvaWQgYWxl cnRGb3JQZXJtaXNzaW9uKFdlYlBhZ2VQcm94eSYsIE1lZGlhUGVybWlzc2lvblJlYXNvbiwgY29u c3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChi b29sKT4mJik7CiAjZW5kaWYKIAo=