239021 2022-04-08 16:35:06 -0700 Avoid redundant calls to findHTTPHeaderName() 2022-04-11 08:34:00 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ews-watchlist ggaren toyoshim webkit-bug-importer youennf yutak oldest_to_newest 1859935 0 cdumez 2022-04-08 16:35:06 -0700 Avoid redundant calls to findHTTPHeaderName(). 1859936 1 457127 cdumez 2022-04-08 16:41:06 -0700 Created attachment 457127 Patch 1860156 2 457127 darin 2022-04-10 15:46:11 -0700 Comment on attachment 457127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457127&action=review > Source/WebCore/ChangeLog:3 > + Avoid redundant calls to findHTTPHeaderName() Can some of this be changed to use StringView later? 1860161 3 cdumez 2022-04-10 16:03:14 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 457127 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457127&action=review > > > Source/WebCore/ChangeLog:3 > > + Avoid redundant calls to findHTTPHeaderName() > > Can some of this be changed to use StringView later? What part? findHTTPHeaderName() already takes a Stringview: Source/WebCore/platform/network/create-http-header-name-table:bool findHTTPHeaderName(StringView stringView, HTTPHeaderName& headerName) 1860169 4 ews-feeder 2022-04-10 16:55:41 -0700 Committed r292692 (249484@main): <https://commits.webkit.org/249484@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457127. 1860172 5 webkit-bug-importer 2022-04-10 17:03:58 -0700 <rdar://problem/91540482> 1860291 6 457127 darin 2022-04-11 08:34:00 -0700 Comment on attachment 457127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457127&action=review >>> Source/WebCore/ChangeLog:3 >>> + Avoid redundant calls to findHTTPHeaderName() >> >> Can some of this be changed to use StringView later? > > What part? findHTTPHeaderName() already takes a Stringview: > Source/WebCore/platform/network/create-http-header-name-table:bool findHTTPHeaderName(StringView stringView, HTTPHeaderName& headerName) For example, setHTTPHeaderField and addHTTPHeaderField. It requires making arguments into String if they aren’t known HTTP header names, but do those String objects get kept around? It’s good we don’t do it with string literals, but what about other sources of strings? And what about the value? Does it get stored as a String or some other way? I think there are still extra String involved in those functions. 457127 2022-04-08 16:41:06 -0700 2022-04-10 16:55:42 -0700 Patch bug-239021-20220408164105.patch text/plain 12163 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE5ODQ5ZGNmMTFkN2I4 MmU1YmE4ODE3M2UzNjgzYTk5ZWI1MzVkNy4uMmMyZWNiMDg1MDlkNmJmOTc3Y2RhMDc5NTFkODBm N2QyZThjMDgyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTA0LTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgcmVkdW5kYW50IGNh bGxzIHRvIGZpbmRIVFRQSGVhZGVyTmFtZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkwMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTb21lIGNhbGwgc2l0ZXMgb2YgSFRUUEhlYWRlck1hcDo6YWRk KCkgLyBzZXQoKSBvciBSZXNvdXJjZVJlc3BvbnNlOjphZGRIVFRQSGVhZGVyRmllbGQoKSAvIHNl dEhUVFBIZWFkZXJGaWVsZCgpCisgICAgICAgIGhhdmUgYWxyZWFkeSBjYWxsZWQgZmluZEhUVFBI ZWFkZXJOYW1lKCkgYW5kIGRldGVybWluZWQgdGhhdCB0aGlzIHdhc24ndCBhIGNvbW1vbiBoZWFk ZXIuIEFzIGEgcmVzdWx0LCB3ZSB3ZXJlCisgICAgICAgIGRvaW5nIHJlZHVuZGFudCBmaW5kSFRU UEhlYWRlck5hbWUoKSBjaGVja3MgaW5zaWRlIHRob3NlIGZ1bmN0aW9ucy4gVG8gYXZvaWQgdGhp cywgYWRkIG92ZXJsb2FkcyB0aGF0IHRha2UgaW4KKyAgICAgICAgYSBoZWFkZXIgdGhhdCB3ZSBh bHJlYWR5IGtub3cgaXMgdW5jb21tb24uCisKKyAgICAgICAgKiBNb2R1bGVzL2ZldGNoL0ZldGNo SGVhZGVycy5jcHA6CisgICAgICAgIChXZWJDb3JlOjphcHBlbmRUb0hlYWRlck1hcCk6CisgICAg ICAgIChXZWJDb3JlOjpGZXRjaEhlYWRlcnM6OmZpbHRlckFuZEZpbGwpOgorICAgICAgICAqIE1v ZHVsZXMvZmV0Y2gvRmV0Y2hSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGZXRjaFJl c3BvbnNlOjpyZXNvdXJjZVJlc3BvbnNlIGNvbnN0KToKKyAgICAgICAgKiBNb2R1bGVzL3dlYnNv Y2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tl dEhhbmRzaGFrZTo6cmVhZEhUVFBIZWFkZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L0NhY2hlVmFsaWRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1cGRhdGVSZXNwb25zZUhl YWRlcnNBZnRlclJldmFsaWRhdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9IVFRQ SGVhZGVyTWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUVFBIZWFkZXJNYXA6OnNldFVuY29t bW9uSGVhZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUVFBIZWFkZXJNYXA6OmFkZCk6CisgICAg ICAgIChXZWJDb3JlOjpIVFRQSGVhZGVyTWFwOjphZGRVbmNvbW1vbkhlYWRlcik6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmg6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlQmFzZTo6c2V0SFRUUEhlYWRlckZpZWxkKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlUmVzcG9uc2VCYXNlOjpzZXRVbmNvbW1vbkhUVFBIZWFkZXJGaWVsZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFzZTo6YWRkSFRUUEhlYWRlckZpZWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VCYXNlOjphZGRVbmNvbW1vbkhUVFBI ZWFkZXJGaWVsZCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl QmFzZS5oOgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJKb2I6OmZldGNoU2NyaXB0V2l0aENvbnRl eHQpOgorCiAyMDIyLTA0LTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgRmluaXNoIHBvcnRpbmcgY29kZSBiYXNlIHRvIFN0cmluZzo6ZnJvbUxhdGluMSgpIGFu ZCBtYWtlIFN0cmluZyhjb25zdCBjaGFyKikgcHJpdmF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9mZXRjaC9GZXRjaEhlYWRlcnMuY3BwCmluZGV4IDI2YWYwOGYxYWQ1ZTE0Y2JkMWFlZDc0 ZWZkZWEzZjFhZDM4YmU2MTUuLmVhZDY1OTU4NzA2MTljOGY3ZjI0Yzg0Mzg1M2JmOWY1OGJjMGM2 MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hIZWFkZXJz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSGVhZGVycy5jcHAK QEAgLTg3LDcgKzg3LDcgQEAgc3RhdGljIEV4Y2VwdGlvbk9yPHZvaWQ+IGFwcGVuZFRvSGVhZGVy TWFwKGNvbnN0IEhUVFBIZWFkZXJNYXA6OkhUVFBIZWFkZXJNYXBDb24KICAgICBpZiAoaGVhZGVy LmtleUFzSFRUUEhlYWRlck5hbWUpCiAgICAgICAgIGhlYWRlcnMuYWRkKGhlYWRlci5rZXlBc0hU VFBIZWFkZXJOYW1lLnZhbHVlKCksIGhlYWRlci52YWx1ZSk7CiAgICAgZWxzZQotICAgICAgICBo ZWFkZXJzLmFkZChoZWFkZXIua2V5LCBoZWFkZXIudmFsdWUpOworICAgICAgICBoZWFkZXJzLmFk ZFVuY29tbW9uSGVhZGVyKGhlYWRlci5rZXksIGhlYWRlci52YWx1ZSk7CiAKICAgICBpZiAoZ3Vh cmQgPT0gRmV0Y2hIZWFkZXJzOjpHdWFyZDo6UmVxdWVzdE5vQ29ycykKICAgICAgICAgcmVtb3Zl UHJpdmlsZWdlZE5vQ09SU1JlcXVlc3RIZWFkZXJzKGhlYWRlcnMpOwpAQCAtMjE4LDcgKzIxOCw3 IEBAIHZvaWQgRmV0Y2hIZWFkZXJzOjpmaWx0ZXJBbmRGaWxsKGNvbnN0IEhUVFBIZWFkZXJNYXAm IGhlYWRlcnMsIEd1YXJkIGd1YXJkKQogICAgICAgICBpZiAoaGVhZGVyLmtleUFzSFRUUEhlYWRl ck5hbWUpCiAgICAgICAgICAgICBtX2hlYWRlcnMuYWRkKGhlYWRlci5rZXlBc0hUVFBIZWFkZXJO YW1lLnZhbHVlKCksIGhlYWRlci52YWx1ZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1f aGVhZGVycy5hZGQoaGVhZGVyLmtleSwgaGVhZGVyLnZhbHVlKTsKKyAgICAgICAgICAgIG1faGVh ZGVycy5hZGRVbmNvbW1vbkhlYWRlcihoZWFkZXIua2V5LCBoZWFkZXIudmFsdWUpOwogICAgIH0K IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlc3Bv bnNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hSZXNwb25zZS5jcHAK aW5kZXggYjY0NjI2NWZjZTU0Yzg3YjU5M2FjNmI2NGIzY2I1ZDZhMDM3YmVjMS4uZTQ4M2NlODQw M2YxNTM2MGRjZTdiYjQxYjM1YzM4MTgzZmJiYTA4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlc3BvbnNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuY3BwCkBAIC01MzgsOCArNTM4LDEyIEBAIFJlc291 cmNlUmVzcG9uc2UgRmV0Y2hSZXNwb25zZTo6cmVzb3VyY2VSZXNwb25zZSgpIGNvbnN0CiAKICAg ICBpZiAoaGVhZGVycygpLmd1YXJkKCkgIT0gRmV0Y2hIZWFkZXJzOjpHdWFyZDo6SW1tdXRhYmxl KSB7CiAgICAgICAgIC8vIEZJWE1FOiBBZGQgYSBzZXRIVFRQSGVhZGVyRmllbGRzIG9uIFJlc291 cmNlUmVzcG9uc2VCYXNlLgotICAgICAgICBmb3IgKGF1dG8mIGhlYWRlciA6IGhlYWRlcnMoKS5p bnRlcm5hbEhlYWRlcnMoKSkKLSAgICAgICAgICAgIHJlc3BvbnNlLnNldEhUVFBIZWFkZXJGaWVs ZChoZWFkZXIua2V5LCBoZWFkZXIudmFsdWUpOworICAgICAgICBmb3IgKGF1dG8mIGhlYWRlciA6 IGhlYWRlcnMoKS5pbnRlcm5hbEhlYWRlcnMoKSkgeworICAgICAgICAgICAgaWYgKGhlYWRlci5r ZXlBc0hUVFBIZWFkZXJOYW1lKQorICAgICAgICAgICAgICAgIHJlc3BvbnNlLnNldEhUVFBIZWFk ZXJGaWVsZCgqaGVhZGVyLmtleUFzSFRUUEhlYWRlck5hbWUsIGhlYWRlci52YWx1ZSk7CisgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgcmVzcG9uc2Uuc2V0VW5jb21tb25IVFRQSGVh ZGVyRmllbGQoaGVhZGVyLmtleSwgaGVhZGVyLnZhbHVlKTsKKyAgICAgICAgfQogICAgIH0KIAog ICAgIHJldHVybiByZXNwb25zZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHAKaW5kZXggM2U0YzU4MTEyYTNjMTlk MmIyNDg3MzQ2NTUwZTU1OGM0ZWE3Y2YyMy4uYzMwN2FjMzNlM2ExZjBjNjE3MzA5ZDBjMzg1OGEw NGI3ZDk1MzkxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRz L1dlYlNvY2tldEhhbmRzaGFrZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJz b2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHAKQEAgLTQ1Myw3ICs0NTMsNyBAQCBjb25zdCB1 aW50OF90KiBXZWJTb2NrZXRIYW5kc2hha2U6OnJlYWRIVFRQSGVhZGVycyhjb25zdCB1aW50OF90 KiBzdGFydCwgY29uc3QgdQogICAgICAgICBIVFRQSGVhZGVyTmFtZSBoZWFkZXJOYW1lOwogICAg ICAgICBpZiAoIWZpbmRIVFRQSGVhZGVyTmFtZShuYW1lLCBoZWFkZXJOYW1lKSkgewogICAgICAg ICAgICAgLy8gRXZpZGVuY2UgaW4gdGhlIHdpbGQgc2hvd3MgdGhhdCBzZXJ2aWNlcyBtYWtlIHVz ZSBvZiBjdXN0b20gaGVhZGVycyBpbiB0aGUgaGFuZHNoYWtlCi0gICAgICAgICAgICBtX3NlcnZl ckhhbmRzaGFrZVJlc3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZChuYW1lLnRvU3RyaW5nKCksIHZh bHVlKTsKKyAgICAgICAgICAgIG1fc2VydmVySGFuZHNoYWtlUmVzcG9uc2UuYWRkVW5jb21tb25I VFRQSGVhZGVyRmllbGQobmFtZS50b1N0cmluZygpLCB2YWx1ZSk7CiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL0NhY2hlVmFsaWRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0NhY2hlVmFsaWRhdGlvbi5jcHAKaW5kZXggZTkzMDJjM2U3YTlmYzVmNmUxNWIyZTRhNTll NzMxZGVmYWM5YmRlOS4uODVlMjRhNGE3ZmM4MGM2NTZjZjQ4ODhlOTI3YWIwYjViYjA0ZjVhMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9DYWNoZVZhbGlkYXRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ2FjaGVWYWxpZGF0 aW9uLmNwcApAQCAtOTMsNyArOTMsMTAgQEAgdm9pZCB1cGRhdGVSZXNwb25zZUhlYWRlcnNBZnRl clJldmFsaWRhdGlvbihSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgUmUKICAgICAg ICAgLy8gd2UgY2FyZSBhYm91dC4KICAgICAgICAgaWYgKCFzaG91bGRVcGRhdGVIZWFkZXJBZnRl clJldmFsaWRhdGlvbihoZWFkZXIua2V5KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICByZXNwb25zZS5zZXRIVFRQSGVhZGVyRmllbGQoaGVhZGVyLmtleSwgaGVhZGVyLnZhbHVlKTsK KyAgICAgICAgaWYgKGhlYWRlci5rZXlBc0hUVFBIZWFkZXJOYW1lKQorICAgICAgICAgICAgcmVz cG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKCpoZWFkZXIua2V5QXNIVFRQSGVhZGVyTmFtZSwgaGVh ZGVyLnZhbHVlKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgcmVzcG9uc2Uuc2V0VW5jb21t b25IVFRQSGVhZGVyRmllbGQoaGVhZGVyLmtleSwgaGVhZGVyLnZhbHVlKTsKICAgICB9CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1h cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJNYXAuY3Bw CmluZGV4IGE2Y2RjYmI0ZDQ1MWI3M2U4NjdhYTUwNWMxYmU4MGUxZjEwNzk1MWEuLmYxNjk2Nzdl NjYxNTEwYjIyNWI4OTljNzliNjhkMDQwMTc5YTA5N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1hcC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmNwcApAQCAtMTA5LDYgKzEwOSwxMSBA QCB2b2lkIEhUVFBIZWFkZXJNYXA6OnNldChjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmlu ZyYgdmFsdWUpCiAKIHZvaWQgSFRUUEhlYWRlck1hcDo6c2V0VW5jb21tb25IZWFkZXIoY29uc3Qg U3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKQogeworI2lmIEFTU0VSVF9FTkFCTEVE CisgICAgSFRUUEhlYWRlck5hbWUgaGVhZGVyTmFtZTsKKyAgICBBU1NFUlQoIWZpbmRIVFRQSGVh ZGVyTmFtZShuYW1lLCBoZWFkZXJOYW1lKSk7CisjZW5kaWYKKwogICAgIGF1dG8gaW5kZXggPSBt X3VuY29tbW9uSGVhZGVycy5maW5kSWYoWyZdKGF1dG8mIGhlYWRlcikgewogICAgICAgICByZXR1 cm4gZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShoZWFkZXIua2V5LCBuYW1lKTsKICAgICB9KTsKQEAg LTEyNSw2ICsxMzAsMTYgQEAgdm9pZCBIVFRQSGVhZGVyTWFwOjphZGQoY29uc3QgU3RyaW5nJiBu YW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKQogICAgICAgICBhZGQoaGVhZGVyTmFtZSwgdmFsdWUp OwogICAgICAgICByZXR1cm47CiAgICAgfQorICAgIGFkZFVuY29tbW9uSGVhZGVyKG5hbWUsIHZh bHVlKTsKK30KKwordm9pZCBIVFRQSGVhZGVyTWFwOjphZGRVbmNvbW1vbkhlYWRlcihjb25zdCBT dHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCit7CisjaWYgQVNTRVJUX0VOQUJMRUQK KyAgICBIVFRQSGVhZGVyTmFtZSBoZWFkZXJOYW1lOworICAgIEFTU0VSVCghZmluZEhUVFBIZWFk ZXJOYW1lKG5hbWUsIGhlYWRlck5hbWUpKTsKKyNlbmRpZgorCiAgICAgYXV0byBpbmRleCA9IG1f dW5jb21tb25IZWFkZXJzLmZpbmRJZihbJl0oYXV0byYgaGVhZGVyKSB7CiAgICAgICAgIHJldHVy biBlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGhlYWRlci5rZXksIG5hbWUpOwogICAgIH0pOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJNYXAuaAppbmRleCA2 ZGE3MDNmZjRkNmM0MWNlNTI5ZTExMThhM2Q3MGI3ZDUyMGY3ZmY2Li45YWFmN2YxNDIyMDQwOThm YTMzYzJhMGI1ZDcyMDUyMWJlMjU0OTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJNYXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL0hUVFBIZWFkZXJNYXAuaApAQCAtMTU3LDYgKzE1Nyw4IEBAIHB1YmxpYzoKICAg ICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgZ2V0KFN0cmluZ1ZpZXcgbmFtZSkgY29uc3Q7CiAgICAg V0VCQ09SRV9FWFBPUlQgdm9pZCBzZXQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHZhbHVlKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFkZChjb25zdCBTdHJpbmcmIG5hbWUs IGNvbnN0IFN0cmluZyYgdmFsdWUpOworICAgIHZvaWQgc2V0VW5jb21tb25IZWFkZXIoY29uc3Qg U3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKKyAgICB2b2lkIGFkZFVuY29tbW9u SGVhZGVyKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBhcHBlbmQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHZhbHVlKTsKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYp IGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgcmVtb3ZlKGNvbnN0IFN0cmluZyYpOwpA QCAtMjEzLDcgKzIxNSw2IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgRGVjb2Rlcj4g c3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZShEZWNvZGVyJiwgSFRUUEhlYWRl ck1hcCYpOwogCiBwcml2YXRlOgotICAgIHZvaWQgc2V0VW5jb21tb25IZWFkZXIoY29uc3QgU3Ry aW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKICAgICBXRUJDT1JFX0VYUE9SVCBTdHJp bmcgZ2V0VW5jb21tb25IZWFkZXIoU3RyaW5nVmlldyBuYW1lKSBjb25zdDsKIAogICAgIENvbW1v bkhlYWRlcnNWZWN0b3IgbV9jb21tb25IZWFkZXJzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcAppbmRleCA1YTgy N2ZiODZjZDM0ZTRlOGI0YjBiM2ZkZTU4ODk1NTg1NGI1NGM0Li5kMDY2ZWE0NzJjNTRlNjUyMDc5 ZGJhNDE4YWIyNDdhODNmYTgyMjViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcApAQCAtNTY2LDEzICs1NjYs MTggQEAgdm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6dXBkYXRlSGVhZGVyUGFyc2VkU3RhdGUo SFRUUEhlYWRlck5hbWUgbmFtZSkKIAogdm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6c2V0SFRU UEhlYWRlckZpZWxkKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsK LSAgICBsYXp5SW5pdChBbGxGaWVsZHMpOwotCiAgICAgSFRUUEhlYWRlck5hbWUgaGVhZGVyTmFt ZTsKICAgICBpZiAoZmluZEhUVFBIZWFkZXJOYW1lKG5hbWUsIGhlYWRlck5hbWUpKQotICAgICAg ICB1cGRhdGVIZWFkZXJQYXJzZWRTdGF0ZShoZWFkZXJOYW1lKTsKKyAgICAgICAgc2V0SFRUUEhl YWRlckZpZWxkKGhlYWRlck5hbWUsIHZhbHVlKTsKKyAgICBlbHNlCisgICAgICAgIHNldFVuY29t bW9uSFRUUEhlYWRlckZpZWxkKG5hbWUsIHZhbHVlKTsKK30KIAotICAgIG1faHR0cEhlYWRlckZp ZWxkcy5zZXQobmFtZSwgdmFsdWUpOwordm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6c2V0VW5j b21tb25IVFRQSGVhZGVyRmllbGQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZh bHVlKQoreworICAgIGxhenlJbml0KEFsbEZpZWxkcyk7CisKKyAgICBtX2h0dHBIZWFkZXJGaWVs ZHMuc2V0VW5jb21tb25IZWFkZXIobmFtZSwgdmFsdWUpOwogCiAgICAgLy8gRklYTUU6IFNob3Vs ZCBpbnZhbGlkYXRlIG9yIHVwZGF0ZSBwbGF0Zm9ybSByZXNwb25zZSBpZiBwcmVzZW50LgogfQpA QCAtNjA3LDEwICs2MTIsMTQgQEAgdm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6YWRkSFRUUEhl YWRlckZpZWxkKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJgogICAgIEhUVFBIZWFk ZXJOYW1lIGhlYWRlck5hbWU7CiAgICAgaWYgKGZpbmRIVFRQSGVhZGVyTmFtZShuYW1lLCBoZWFk ZXJOYW1lKSkKICAgICAgICAgYWRkSFRUUEhlYWRlckZpZWxkKGhlYWRlck5hbWUsIHZhbHVlKTsK LSAgICBlbHNlIHsKLSAgICAgICAgbGF6eUluaXQoQWxsRmllbGRzKTsKLSAgICAgICAgbV9odHRw SGVhZGVyRmllbGRzLmFkZChuYW1lLCB2YWx1ZSk7Ci0gICAgfQorICAgIGVsc2UKKyAgICAgICAg YWRkVW5jb21tb25IVFRQSGVhZGVyRmllbGQobmFtZSwgdmFsdWUpOworfQorCit2b2lkIFJlc291 cmNlUmVzcG9uc2VCYXNlOjphZGRVbmNvbW1vbkhUVFBIZWFkZXJGaWVsZChjb25zdCBTdHJpbmcm IG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCit7CisgICAgbGF6eUluaXQoQWxsRmllbGRzKTsK KyAgICBtX2h0dHBIZWFkZXJGaWVsZHMuYWRkVW5jb21tb25IZWFkZXIobmFtZSwgdmFsdWUpOwog fQogCiBjb25zdCBIVFRQSGVhZGVyTWFwJiBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6aHR0cEhlYWRl ckZpZWxkcygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKaW5kZXggMTE2ZmQ5Y2JhYjE0ZTBiNTAxNTRiYzYz ZDBjNzJiZDNiMjRlYTFlMC4uOTM4MjdkMzA5Y2E5MjkzNDg2YTNlY2NiZTNlMGM1YWI1NDk0Mzkw MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJl c3BvbnNlQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VSZXNwb25zZUJhc2UuaApAQCAtMTIyLDEwICsxMjIsMTIgQEAgcHVibGljOgogICAgIFN0cmlu ZyBodHRwSGVhZGVyRmllbGQoU3RyaW5nVmlldyBuYW1lKSBjb25zdDsKICAgICBXRUJDT1JFX0VY UE9SVCBTdHJpbmcgaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lKSBjb25zdDsKICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHNldEhUVFBIZWFkZXJGaWVsZChjb25zdCBTdHJpbmcmIG5hbWUs IGNvbnN0IFN0cmluZyYgdmFsdWUpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0VW5jb21t b25IVFRQSGVhZGVyRmllbGQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVl KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVy TmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFk ZEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBhZGRIVFRQSGVhZGVyRmllbGQoY29uc3QgU3RyaW5nJiBu YW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFkZFVu Y29tbW9uSFRUUEhlYWRlckZpZWxkKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2 YWx1ZSk7CiAKICAgICAvLyBJbnN0ZWFkIG9mIHBhc3NpbmcgYSBzdHJpbmcgbGl0ZXJhbCB0byBh bnkgb2YgdGhlc2UgZnVuY3Rpb25zLCBqdXN0IHVzZSBhIEhUVFBIZWFkZXJOYW1lIGluc3RlYWQu CiAgICAgdGVtcGxhdGU8c2l6ZV90IGxlbmd0aD4gU3RyaW5nIGh0dHBIZWFkZXJGaWVsZChjb25z dCBjaGFyICgmKVtsZW5ndGhdKSBjb25zdCA9IGRlbGV0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iLmNwcAppbmRleCAxZTJjNjdjYTUz YTBhYWVkZDQyZTRmNjA4NDM5ODRiNmZjMTE5YzU4Li44MDRlNmY0YzA4NGIwYjEzZTRkYWEwODUw YTUwODZhNjRhOTdiMjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZp Y2UvU2VydmljZVdvcmtlckpvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2 aWNlL1NlcnZpY2VXb3JrZXJKb2IuY3BwCkBAIC0xMDUsNyArMTA1LDcgQEAgdm9pZCBTZXJ2aWNl V29ya2VySm9iOjpmZXRjaFNjcmlwdFdpdGhDb250ZXh0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQm IGNvbnRleHQsIEYKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0IHsgbV9qb2JEYXRhLnNj cmlwdFVSTCB9OwogICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9ySWRlbnRpZmllcihjb250ZXh0LnJl c291cmNlUmVxdWVzdElkZW50aWZpZXIoKSk7Ci0gICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmll bGQoIlNlcnZpY2UtV29ya2VyIl9zLCAic2NyaXB0Il9zKTsKKyAgICByZXF1ZXN0LmFkZEhUVFBI ZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6U2VydmljZVdvcmtlciwgInNjcmlwdCJfcyk7CiAK ICAgICBGZXRjaE9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLm1vZGUgPSBGZXRjaE9wdGlv bnM6Ok1vZGU6OlNhbWVPcmlnaW47Cg==