167302 2017-01-23 02:43:55 -0800 [SOUP] DNS prefetch is always done in the default session 2017-01-23 07:13:41 -0800 1 1 1 Unclassified WebKit Platform WebKit Local Build Unspecified Unspecified NEW Soup P2 Normal --- 1 cgarcia webkit-unassigned achristensen berto bugs-noreply commit-queue danw galpeter gustavo mcatanzaro mrobinson oldest_to_newest 1269024 0 cgarcia 2017-01-23 02:43:55 -0800 DNS::prefetchDNS() should receive a SessionID. 1269025 1 299510 cgarcia 2017-01-23 02:58:01 -0800 Created attachment 299510 Patch 1269026 2 commit-queue 2017-01-23 03:00:20 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1269036 3 299510 svillar 2017-01-23 06:42:35 -0800 Comment on attachment 299510 Patch Not sure we want to enable dns prefetch for private sessions for example. It might be a way to fingerprint users, something that goes against the purpose of private sessions. 1269037 4 mcatanzaro 2017-01-23 06:48:02 -0800 Yes, we should not prefetch at all in ephemeral sessions. 1269039 5 cgarcia 2017-01-23 07:06:51 -0800 Godd point, then we should still receive the session id to check if it's ephemeral and do nothing, there's no point of prefetch on the default session when in private session, no? 1269040 6 mcatanzaro 2017-01-23 07:11:32 -0800 (In reply to comment #5) > there's no point of prefetch on the default > session when in private session, no? The point is to not leak hosts that have not even been visited via DNS. So yes, I would not do it at all. 1269041 7 mcatanzaro 2017-01-23 07:12:16 -0800 (I don't think the session the prefetch occurs in matters at all, by the way, since the DNS cache is system-wide.) 1269042 8 cgarcia 2017-01-23 07:13:41 -0800 (In reply to comment #7) > (I don't think the session the prefetch occurs in matters at all, by the > way, since the DNS cache is system-wide.) Ah! I thought it was per session. 299510 2017-01-23 02:58:01 -0800 2017-01-23 07:07:07 -0800 Patch wk2-prefetch-dns-session.diff text/plain 21970 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YmI5OGE2NGIxMi4uNDI2ZTEwZWNiN2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyOSBAQAogMjAxNy0wMS0yMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW1NPVVBdIEROUyBwcmVmZXRjaCBpcyBhbHdheXMgZG9uZSBp biB0aGUgZGVmYXVsdCBzZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjczMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWJDb3JlOjpwcmVmZXRjaEROUygpIHNob3VsZCByZWNlaXZlIGEgU2Vz c2lvbklELgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ETlMuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL0ROU1Jlc29sdmVRdWV1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE TlNSZXNvbHZlUXVldWU6OmFkZCk6IFF1ZXVlIGEgcGFpciBvZiBTZXNzaW9uSUQgYW5kIGhvc3Ru YW1lLgorICAgICAgICAoV2ViQ29yZTo6RE5TUmVzb2x2ZVF1ZXVlOjp0aW1lckZpcmVkKTogQ2Fs bCBwbGF0Zm9ybVJlc29sdmUgd2l0aCB0aGUgc2Vzc2lvbiBJRC4KKyAgICAgICAgKiBwbGF0Zm9y bS9uZXR3b3JrL0ROU1Jlc29sdmVRdWV1ZS5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv Y2YvRE5TQ0ZOZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE5TUmVzb2x2ZVF1ZXVlOjpwbGF0 Zm9ybVJlc29sdmUpOgorICAgICAgICAoV2ViQ29yZTo6cHJlZmV0Y2hETlMpOgorICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBy ZWZldGNoRE5TKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvRE5TU291cC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpETlNSZXNvbHZlUXVldWU6OnBsYXRmb3JtUmVzb2x2ZSk6IFVz ZSB0aGUgU291cFNlc3Npb24gZm9yIHRoZSBnaXZlbiBzZXNzaW9uIElEIGluc3RlYWQgb2YgdGhl IGRlZmF1bHQuCisgICAgICAgIChXZWJDb3JlOjpwcmVmZXRjaEROUyk6CisgICAgICAgIChXZWJD b3JlOjpyZXNvbHZlZENhbGxiYWNrKTogRGVsZXRlZC4KKworMjAxNy0wMS0yMyAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW1NPVVBdIEN1c3Rv bSBwcm90b2NvbHMgZG9uJ3Qgd29yayBpbiBwcml2YXRlIGJyb3dzaW5nIG1vZGUKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzIzNgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0ROUy5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ETlMuaAppbmRleCAyOTBmNDA2MzRjOC4uOTFjYTNkMDBmOWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRE5TLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ETlMuaApAQCAtMjMsMTQgKzIzLDEyIEBA CiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5kZWYgRE5TX2gKLSNkZWZpbmUgRE5TX2gKKyNw cmFnbWEgb25jZQogCisjaW5jbHVkZSAiU2Vzc2lvbklELmgiCiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1XRUJDT1JFX0VYUE9SVCB2b2lkIHByZWZl dGNoRE5TKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpOworV0VCQ09SRV9FWFBPUlQgdm9pZCBwcmVm ZXRjaEROUyhTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpOwogfQotCi0jZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRE5TUmVzb2x2ZVF1 ZXVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRE5TUmVzb2x2ZVF1ZXVl LmNwcAppbmRleCA1ODc3M2FhMzMyOS4uZDEwZDIzMmVkMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRE5TUmVzb2x2ZVF1ZXVlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0ROU1Jlc29sdmVRdWV1ZS5jcHAKQEAgLTgzLDE0ICs4 MywxNCBAQCBib29sIEROU1Jlc29sdmVRdWV1ZTo6aXNVc2luZ1Byb3h5KCkKICAgICByZXR1cm4g bV9pc1VzaW5nUHJveHk7CiB9CiAKLXZvaWQgRE5TUmVzb2x2ZVF1ZXVlOjphZGQoY29uc3QgU3Ry aW5nJiBob3N0bmFtZSkKK3ZvaWQgRE5TUmVzb2x2ZVF1ZXVlOjphZGQoU2Vzc2lvbklEIHNlc3Np b25JRCwgY29uc3QgU3RyaW5nJiBob3N0bmFtZSkKIHsKICAgICAvLyBJZiB0aGVyZSBhcmUgbm8g bmFtZXMgcXVldWVkLCBhbmQgZmV3IGVub3VnaCBhcmUgaW4gZmxpZ2h0LCByZXNvbHZlIGltbWVk aWF0ZWx5ICh0aGUgbW91c2UgbWF5IGJlIG92ZXIgYSBsaW5rKS4KLSAgICBpZiAoIW1fbmFtZXMu c2l6ZSgpKSB7CisgICAgaWYgKG1fbmFtZXMuaXNFbXB0eSgpKSB7CiAgICAgICAgIGlmIChpc1Vz aW5nUHJveHkoKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgaWYgKCsrbV9yZXF1ZXN0 c0luRmxpZ2h0IDw9IGdOYW1lc1RvUmVzb2x2ZUltbWVkaWF0ZWx5KSB7Ci0gICAgICAgICAgICBw bGF0Zm9ybVJlc29sdmUoaG9zdG5hbWUpOworICAgICAgICAgICAgcGxhdGZvcm1SZXNvbHZlKHNl c3Npb25JRCwgaG9zdG5hbWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg ICAgIC0tbV9yZXF1ZXN0c0luRmxpZ2h0OwpAQCAtOTksNyArOTksNyBAQCB2b2lkIEROU1Jlc29s dmVRdWV1ZTo6YWRkKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiAgICAgLy8gSXQncyBiZXR0ZXIg dG8gbm90IHByZWZldGNoIHNvbWUgbmFtZXMgdGhhbiB0byBjbG9nIHRoZSBxdWV1ZS4KICAgICAv LyBEcm9wcGluZyB0aGUgbmV3ZXN0IG5hbWVzLCBiZWNhdXNlIG9uIGEgc2luZ2xlIHBhZ2UsIHRo ZXNlIGFyZSBsaWtlbHkgdG8gYmUgYmVsb3cgb2xkZXN0IG9uZXMuCiAgICAgaWYgKG1fbmFtZXMu c2l6ZSgpIDwgZ01heFJlcXVlc3RzVG9RdWV1ZSkgewotICAgICAgICBtX25hbWVzLmFkZChob3N0 bmFtZSk7CisgICAgICAgIG1fbmFtZXMuYWRkKHN0ZDo6bWFrZV9wYWlyKHNlc3Npb25JRCwgaG9z dG5hbWUpKTsKICAgICAgICAgaWYgKCFtX3RpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgICAgICBt X3RpbWVyLnN0YXJ0T25lU2hvdChnQ29hbGVzY2VEZWxheUluU2Vjb25kcyk7CiAgICAgfQpAQCAt MTE2LDkgKzExNiw4IEBAIHZvaWQgRE5TUmVzb2x2ZVF1ZXVlOjp0aW1lckZpcmVkKCkKIAogICAg IGZvciAoOyAhbV9uYW1lcy5pc0VtcHR5KCkgJiYgcmVxdWVzdHNBbGxvd2VkID4gMDsgLS1yZXF1 ZXN0c0FsbG93ZWQpIHsKICAgICAgICAgKyttX3JlcXVlc3RzSW5GbGlnaHQ7Ci0gICAgICAgIEhh c2hTZXQ8U3RyaW5nPjo6aXRlcmF0b3IgY3VycmVudE5hbWUgPSBtX25hbWVzLmJlZ2luKCk7Ci0g ICAgICAgIHBsYXRmb3JtUmVzb2x2ZSgqY3VycmVudE5hbWUpOwotICAgICAgICBtX25hbWVzLnJl bW92ZShjdXJyZW50TmFtZSk7CisgICAgICAgIGF1dG8gc2Vzc2lvbkFuZEhvc3RQYWlyID0gbV9u YW1lcy50YWtlQW55KCk7CisgICAgICAgIHBsYXRmb3JtUmVzb2x2ZShzZXNzaW9uQW5kSG9zdFBh aXIuZmlyc3QsIHNlc3Npb25BbmRIb3N0UGFpci5zZWNvbmQpOwogICAgIH0KIAogICAgIGlmICgh bV9uYW1lcy5pc0VtcHR5KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL0ROU1Jlc29sdmVRdWV1ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ETlNSZXNvbHZlUXVldWUuaAppbmRleCBkMmE3YTc3YjhiYy4uZjJkN2RlOTE0Y2QgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRE5TUmVzb2x2ZVF1ZXVlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ETlNSZXNvbHZlUXVldWUuaApA QCAtMjcsNiArMjcsNyBAQAogI2lmbmRlZiBETlNSZXNvbHZlUXVldWVfaAogI2RlZmluZSBETlNS ZXNvbHZlUXVldWVfaAogCisjaW5jbHVkZSAiU2Vzc2lvbklELmgiCiAjaW5jbHVkZSAiVGltZXIu aCIKICNpbmNsdWRlIDxhdG9taWM+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTQxLDcg KzQyLDcgQEAgY2xhc3MgRE5TUmVzb2x2ZVF1ZXVlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgRE5T UmVzb2x2ZVF1ZXVlJiBzaW5nbGV0b24oKTsKIAotICAgIHZvaWQgYWRkKGNvbnN0IFN0cmluZyYg aG9zdG5hbWUpOworICAgIHZvaWQgYWRkKFNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBob3N0bmFt ZSk7CiAgICAgdm9pZCBkZWNyZW1lbnRSZXF1ZXN0Q291bnQoKQogICAgIHsKICAgICAgICAgLS1t X3JlcXVlc3RzSW5GbGlnaHQ7CkBAIC01MywxMyArNTQsMTMgQEAgcHJpdmF0ZToKICAgICBib29s IGlzVXNpbmdQcm94eSgpOwogCiAgICAgdm9pZCB1cGRhdGVJc1VzaW5nUHJveHkoKTsKLSAgICB2 b2lkIHBsYXRmb3JtUmVzb2x2ZShjb25zdCBTdHJpbmcmKTsKKyAgICB2b2lkIHBsYXRmb3JtUmVz b2x2ZShTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYpOwogCiAgICAgdm9pZCB0aW1lckZpcmVkKCk7 CiAKICAgICBUaW1lciBtX3RpbWVyOwogCi0gICAgSGFzaFNldDxTdHJpbmc+IG1fbmFtZXM7Cisg ICAgSGFzaFNldDxzdGQ6OnBhaXI8U2Vzc2lvbklELCBTdHJpbmc+PiBtX25hbWVzOwogICAgIHN0 ZDo6YXRvbWljPGludD4gbV9yZXF1ZXN0c0luRmxpZ2h0OwogICAgIGJvb2wgbV9pc1VzaW5nUHJv eHk7CiAgICAgZG91YmxlIG1fbGFzdFByb3h5RW5hYmxlZFN0YXR1c0NoZWNrVGltZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRE5TQ0ZOZXQuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9ETlNDRk5ldC5jcHAKaW5kZXggOTc5 YTU3ZDlkODIuLmRkMWQyZDI2MTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2NmL0ROU0NGTmV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NmL0ROU0NGTmV0LmNwcApAQCAtNzgsNyArNzgsNyBAQCBzdGF0aWMgdm9pZCBjbGll bnRDYWxsYmFjayhDRkhvc3RSZWYgdGhlSG9zdCwgQ0ZIb3N0SW5mb1R5cGUsIGNvbnN0IENGU3Ry ZWFtRXJybwogICAgIENGUmVsZWFzZSh0aGVIb3N0KTsKIH0KIAotdm9pZCBETlNSZXNvbHZlUXVl dWU6OnBsYXRmb3JtUmVzb2x2ZShjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQordm9pZCBETlNSZXNv bHZlUXVldWU6OnBsYXRmb3JtUmVzb2x2ZShTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYgaG9zdG5h bWUpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIApAQCAtMTAxLDEyICsxMDEsMTIg QEAgdm9pZCBETlNSZXNvbHZlUXVldWU6OnBsYXRmb3JtUmVzb2x2ZShjb25zdCBTdHJpbmcmIGhv c3RuYW1lKQogICAgIENGSG9zdFN0YXJ0SW5mb1Jlc29sdXRpb24obGVha2VkSG9zdCwga0NGSG9z dEFkZHJlc3NlcywgMCk7CiB9CiAKLXZvaWQgcHJlZmV0Y2hETlMoY29uc3QgU3RyaW5nJiBob3N0 bmFtZSkKK3ZvaWQgcHJlZmV0Y2hETlMoU2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgU3RyaW5n JiBob3N0bmFtZSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIGlmIChob3N0 bmFtZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKLSAgICBETlNSZXNvbHZlUXVldWU6OnNp bmdsZXRvbigpLmFkZChob3N0bmFtZSk7CisgICAgRE5TUmVzb2x2ZVF1ZXVlOjpzaW5nbGV0b24o KS5hZGQoc2Vzc2lvbklELCBob3N0bmFtZSk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcAppbmRleCA3OGY2Mzc3NDUzMS4uODQ0 NWNiZTBhNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9ETlNDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv RE5TQ3VybC5jcHAKQEAgLTMyLDcgKzMyLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi12 b2lkIHByZWZldGNoRE5TKGNvbnN0IFN0cmluZyYgLyogaG9zdG5hbWUgKi8pCit2b2lkIHByZWZl dGNoRE5TKFNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiAvKiBob3N0bmFtZSAqLykKIHsKICAgICBu b3RJbXBsZW1lbnRlZCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL0ROU1NvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9zb3VwL0ROU1NvdXAuY3BwCmluZGV4IGNhMTE0NTdkZGQyLi5iYTMxZDZmM2U2ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1NvdXAuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9ETlNTb3VwLmNwcApAQCAt ODYsMjUgKzg2LDI1IEBAIHZvaWQgRE5TUmVzb2x2ZVF1ZXVlOjp1cGRhdGVJc1VzaW5nUHJveHko KQogICAgIGdfcHJveHlfcmVzb2x2ZXJfbG9va3VwX2FzeW5jKHJlc29sdmVyLmdldCgpLCAiaHR0 cHM6Ly9leGFtcGxlLmNvbS8iLCBudWxscHRyLCBwcm94eVJlc29sdmVkRm9ySHR0cHNVcmlDYWxs YmFjaywgJm1faXNVc2luZ1Byb3h5KTsKIH0KIAotc3RhdGljIHZvaWQgcmVzb2x2ZWRDYWxsYmFj ayhTb3VwQWRkcmVzcyosIGd1aW50LCB2b2lkKikKLXsKLSAgICBETlNSZXNvbHZlUXVldWU6OnNp bmdsZXRvbigpLmRlY3JlbWVudFJlcXVlc3RDb3VudCgpOwotfQotCi12b2lkIEROU1Jlc29sdmVR dWV1ZTo6cGxhdGZvcm1SZXNvbHZlKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCit2b2lkIEROU1Jl c29sdmVRdWV1ZTo6cGxhdGZvcm1SZXNvbHZlKFNlc3Npb25JRCBzZXNzaW9uSUQsIGNvbnN0IFN0 cmluZyYgaG9zdG5hbWUpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAotICAgIHNv dXBfc2Vzc2lvbl9wcmVmZXRjaF9kbnMoTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3Rv cmFnZVNlc3Npb24oKS5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9u KCksIGhvc3RuYW1lLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIsIHJlc29sdmVkQ2FsbGJhY2ssIG51 bGxwdHIpOworICAgIGlmIChhdXRvKiBzdG9yYWdlU2Vzc2lvbiA9IE5ldHdvcmtTdG9yYWdlU2Vz c2lvbjo6c3RvcmFnZVNlc3Npb24oc2Vzc2lvbklEKSkgeworICAgICAgICBzb3VwX3Nlc3Npb25f cHJlZmV0Y2hfZG5zKHN0b3JhZ2VTZXNzaW9uLT5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lv bigpLnNvdXBTZXNzaW9uKCksIGhvc3RuYW1lLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIsIFtdKFNv dXBBZGRyZXNzKiwgZ3VpbnQsIHZvaWQqKSB7CisgICAgICAgICAgICBETlNSZXNvbHZlUXVldWU6 OnNpbmdsZXRvbigpLmRlY3JlbWVudFJlcXVlc3RDb3VudCgpOworICAgICAgICB9LCBudWxscHRy KTsKKyAgICB9IGVsc2UKKyAgICAgICAgRE5TUmVzb2x2ZVF1ZXVlOjpzaW5nbGV0b24oKS5kZWNy ZW1lbnRSZXF1ZXN0Q291bnQoKTsKIH0KIAotdm9pZCBwcmVmZXRjaEROUyhjb25zdCBTdHJpbmcm IGhvc3RuYW1lKQordm9pZCBwcmVmZXRjaEROUyhTZXNzaW9uSUQgc2Vzc2lvbklELCBjb25zdCBT dHJpbmcmIGhvc3RuYW1lKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgaWYg KGhvc3RuYW1lLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgRE5TUmVzb2x2ZVF1 ZXVlOjpzaW5nbGV0b24oKS5hZGQoaG9zdG5hbWUpOworICAgIEROU1Jlc29sdmVRdWV1ZTo6c2lu Z2xldG9uKCkuYWRkKHNlc3Npb25JRCwgaG9zdG5hbWUpOwogfQogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggNjAwYzE0YTIxN2QuLjkzYTEzYjg5OGIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTUgQEAKKzIwMTctMDEtMjMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtTT1VQXSBETlMgcHJlZmV0Y2ggaXMgYWx3YXlzIGRvbmUgaW4g dGhlIGRlZmF1bHQgc2Vzc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY3MzAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUGFzcyB0aGUgcGFnZSBzZXNzaW9uIElEIHRvIFdlYkNvcmU6OnByZWZldGNo RE5TKCksIG9yIHRoZSBkZWZhdWx0IG9uZSBpZiBwYWdlIGlzIG51bGxwdHIuCisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZy YW1lTG9hZGVyQ2xpZW50OjpwcmVmZXRjaEROUyk6CisKIDIwMTctMDEtMjAgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBQYXNzUmVmUHRyIGZyb20gInBh Z2UiIGRpcmVjdG9yeSBvZiBXZWJDb3JlLCBhbHNvIGRlcGxveSByZWZlcmVuY2VzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50Lm1tCmluZGV4IDc3ODRkMWNiMTIzLi44ODVlZjQwZGQ4NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0K QEAgLTIyOTQsNyArMjI5NCw4IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNvbnRlbnRG aWx0ZXJEaWRCbG9ja0xvYWQoV2ViQ29yZTo6Q29udGVudEZpbHRlclVuYmxvCiAKIHZvaWQgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OnByZWZldGNoRE5TKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiB7 Ci0gICAgV2ViQ29yZTo6cHJlZmV0Y2hETlMoaG9zdG5hbWUpOworICAgIGF1dG8qIHBhZ2UgPSBj b3JlKG1fd2ViRnJhbWUuZ2V0KCkpLT5wYWdlKCk7CisgICAgV2ViQ29yZTo6cHJlZmV0Y2hETlMo cGFnZSA/IHBhZ2UtPnNlc3Npb25JRCgpIDogU2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCks IGhvc3RuYW1lKTsKIH0KIAogQGltcGxlbWVudGF0aW9uIFdlYkZyYW1lUG9saWN5TGlzdGVuZXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwppbmRleCA3Y2VhNTRjMGIyMi4uZTg4YzgzYzMzODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNy0wMS0yMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW1NPVVBdIEROUyBwcmVmZXRjaCBpcyBh bHdheXMgZG9uZSBpbiB0aGUgZGVmYXVsdCBzZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjczMDIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXNzIHRoZSBwYWdlIHNlc3Npb24gSUQgdG8gV2Vi Q29yZTo6cHJlZmV0Y2hETlMoKSwgb3IgdGhlIGRlZmF1bHQgb25lIGlmIHBhZ2UgaXMgbnVsbHB0 ci4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoK KyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpwcmVmZXRjaEROUyk6CisKIDIwMTctMDEt MjAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBQYXNz UmVmUHRyIGZyb20gInBhZ2UiIGRpcmVjdG9yeSBvZiBXZWJDb3JlLCBhbHNvIGRlcGxveSByZWZl cmVuY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggM2QxM2NkNDQ2YzYuLjRmMzkzNWMzZDdjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwCkBAIC0xMzIyLDUgKzEzMjIsNiBAQCB2b2lkIFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBhY3Rpb24pCiAK IHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnByZWZldGNoRE5TKGNvbnN0IFN0cmluZyYgaG9z dG5hbWUpCiB7Ci0gICAgV2ViQ29yZTo6cHJlZmV0Y2hETlMoaG9zdG5hbWUpOworICAgIGF1dG8q IHBhZ2UgPSBtX3dlYkZyYW1lLT53ZWJWaWV3KCktPnBhZ2UoKTsKKyAgICBXZWJDb3JlOjpwcmVm ZXRjaEROUyhwYWdlID8gcGFnZS0+c2Vzc2lvbklEKCkgOiBTZXNzaW9uSUQ6OmRlZmF1bHRTZXNz aW9uSUQoKSwgaG9zdG5hbWUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGVmNjE2MDE2MjNkLi43NzJmMDQ0 N2JkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE3LTAxLTIzICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBbU09VUF0gRE5TIHBy ZWZldGNoIGlzIGFsd2F5cyBkb25lIGluIHRoZSBkZWZhdWx0IHNlc3Npb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzMwMgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cHJlZmV0Y2hETlMpOgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmg6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW46CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrUHJvY2Vzczo6cHJlZmV0Y2hETlMpOiBQYXNzIHRoZSBnaXZlbiBzZXNzaW9uIElE IHRvIFdlYkNvcmU6OnByZWZldGNoRE5TKCkuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Byb2Nlc3MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250 ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9wcmVmZXRjaF9kbnMpOiBTZW5k IHRoZSBXZWJDb250ZXh0IHNlc3Npb24gSUQgdG8gaW5qZWN0ZWQgYnVuZGxlLgorICAgICAgICAq IFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24uY3Bw OgorICAgICAgICAod2Via2l0V2ViRXh0ZW5zaW9uRGlkUmVjZWl2ZU1lc3NhZ2UpOiBHZXQgdGhl IGdpdmVuIHNlc3Npb24gSUQgYW5kIHBhc3MgaXQgdG8gV2ViUHJvY2Vzczo6cHJlZmV0Y2hETlMo KS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnByZWZldGNo RE5TKTogUGFzcyB0aGUgcGFnZSBzZXNzaW9uIElEIHRvIFdlYlByb2Nlc3M6OnByZWZldGNoRE5T KCksIG9yIHRoZSBkZWZhdWx0CisgICAgICAgIG9uZSBpZiBwYWdlIGlzIG51bGxwdHIuCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzczo6cHJlZmV0Y2hETlMpOiBVc2UgYSBwYWlyIG9mIFNlc3Npb25JRCBhbmQgaG9zdG5hbWUg Zm9yIHRoZSBjYWNoZSBhbmQgc2VuZCB0aGUgc2Vzc2lvbiBJRCB0bworICAgICAgICB0aGUgbmV0 d29yayBwcm9jZXNzLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorCisyMDE3 LTAxLTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAg ICAgICBbU09VUF0gQ3VzdG9tIHByb3RvY29scyBkb24ndCB3b3JrIGluIHByaXZhdGUgYnJvd3Np bmcgbW9kZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY3MjM2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAppbmRleCA4YTI3YWIzYTBjMi4u ZWEyYTgzMmM0ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKQEAgLTE3Miw5ICsx NzIsOSBAQCB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXREZWZlcnNMb2Fk aW5nKFJlc291cmNlTG9hZElkZW50aWZpZXIgaWRlbgogICAgIGxvYWRlci0+c2V0RGVmZXJzTG9h ZGluZyhkZWZlcnMpOwogfQogCi12b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpw cmVmZXRjaEROUyhjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQordm9pZCBOZXR3b3JrQ29ubmVjdGlv blRvV2ViUHJvY2Vzczo6cHJlZmV0Y2hETlMoU2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgU3Ry aW5nJiBob3N0bmFtZSkKIHsKLSAgICBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkucHJlZmV0 Y2hETlMoaG9zdG5hbWUpOworICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5wcmVmZXRj aEROUyhzZXNzaW9uSUQsIGhvc3RuYW1lKTsKIH0KIAogc3RhdGljIE5ldHdvcmtTdG9yYWdlU2Vz c2lvbiYgc3RvcmFnZVNlc3Npb24oU2Vzc2lvbklEIHNlc3Npb25JRCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzcy5oCmluZGV4IDc5NjU2YmE0N2MyLi43OGZjOTcwODQ3MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzcy5oCkBAIC03NSw3ICs3NSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzY2hlZHVs ZVJlc291cmNlTG9hZChjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYpOwogICAg IHZvaWQgcGVyZm9ybVN5bmNocm9ub3VzTG9hZChjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFy YW1ldGVycyYsIFJlZjxNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBl cmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBseT4mJik7CiAgICAgdm9pZCBsb2FkUGlu Zyhjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYpOwotICAgIHZvaWQgcHJlZmV0 Y2hETlMoY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBwcmVmZXRjaEROUyhXZWJDb3JlOjpTZXNz aW9uSUQsIGNvbnN0IFN0cmluZyYpOwogCiAgICAgdm9pZCByZW1vdmVMb2FkSWRlbnRpZmllcihS ZXNvdXJjZUxvYWRJZGVudGlmaWVyKTsKICAgICB2b2lkIHNldERlZmVyc0xvYWRpbmcoUmVzb3Vy Y2VMb2FkSWRlbnRpZmllciwgYm9vbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbiBiL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz Lm1lc3NhZ2VzLmluCmluZGV4IGEyNjNhNGVkZTM4Li4xMGNjYjIxNzBjMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KQEAgLTI3LDcgKzI3LDcgQEAgbWVz c2FnZXMgLT4gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MgTGVnYWN5UmVjZWl2ZXIgewog ICAgIExvYWRQaW5nKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgcmVzb3Vy Y2VMb2FkUGFyYW1ldGVycykKICAgICBSZW1vdmVMb2FkSWRlbnRpZmllcih1aW50NjRfdCByZXNv dXJjZUxvYWRJZGVudGlmaWVyKQogICAgIFNldERlZmVyc0xvYWRpbmcodWludDY0X3QgcmVzb3Vy Y2VMb2FkSWRlbnRpZmllciwgYm9vbCBkZWZlcnMpCi0gICAgUHJlZmV0Y2hETlMoU3RyaW5nIGhv c3RuYW1lKQorICAgIFByZWZldGNoRE5TKFdlYkNvcmU6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0 cmluZyBob3N0bmFtZSkKIAogICAgIFN0YXJ0RG93bmxvYWQoV2ViQ29yZTo6U2Vzc2lvbklEIHNl c3Npb25JRCwgV2ViS2l0OjpEb3dubG9hZElEIGRvd25sb2FkSUQsIFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCByZXF1ZXN0LCBTdHJpbmcgc3VnZ2VzdGVkTmFtZSkKICAgICBDb252ZXJ0TWFpblJl c291cmNlTG9hZFRvRG93bmxvYWQoV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCwgdWludDY0 X3QgbWFpblJlc291cmNlTG9hZElkZW50aWZpZXIsIFdlYktpdDo6RG93bmxvYWRJRCBkb3dubG9h ZElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgV2ViQ29yZTo6UmVzb3VyY2VS ZXNwb25zZSByZXNwb25zZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05l dHdvcmtQcm9jZXNzLmNwcAppbmRleCBmZmFmN2RiODU4Ny4uM2YwNTczNmI0NWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTY0 Myw5ICs2NDMsOSBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwcm9jZXNzRGlkUmVzdW1lKCkKICAg ICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gTmV0d29ya1Byb2Nlc3M6OnBy b2Nlc3NEaWRSZXN1bWUoKSIsIHRoaXMpOwogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzOjpwcmVm ZXRjaEROUyhjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQordm9pZCBOZXR3b3JrUHJvY2Vzczo6cHJl ZmV0Y2hETlMoU2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBob3N0bmFtZSkKIHsK LSAgICBXZWJDb3JlOjpwcmVmZXRjaEROUyhob3N0bmFtZSk7CisgICAgV2ViQ29yZTo6cHJlZmV0 Y2hETlMoc2Vzc2lvbklELCBob3N0bmFtZSk7CiB9CiAKICNpZiAhUExBVEZPUk0oQ09DT0EpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5o IGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAppbmRleCBk YWIzNzU0ZTAyMC4uZWE1YjU2ZmNhNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuaApAQCAtMTEwLDcgKzExMCw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIGNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UoTmV0d29ya1Jlc291cmNl TG9hZGVyJiwgY29uc3QgV2ViQ29yZTo6UHJvdGVjdGlvblNwYWNlJik7CiAjZW5kaWYKIAotICAg IHZvaWQgcHJlZmV0Y2hETlMoY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBwcmVmZXRjaEROUyhX ZWJDb3JlOjpTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYpOwogCiAgICAgdm9pZCBlbnN1cmVQcml2 YXRlQnJvd3NpbmdTZXNzaW9uKFdlYkNvcmU6OlNlc3Npb25JRCk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXgg YjkzZTY0MzZlMTIuLmIyNGY4NmFmMzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMTE1NSw5ICsxMTU1LDEz IEBAIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X3ByZWZldGNoX2RucyhXZWJLaXRXZWJDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBjaGFyKiBob3N0CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRf SVNfV0VCX0NPTlRFWFQoY29udGV4dCkpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwoaG9zdG5hbWUp OwogCisgICAgV2ViS2l0V2ViQ29udGV4dFByaXZhdGUqIHByaXYgPSBjb250ZXh0LT5wcml2Owor ICAgIGF1dG8mIGRhdGFTdG9yZSA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9y ZShwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpLndlYnNpdGVEYXRhU3RvcmUoKTsKKwog ICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOworICAgIG1lc3NhZ2Uuc2V0KFN0 cmluZzo6ZnJvbVVURjgoIlNlc3Npb25JRCIpLCBBUEk6OlVJbnQ2NDo6Y3JlYXRlKGRhdGFTdG9y ZS5zZXNzaW9uSUQoKS5zZXNzaW9uSUQoKSkpOwogICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJv bVVURjgoIkhvc3RuYW1lIiksIEFQSTo6U3RyaW5nOjpjcmVhdGUoU3RyaW5nOjpmcm9tVVRGOCho b3N0bmFtZSkpKTsKLSAgICBjb250ZXh0LT5wcml2LT5wcm9jZXNzUG9vbC0+cG9zdE1lc3NhZ2VU b0luamVjdGVkQnVuZGxlKFN0cmluZzo6ZnJvbVVURjgoIlByZWZldGNoRE5TIiksIEFQSTo6RGlj dGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVzc2FnZSkpLnB0cigpKTsKKyAgICBwcml2LT5wcm9j ZXNzUG9vbC0+cG9zdE1lc3NhZ2VUb0luamVjdGVkQnVuZGxlKFN0cmluZzo6ZnJvbVVURjgoIlBy ZWZldGNoRE5TIiksIEFQSTo6RGljdGlvbmFyeTo6Y3JlYXRlKFdURk1vdmUobWVzc2FnZSkpLnB0 cigpKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0ZW5zaW9uLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24u Y3BwCmluZGV4IDM0NGZiMjJlYWJkLi45Y2I5OTYzNzQ3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYkV4dGVuc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Z3RrL1dlYktpdFdlYkV4dGVuc2lvbi5jcHAKQEAgLTE2MCw4ICsxNjAsOSBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRXZWJFeHRlbnNpb25QYWdlRGVzdHJveShXZWJLaXRXZWJFeHRlbnNpb24qIGV4dGVu c2lvbiwgV2ViUGFnZQogc3RhdGljIHZvaWQgd2Via2l0V2ViRXh0ZW5zaW9uRGlkUmVjZWl2ZU1l c3NhZ2UoV2ViS2l0V2ViRXh0ZW5zaW9uKiwgY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgQVBJ OjpEaWN0aW9uYXJ5JiBtZXNzYWdlKQogewogICAgIGlmIChtZXNzYWdlTmFtZSA9PSBTdHJpbmc6 OmZyb21VVEY4KCJQcmVmZXRjaEROUyIpKSB7Ci0gICAgICAgIEFQSTo6U3RyaW5nKiBob3N0bmFt ZSA9IHN0YXRpY19jYXN0PEFQSTo6U3RyaW5nKj4obWVzc2FnZS5nZXQoU3RyaW5nOjpmcm9tVVRG OCgiSG9zdG5hbWUiKSkpOwotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wcmVmZXRj aEROUyhob3N0bmFtZS0+c3RyaW5nKCkpOworICAgICAgICBhdXRvKiBzZXNzaW9uSUQgPSBzdGF0 aWNfY2FzdDxBUEk6OlVJbnQ2NCo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIlNlc3Np b25JRCIpKSk7CisgICAgICAgIGF1dG8qIGhvc3RuYW1lID0gc3RhdGljX2Nhc3Q8QVBJOjpTdHJp bmcqPihtZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJIb3N0bmFtZSIpKSk7CisgICAgICAg IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnByZWZldGNoRE5TKFdlYkNvcmU6OlNlc3Npb25JRChz ZXNzaW9uSUQtPnZhbHVlKCkpLCBob3N0bmFtZS0+c3RyaW5nKCkpOwogICAgIH0gZWxzZQogICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKaW5kZXggNDMzOThmYzkzYzIuLjZmZWI5ZWNiOTNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcApAQCAtMTc0NCw3ICsxNzQ0LDggQEAgdm9pZCBXZWJGcmFtZUxvYWRl ckNsaWVudDo6ZGlkUmVxdWVzdEF1dG9jb21wbGV0ZShSZWY8V2ViQ29yZTo6Rm9ybVN0YXRlPiYm KQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpwcmVmZXRjaEROUyhjb25zdCBTdHJpbmcm IGhvc3RuYW1lKQogewotICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnByZWZldGNoRE5TKGhv c3RuYW1lKTsKKyAgICBXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpOworICAgIFdl YlByb2Nlc3M6OnNpbmdsZXRvbigpLnByZWZldGNoRE5TKHdlYlBhZ2UgPyB3ZWJQYWdlLT5zZXNz aW9uSUQoKSA6IFNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLCBob3N0bmFtZSk7CiB9CiAK IHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRleCA5NjVjOGY2NTk3OC4u NGNlZDRiODg0Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJv Y2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApA QCAtMTUzMywxMyArMTUzMywxMyBAQCB2b2lkIFdlYlByb2Nlc3M6OmRlc3Ryb3lBdXRvbWF0aW9u U2Vzc2lvblByb3h5KCkKICAgICBtX2F1dG9tYXRpb25TZXNzaW9uUHJveHkgPSBudWxscHRyOwog fQogCi12b2lkIFdlYlByb2Nlc3M6OnByZWZldGNoRE5TKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUp Cit2b2lkIFdlYlByb2Nlc3M6OnByZWZldGNoRE5TKFNlc3Npb25JRCBzZXNzaW9uSUQsIGNvbnN0 IFN0cmluZyYgaG9zdG5hbWUpCiB7CiAgICAgaWYgKGhvc3RuYW1lLmlzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKG1fZG5zUHJlZmV0Y2hlZEhvc3RzLmFkZChob3N0bmFtZSku aXNOZXdFbnRyeSkKLSAgICAgICAgbmV0d29ya0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2Vu ZChNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlByZWZldGNoRE5TKGhv c3RuYW1lKSwgMCk7CisgICAgaWYgKG1fZG5zUHJlZmV0Y2hlZEhvc3RzLmFkZChzdGQ6Om1ha2Vf cGFpcihzZXNzaW9uSUQsIGhvc3RuYW1lKSkuaXNOZXdFbnRyeSkKKyAgICAgICAgbmV0d29ya0Nv bm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25U b1dlYlByb2Nlc3M6OlByZWZldGNoRE5TKHNlc3Npb25JRCwgaG9zdG5hbWUpLCAwKTsKICAgICAv LyBUaGUgRE5TIHByZWZldGNoZWQgaG9zdHMgY2FjaGUgaXMgb25seSB0byBhdm9pZCBhc2tpbmcg Zm9yIHRoZSBzYW1lIGhvc3RzIHRvbyBtYW55IHRpbWVzCiAgICAgLy8gaW4gYSB2ZXJ5IHNob3J0 IHBlcmlvZCBvZiB0aW1lLCBwcm9kdWNpbmcgYSBsb3Qgb2YgSVBDIHRyYWZmaWMuIFNvIHdlIGNs ZWFyIHRoaXMgY2FjaGUgYWZ0ZXIKICAgICAvLyBzb21lIHRpbWUgb2Ygbm8gRE5TIHJlcXVlc3Rz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAppbmRleCA2ZWJjY2JiMjY5ZS4u Zjk2Y2M2YzBmMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJv Y2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCkBAIC0y MjAsNyArMjIwLDcgQEAgcHVibGljOgogCiAgICAgV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0 b3JhZ2UmIGFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkgeyByZXR1cm4gKm1fYXBwbGljYXRpb25D YWNoZVN0b3JhZ2U7IH0KIAotICAgIHZvaWQgcHJlZmV0Y2hETlMoY29uc3QgU3RyaW5nJik7Cisg ICAgdm9pZCBwcmVmZXRjaEROUyhXZWJDb3JlOjpTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYpOwog CiAgICAgV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eSogYXV0b21hdGlvblNlc3Npb25Qcm94eSgp IHsgcmV0dXJuIG1fYXV0b21hdGlvblNlc3Npb25Qcm94eS5nZXQoKTsgfQogCkBAIC0zNzcsNyAr Mzc3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bigpOwogICAgIFJlZlB0cjxOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24+IG1fbmV0d29ya1Byb2Nl c3NDb25uZWN0aW9uOwogICAgIFdlYkxvYWRlclN0cmF0ZWd5JiBtX3dlYkxvYWRlclN0cmF0ZWd5 OwotICAgIEhhc2hTZXQ8U3RyaW5nPiBtX2Ruc1ByZWZldGNoZWRIb3N0czsKKyAgICBIYXNoU2V0 PHN0ZDo6cGFpcjxXZWJDb3JlOjpTZXNzaW9uSUQsIFN0cmluZz4+IG1fZG5zUHJlZmV0Y2hlZEhv c3RzOwogICAgIFdlYkNvcmU6Okh5c3RlcmVzaXNBY3Rpdml0eSBtX2Ruc1ByZWZldGNoSHlzdGVy ZXJpczsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5PiBt X2F1dG9tYXRpb25TZXNzaW9uUHJveHk7Cg==