53699 2011-02-03 11:49:09 -0800 [chromium] Track the socket address that a ResourceRequest is fetched from 2011-02-03 21:38:38 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 bryner webkit-unassigned commit-queue oldest_to_newest 344889 0 bryner 2011-02-03 11:49:09 -0800 We'd like to track the socket address that each ResourceRequest came from for Chromium. 344893 1 81094 bryner 2011-02-03 11:55:19 -0800 Created attachment 81094 patch (Chromium specific) 344952 2 81104 bryner 2011-02-03 13:07:52 -0800 Created attachment 81104 credit the original patch author 345341 3 81104 commit-queue 2011-02-03 21:38:34 -0800 Comment on attachment 81104 credit the original patch author Clearing flags on attachment: 81104 Committed r77604: <http://trac.webkit.org/changeset/77604> 345342 4 commit-queue 2011-02-03 21:38:38 -0800 All reviewed patches have been landed. Closing bug. 81094 2011-02-03 11:55:19 -0800 2011-02-03 13:07:52 -0800 patch (Chromium specific) chromium-socket-address.txt text/plain 5552 bryner SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NTIwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDItMDMgIEJyaWFuIFJ5 bmVyICA8YnJ5bmVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBmaWVsZCB0byB0aGUgUmVzb3VyY2VSZXNwb25zZSBm b3IgdHJhY2tpbmcgdGhlIHNvY2tldCBhZGRyZXNzCisgICAgICAgIG9mIHRoZSBob3N0IHRoYXQg dGhlIHJlc291cmNlIHdhcyBmZXRjaGVkIGZyb20uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzY5OQorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlUmVzcG9uc2U6OmRvUGxhdGZvcm1Db3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlOjpkb1BsYXRmb3JtQWRvcHQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZTo6c29ja2V0QWRkcmVzcyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlOjpzZXRTb2NrZXRBZGRyZXNzKToKKwogMjAxMS0wMi0wMyAgUGF2ZWwgUG9kaXZpbG92 ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBG ZWxkbWFuLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9S ZXNvdXJjZVJlc3BvbnNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwCShyZXZpc2lvbiA3NzQ2OCkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgUGFzc093blB0cjxDcm9z c1RocmVhZFJlc291cmNlUmVzcG9uc2VEYQogICAgIGRhdGEtPm1fd2FzQWx0ZXJuYXRlUHJvdG9j b2xBdmFpbGFibGUgPSBtX3dhc0FsdGVybmF0ZVByb3RvY29sQXZhaWxhYmxlOwogICAgIGRhdGEt Pm1fd2FzRmV0Y2hlZFZpYVByb3h5ID0gbV93YXNGZXRjaGVkVmlhUHJveHk7CiAgICAgZGF0YS0+ bV9yZXNwb25zZVRpbWUgPSBtX3Jlc3BvbnNlVGltZTsKKyAgICBkYXRhLT5tX3NvY2tldEFkZHJl c3MgPSBtX3NvY2tldEFkZHJlc3M7CiAgICAgcmV0dXJuIGRhdGE7CiB9CiAKQEAgLTUzLDYgKzU0 LDcgQEAgdm9pZCBSZXNvdXJjZVJlc3BvbnNlOjpkb1BsYXRmb3JtQWRvcHQoUAogICAgIG1fd2Fz QWx0ZXJuYXRlUHJvdG9jb2xBdmFpbGFibGUgPSBkYXRhLT5tX3dhc0FsdGVybmF0ZVByb3RvY29s QXZhaWxhYmxlOwogICAgIG1fd2FzRmV0Y2hlZFZpYVByb3h5ID0gZGF0YS0+bV93YXNGZXRjaGVk VmlhUHJveHk7CiAgICAgbV9yZXNwb25zZVRpbWUgPSBkYXRhLT5tX3Jlc3BvbnNlVGltZTsKKyAg ICBtX3NvY2tldEFkZHJlc3MgPSBkYXRhLT5tX3NvY2tldEFkZHJlc3M7CiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hy b21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA3NzQ2 OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VS ZXNwb25zZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw5IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgZG91YmxlIHJlc3BvbnNlVGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVz cG9uc2VUaW1lOyB9CiAgICAgICAgIHZvaWQgc2V0UmVzcG9uc2VUaW1lKGRvdWJsZSByZXNwb25z ZVRpbWUpIHsgbV9yZXNwb25zZVRpbWUgPSByZXNwb25zZVRpbWU7IH0KIAorICAgICAgICBjb25z dCBTdHJpbmcmIHNvY2tldEFkZHJlc3MoKSBjb25zdCB7IHJldHVybiBtX3NvY2tldEFkZHJlc3M7 IH0KKyAgICAgICAgdm9pZCBzZXRTb2NrZXRBZGRyZXNzKGNvbnN0IFN0cmluZyYgdmFsdWUpIHsg bV9zb2NrZXRBZGRyZXNzID0gdmFsdWU7IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVu ZCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlQmFzZTsKIApAQCAtMTQzLDYgKzE0NiwxMCBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFRoZSB0aW1lIGF0IHdoaWNoIHRoZSByZXNwb25z ZSBoZWFkZXJzIHdlcmUgcmVjZWl2ZWQuICBGb3IgY2FjaGVkCiAgICAgICAgIC8vIHJlc3BvbnNl cywgdGhpcyB0aW1lIGNvdWxkIGJlICJmYXIiIGluIHRoZSBwYXN0LgogICAgICAgICBkb3VibGUg bV9yZXNwb25zZVRpbWU7CisKKyAgICAgICAgLy8gUmVtb3RlIGFkZHJlc3Mgb2YgdGhlIHNvY2tl dCB3aGljaCBmZXRjaGVkIHRoaXMgcmVzb3VyY2UsIGZvciBwcmVzZW50aW5nCisgICAgICAgIC8v IHRvIGlucXVpc2l0aXZlIHVzZXJzLiAgQ2FuIGJlICJpcHY0OnBvcnQiLCAiW2lwdjZdOnBvcnQi LCBvciBlbXB0eS4KKyAgICAgICAgU3RyaW5nIG1fc29ja2V0QWRkcmVzczsKICAgICB9OwogCiAg ICAgc3RydWN0IENyb3NzVGhyZWFkUmVzb3VyY2VSZXNwb25zZURhdGEgOiBwdWJsaWMgQ3Jvc3NU aHJlYWRSZXNvdXJjZVJlc3BvbnNlRGF0YUJhc2UgewpAQCAtMTU1LDYgKzE2Miw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3dhc0FsdGVybmF0ZVByb3RvY29sQXZhaWxh YmxlOwogICAgICAgICBib29sIG1fd2FzRmV0Y2hlZFZpYVByb3h5OwogICAgICAgICBkb3VibGUg bV9yZXNwb25zZVRpbWU7CisgICAgICAgIFN0cmluZyBtX3NvY2tldEFkZHJlc3M7CiAgICAgfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJ KHJldmlzaW9uIDc3NTIwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wMi0wMyAgQnJpYW4gUnluZXIgIDxi cnluZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhIGZpZWxkIHRvIHRoZSBSZXNvdXJjZVJlc3BvbnNlIGZvciB0cmFj a2luZyB0aGUgc29ja2V0IGFkZHJlc3MKKyAgICAgICAgb2YgdGhlIGhvc3QgdGhhdCB0aGUgcmVz b3VyY2Ugd2FzIGZldGNoZWQgZnJvbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUzNjk5CisKKyAgICAgICAgKiBwdWJsaWMvV2ViVVJMUmVzcG9uc2Uu aDoKKyAgICAgICAgKiBzcmMvV2ViVVJMUmVzcG9uc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJVUkxSZXNwb25zZTo6c29ja2V0QWRkcmVzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJl c3BvbnNlOjpzZXRTb2NrZXRBZGRyZXNzKToKKwogMjAxMS0wMi0wMSAgUGF2ZWwgUG9kaXZpbG92 ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBG ZWxkbWFuLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9u c2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxS ZXNwb25zZS5oCShyZXZpc2lvbiA3NzQ2OCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlVSTFJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw2ICsxNjksMTEgQEAg cHVibGljOgogICAgIFdFQktJVF9BUEkgV2ViU3RyaW5nIGRvd25sb2FkRmlsZVBhdGgoKSBjb25z dDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0RG93bmxvYWRGaWxlUGF0aChjb25zdCBXZWJTdHJp bmcmKTsKIAorICAgIC8vIFJlbW90ZSBhZGRyZXNzIG9mIHRoZSBzb2NrZXQgd2hpY2ggZmV0Y2hl ZCB0aGlzIHJlc291cmNlLCBmb3IgcHJlc2VudGluZworICAgIC8vIHRvIGlucXVpc2l0aXZlIHVz ZXJzLiAgQ2FuIGJlICJpcHY0OnBvcnQiLCAiW2lwdjZdOnBvcnQiLCBvciBlbXB0eS4KKyAgICBX RUJLSVRfQVBJIFdlYlN0cmluZyBzb2NrZXRBZGRyZXNzKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQ SSB2b2lkIHNldFNvY2tldEFkZHJlc3MoY29uc3QgV2ViU3RyaW5nJik7CisKIHByb3RlY3RlZDoK ICAgICB2b2lkIGFzc2lnbihXZWJVUkxSZXNwb25zZVByaXZhdGUqKTsKIApJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAkocmV2aXNpb24gNzc0 NjgpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM4NCw2ICszODQsMTYgQEAgdm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0 RG93bmxvYWRGaWxlUGF0aAogICAgIG1fcHJpdmF0ZS0+bV9kb3dubG9hZEZpbGVQYXRoID0gZG93 bmxvYWRGaWxlUGF0aDsKIH0KIAorV2ViU3RyaW5nIFdlYlVSTFJlc3BvbnNlOjpzb2NrZXRBZGRy ZXNzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2Ut PnNvY2tldEFkZHJlc3MoKTsKK30KKwordm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0U29ja2V0QWRk cmVzcyhjb25zdCBXZWJTdHJpbmcmIHNvY2tldEFkZHJlc3MpCit7CisgICAgbV9wcml2YXRlLT5t X3Jlc291cmNlUmVzcG9uc2UtPnNldFNvY2tldEFkZHJlc3Moc29ja2V0QWRkcmVzcyk7Cit9CisK IHZvaWQgV2ViVVJMUmVzcG9uc2U6OmFzc2lnbihXZWJVUkxSZXNwb25zZVByaXZhdGUqIHApCiB7 CiAgICAgLy8gU3ViY2xhc3NlcyBtYXkgY2FsbCB0aGlzIGRpcmVjdGx5IHNvIGEgc2VsZi1hc3Np Z25tZW50IGNoZWNrIGlzIG5lZWRlZAo= 81104 2011-02-03 13:07:52 -0800 2011-02-03 21:38:34 -0800 credit the original patch author chromium-socket-address.txt text/plain 5644 bryner SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NTIwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMDMgIEJyaWFuIFJ5 bmVyICA8YnJ5bmVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBmaWVsZCB0byB0aGUgUmVzb3VyY2VSZXNwb25zZSBm b3IgdHJhY2tpbmcgdGhlIHNvY2tldCBhZGRyZXNzCisgICAgICAgIG9mIHRoZSBob3N0IHRoYXQg dGhlIHJlc291cmNlIHdhcyBmZXRjaGVkIGZyb20uICBQYXRjaCB3YXMgb3JpZ2luYWxseQorICAg ICAgICBieSBQYXVsIE1hcmtzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTM2OTkKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0v UmVzb3VyY2VSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNl Ojpkb1BsYXRmb3JtQ29weURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZTo6ZG9QbGF0Zm9ybUFkb3B0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVt L1Jlc291cmNlUmVzcG9uc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6 OnNvY2tldEFkZHJlc3MpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6c2V0 U29ja2V0QWRkcmVzcyk6CisKIDIwMTEtMDItMDMgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxv dkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j aHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmNwcAkocmV2aXNpb24gNzc0NjgpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zOSw2ICszOSw3IEBAIFBhc3NPd25QdHI8Q3Jvc3NUaHJlYWRSZXNv dXJjZVJlc3BvbnNlRGEKICAgICBkYXRhLT5tX3dhc0FsdGVybmF0ZVByb3RvY29sQXZhaWxhYmxl ID0gbV93YXNBbHRlcm5hdGVQcm90b2NvbEF2YWlsYWJsZTsKICAgICBkYXRhLT5tX3dhc0ZldGNo ZWRWaWFQcm94eSA9IG1fd2FzRmV0Y2hlZFZpYVByb3h5OwogICAgIGRhdGEtPm1fcmVzcG9uc2VU aW1lID0gbV9yZXNwb25zZVRpbWU7CisgICAgZGF0YS0+bV9zb2NrZXRBZGRyZXNzID0gbV9zb2Nr ZXRBZGRyZXNzOwogICAgIHJldHVybiBkYXRhOwogfQogCkBAIC01Myw2ICs1NCw3IEBAIHZvaWQg UmVzb3VyY2VSZXNwb25zZTo6ZG9QbGF0Zm9ybUFkb3B0KFAKICAgICBtX3dhc0FsdGVybmF0ZVBy b3RvY29sQXZhaWxhYmxlID0gZGF0YS0+bV93YXNBbHRlcm5hdGVQcm90b2NvbEF2YWlsYWJsZTsK ICAgICBtX3dhc0ZldGNoZWRWaWFQcm94eSA9IGRhdGEtPm1fd2FzRmV0Y2hlZFZpYVByb3h5Owog ICAgIG1fcmVzcG9uc2VUaW1lID0gZGF0YS0+bV9yZXNwb25zZVRpbWU7CisgICAgbV9zb2NrZXRB ZGRyZXNzID0gZGF0YS0+bV9zb2NrZXRBZGRyZXNzOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291 cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAkocmV2aXNpb24gNzc0NjgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAko d29ya2luZyBjb3B5KQpAQCAtOTYsNiArOTYsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIGRvdWJsZSByZXNwb25zZVRpbWUoKSBjb25zdCB7IHJldHVybiBtX3Jlc3BvbnNlVGltZTsg fQogICAgICAgICB2b2lkIHNldFJlc3BvbnNlVGltZShkb3VibGUgcmVzcG9uc2VUaW1lKSB7IG1f cmVzcG9uc2VUaW1lID0gcmVzcG9uc2VUaW1lOyB9CiAKKyAgICAgICAgY29uc3QgU3RyaW5nJiBz b2NrZXRBZGRyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9zb2NrZXRBZGRyZXNzOyB9CisgICAgICAg IHZvaWQgc2V0U29ja2V0QWRkcmVzcyhjb25zdCBTdHJpbmcmIHZhbHVlKSB7IG1fc29ja2V0QWRk cmVzcyA9IHZhbHVlOyB9CisKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVz b3VyY2VSZXNwb25zZUJhc2U7CiAKQEAgLTE0Myw2ICsxNDYsMTAgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICAvLyBUaGUgdGltZSBhdCB3aGljaCB0aGUgcmVzcG9uc2UgaGVhZGVycyB3 ZXJlIHJlY2VpdmVkLiAgRm9yIGNhY2hlZAogICAgICAgICAvLyByZXNwb25zZXMsIHRoaXMgdGlt ZSBjb3VsZCBiZSAiZmFyIiBpbiB0aGUgcGFzdC4KICAgICAgICAgZG91YmxlIG1fcmVzcG9uc2VU aW1lOworCisgICAgICAgIC8vIFJlbW90ZSBhZGRyZXNzIG9mIHRoZSBzb2NrZXQgd2hpY2ggZmV0 Y2hlZCB0aGlzIHJlc291cmNlLCBmb3IgcHJlc2VudGluZworICAgICAgICAvLyB0byBpbnF1aXNp dGl2ZSB1c2Vycy4gIENhbiBiZSAiaXB2NDpwb3J0IiwgIltpcHY2XTpwb3J0Iiwgb3IgZW1wdHku CisgICAgICAgIFN0cmluZyBtX3NvY2tldEFkZHJlc3M7CiAgICAgfTsKIAogICAgIHN0cnVjdCBD cm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRhIDogcHVibGljIENyb3NzVGhyZWFkUmVzb3Vy Y2VSZXNwb25zZURhdGFCYXNlIHsKQEAgLTE1NSw2ICsxNjIsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIGJvb2wgbV93YXNBbHRlcm5hdGVQcm90b2NvbEF2YWlsYWJsZTsKICAgICAg ICAgYm9vbCBtX3dhc0ZldGNoZWRWaWFQcm94eTsKICAgICAgICAgZG91YmxlIG1fcmVzcG9uc2VU aW1lOworICAgICAgICBTdHJpbmcgbV9zb2NrZXRBZGRyZXNzOwogICAgIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3 NzUyMCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDItMDMgIEJyaWFuIFJ5bmVyICA8YnJ5bmVyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSBmaWVsZCB0byB0aGUgUmVzb3VyY2VSZXNwb25zZSBmb3IgdHJhY2tpbmcgdGhlIHNv Y2tldCBhZGRyZXNzCisgICAgICAgIG9mIHRoZSBob3N0IHRoYXQgdGhlIHJlc291cmNlIHdhcyBm ZXRjaGVkIGZyb20uICBQYXRjaCB3YXMgb3JpZ2luYWxseQorICAgICAgICBieSBQYXVsIE1hcmtz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM2OTkK KworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXNwb25zZS5oOgorICAgICAgICAqIHNyYy9XZWJV UkxSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJlc3BvbnNlOjpzb2NrZXRB ZGRyZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViVVJMUmVzcG9uc2U6OnNldFNvY2tldEFkZHJl c3MpOgorCiAyMDExLTAyLTAxICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCkluZGV4OiBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgJKHJldmlzaW9uIDc3 NDY4KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAko d29ya2luZyBjb3B5KQpAQCAtMTY5LDYgKzE2OSwxMSBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQ SSBXZWJTdHJpbmcgZG93bmxvYWRGaWxlUGF0aCgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9p ZCBzZXREb3dubG9hZEZpbGVQYXRoKGNvbnN0IFdlYlN0cmluZyYpOwogCisgICAgLy8gUmVtb3Rl IGFkZHJlc3Mgb2YgdGhlIHNvY2tldCB3aGljaCBmZXRjaGVkIHRoaXMgcmVzb3VyY2UsIGZvciBw cmVzZW50aW5nCisgICAgLy8gdG8gaW5xdWlzaXRpdmUgdXNlcnMuICBDYW4gYmUgImlwdjQ6cG9y dCIsICJbaXB2Nl06cG9ydCIsIG9yIGVtcHR5LgorICAgIFdFQktJVF9BUEkgV2ViU3RyaW5nIHNv Y2tldEFkZHJlc3MoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIHZvaWQgc2V0U29ja2V0QWRkcmVz cyhjb25zdCBXZWJTdHJpbmcmKTsKKwogcHJvdGVjdGVkOgogICAgIHZvaWQgYXNzaWduKFdlYlVS TFJlc3BvbnNlUHJpdmF0ZSopOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJVUkxSZXNwb25zZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVVJMUmVzcG9uc2UuY3BwCShyZXZpc2lvbiA3NzQ2OCkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg0LDYg KzM4NCwxNiBAQCB2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXREb3dubG9hZEZpbGVQYXRoCiAgICAg bV9wcml2YXRlLT5tX2Rvd25sb2FkRmlsZVBhdGggPSBkb3dubG9hZEZpbGVQYXRoOwogfQogCitX ZWJTdHJpbmcgV2ViVVJMUmVzcG9uc2U6OnNvY2tldEFkZHJlc3MoKSBjb25zdAoreworICAgIHJl dHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+c29ja2V0QWRkcmVzcygpOworfQor Cit2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRTb2NrZXRBZGRyZXNzKGNvbnN0IFdlYlN0cmluZyYg c29ja2V0QWRkcmVzcykKK3sKKyAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+c2V0 U29ja2V0QWRkcmVzcyhzb2NrZXRBZGRyZXNzKTsKK30KKwogdm9pZCBXZWJVUkxSZXNwb25zZTo6 YXNzaWduKFdlYlVSTFJlc3BvbnNlUHJpdmF0ZSogcCkKIHsKICAgICAvLyBTdWJjbGFzc2VzIG1h eSBjYWxsIHRoaXMgZGlyZWN0bHkgc28gYSBzZWxmLWFzc2lnbm1lbnQgY2hlY2sgaXMgbmVlZGVk Cg==