109921 2013-02-15 03:56:53 -0800 [WK2] Make WebInspectorServer a member of WebContext instead of a singleton 2013-03-13 06:52:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 109922 1 jturcotte jturcotte abecsi buildbot cmarcelo gyuyoung.kim jturcotte menard rakuco rniwa webkit.review.bot oldest_to_newest 833869 0 jturcotte 2013-02-15 03:56:53 -0800 [WK2] Make WebInspectorServer a member of WebContext instead of a singleton 833870 1 188530 jturcotte 2013-02-15 03:59:24 -0800 Created attachment 188530 Patch 833873 2 188530 buildbot 2013-02-15 04:03:04 -0800 Comment on attachment 188530 Patch Attachment 188530 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16592054 833884 3 188535 jturcotte 2013-02-15 04:15:35 -0800 Created attachment 188535 Patch Fix the Mac build. 854268 4 188535 jturcotte 2013-03-13 06:52:04 -0700 Comment on attachment 188535 Patch Abandonning in favor of bug #112254. 188530 2013-02-15 03:59:24 -0800 2013-02-15 04:15:32 -0800 Patch bug-109921-20130215125550.patch text/plain 14068 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjk5YTI3NzVlZDU3NDU4 OTU1ODFjNjBmMzMzOThjYzA3M2NkMDBmMy4uOWExZmNiMTY4OGVmNzQ0YWU4Y2E2OTIyYzFmOWQz MGI2MjU2YTMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAyLTE1ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKKyAgICAgICAgW1dL Ml0gTWFrZSBXZWJJbnNwZWN0b3JTZXJ2ZXIgYSBtZW1iZXIgb2YgV2ViQ29udGV4dCBpbnN0ZWFk IG9mIGEgc2luZ2xldG9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDk5MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBc3N1bWluZyB0aGF0IHVzZXJzIHdvbid0IG5lZWQgdG8gc3Bhd24gbW9yZSB0aGFu IG9uZSBXS0NvbnRleHQgcGVyIGFwcGxpY2F0aW9uLAorICAgICAgICB0aGlzIGF0dGFjaGVzIHRo ZSBXZWJJbnNwZWN0b3Igc2VydmVyIGluc3RhbmNlIHRvIFdlYkNvbnRleHQgaW4gcHJlcGFyYXRp b24gZm9yCisgICAgICAgIGV4cG9zaW5nIGl0IHRocm91Z2ggV0tJbnNwZWN0b3JTZXJ2ZXIgaW4g dGhlIEMgQVBJLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNw cDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OnJlbW90ZUluc3BlY3RvclVy bCk6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2 ZXIuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9y U2VydmVyLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclNlcnZlcjo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkluc3BlY3RvclNlcnZlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNv bnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpXZWJDb250ZXh0KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAg ICAgKFdlYkNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjppbnNwZWN0b3JT ZXJ2ZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjppbnZhbGlkYXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OmVuYWJsZVJlbW90ZUluc3BlY3Rpb24pOgorICAgICAg ICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6c2VuZE1lc3NhZ2VUb1JlbW90ZUZyb250ZW5k KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwOgorICAgICAgICAo V2ViS2l0Ojppbml0aWFsaXplSW5zcGVjdG9yU2VydmVyKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9j ZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6aW5pdEluc3BlY3Rv clNlcnZlcik6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6 ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuY3BwOgor ICAgICAgICAoV2ViS2l0Ojppbml0SW5zcGVjdG9yU2VydmVyKToKKyAgICAgICAgKFdlYktpdDo6 UXRXZWJDb250ZXh0OjpjcmVhdGUpOgorCiAyMDEzLTAyLTA3ICBTaGVyaWZmIEJvdCAgPHdlYmtp dC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91 dCByMTQyMjEyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAKaW5kZXggM2E4MDEwYThiZDcyYjY4ZGE1NTNkYzU3NGYyMTUyYWQyMjliMGJj MS4uMGU2NGFmMjczMGUzOTkwOTlmY2EyMzAzZWJjZmJlOTJlZDg0Y2NlYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0zNCw2 ICszNCw3IEBACiAjaW5jbHVkZSAiUXRXZWJQYWdlRXZlbnRIYW5kbGVyLmgiCiAjaW5jbHVkZSAi UXRXZWJQYWdlUG9saWN5Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0Lmgi CisjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkZpbmRPcHRpb25zLmgiCiAj aWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCiAjaW5jbHVkZSAiV2ViSW5zcGVjdG9yUHJveHku aCIKQEAgLTEzOTMsNyArMTM5NCw4IEBAIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6 c2V0VXNlclNjcmlwdHMoY29uc3QgUUxpc3Q8UVVybD4mIHVzZXJTY3JpcHRzKQogUVVybCBRUXVp Y2tXZWJWaWV3RXhwZXJpbWVudGFsOjpyZW1vdGVJbnNwZWN0b3JVcmwoKSBjb25zdAogewogI2lm IEVOQUJMRShJTlNQRUNUT1JfU0VSVkVSKQotICAgIHJldHVybiBRVXJsKFdlYkluc3BlY3RvclNl cnZlcjo6c2hhcmVkKCkuaW5zcGVjdG9yVXJsRm9yUGFnZUlEKGRfcHRyLT53ZWJQYWdlUHJveHkt Pmluc3BlY3RvcigpLT5yZW1vdGVJbnNwZWN0aW9uUGFnZUlEKCkpKTsKKyAgICBRX0QoY29uc3Qg UVF1aWNrV2ViVmlldyk7CisgICAgcmV0dXJuIFFVcmwoZC0+Y29udGV4dC0+Y29udGV4dCgpLT5p bnNwZWN0b3JTZXJ2ZXIoKS0+aW5zcGVjdG9yVXJsRm9yUGFnZUlEKGRfcHRyLT53ZWJQYWdlUHJv eHktPmluc3BlY3RvcigpLT5yZW1vdGVJbnNwZWN0aW9uUGFnZUlEKCkpKTsKICNlbHNlCiAgICAg cmV0dXJuIFFVcmwoKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuY3BwCmluZGV4 IGJjNTg1ZTk0ZGM4NDM3MWU5NTZlZDBjZjVlNjllYWZiMDI2YjEyNzYuLjc0MTVkM2ZmOTU5OWUx YzE1OGUwNjRjNTkzMDY0OTUwMmJmZWUwMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5j cHAKQEAgLTUwLDEyICs1MCw2IEBAIHN0YXRpYyB1bnNpZ25lZCBwYWdlSWRGcm9tUmVxdWVzdFBh dGgoY29uc3QgU3RyaW5nJiBwYXRoKQogICAgIHJldHVybiBudW1iZXI7CiB9CiAKLVdlYkluc3Bl Y3RvclNlcnZlciYgV2ViSW5zcGVjdG9yU2VydmVyOjpzaGFyZWQoKQotewotICAgIHN0YXRpYyBX ZWJJbnNwZWN0b3JTZXJ2ZXImIHNlcnZlciA9ICpuZXcgV2ViSW5zcGVjdG9yU2VydmVyOwotICAg IHJldHVybiBzZXJ2ZXI7Ci19Ci0KIFdlYkluc3BlY3RvclNlcnZlcjo6V2ViSW5zcGVjdG9yU2Vy dmVyKCkKICAgICA6IFdlYlNvY2tldFNlcnZlcih0aGlzKQogICAgICwgbV9uZXh0QXZhaWxhYmxl UGFnZUlkKDEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9y U2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0lu c3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuaAppbmRleCAxMjRjNDZmZjI3NzQ1Y2Nj N2EwN2FiZjYxYjQ0YjUzNGU2Mjk4NjViLi40MzI2MDE5Yjg1NTQ4YmE0ODA4ZTA1NDY2ZGMyNjk3 ZjAwNmYwOWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9y U2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmgKQEAgLTM4LDEwICszOCwxMiBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViSW5zcGVjdG9yUHJveHk7CiAKLWNsYXNz IFdlYkluc3BlY3RvclNlcnZlciA6IHB1YmxpYyBXZWJTb2NrZXRTZXJ2ZXIsIHB1YmxpYyBXZWJT b2NrZXRTZXJ2ZXJDbGllbnQgeworY2xhc3MgV2ViSW5zcGVjdG9yU2VydmVyIDogcHVibGljIFJl ZkNvdW50ZWQ8V2ViSW5zcGVjdG9yU2VydmVyPiwgcHVibGljIFdlYlNvY2tldFNlcnZlciwgcHVi bGljIFdlYlNvY2tldFNlcnZlckNsaWVudCB7CiBwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQ dHI8V2ViSW5zcGVjdG9yU2VydmVyPiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFJlZihuZXcgV2Vi SW5zcGVjdG9yU2VydmVyKTsgfQogICAgIHR5cGVkZWYgSGFzaE1hcDx1bnNpZ25lZCwgV2ViSW5z cGVjdG9yUHJveHkqPiBDbGllbnRNYXA7Ci0gICAgc3RhdGljIFdlYkluc3BlY3RvclNlcnZlciYg c2hhcmVkKCk7CisKKyAgICB+V2ViSW5zcGVjdG9yU2VydmVyKCk7CiAKICAgICAvLyBQYWdlIHJl Z2lzdHJ5IHRvIG1hbmFnZSBrbm93biBwYWdlcy4KICAgICBpbnQgcmVnaXN0ZXJQYWdlKFdlYklu c3BlY3RvclByb3h5KiBjbGllbnQpOwpAQCAtNTEsNyArNTMsNiBAQCBwdWJsaWM6CiAKIHByaXZh dGU6CiAgICAgV2ViSW5zcGVjdG9yU2VydmVyKCk7Ci0gICAgfldlYkluc3BlY3RvclNlcnZlcigp OwogCiAgICAgLy8gV2ViU29ja2V0U2VydmVyQ2xpZW50IGltcGxlbWVudGF0aW9uLiBFdmVudHMg Y29taW5nIGZyb20gcmVtb3RlIGNvbm5lY3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNl aXZlVW5yZWNvZ25pemVkSFRUUFJlcXVlc3QoV2ViU29ja2V0U2VydmVyQ29ubmVjdGlvbiosIFBh c3NSZWZQdHI8V2ViQ29yZTo6SFRUUFJlcXVlc3Q+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmNwcAppbmRleCBiN2ZmMTE1ZmQzZmJiNjAzNWQ4M2U5YjU0NDI2N2Y4NDUxYzI3 MTVhLi5kZDU3OWJiZjgyMGNlMDQ5ZjM1YzExOWUwMjYzMDQ5OGFlYjIyMGUyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCkBAIC00NSw2ICs0NSw3IEBACiAjaW5jbHVk ZSAiV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuaCIKICNpbmNsdWRlICJXZWJHZW9sb2NhdGlvbk1h bmFnZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYkljb25EYXRhYmFzZS5oIgorI2luY2x1ZGUgIldl Ykluc3BlY3RvclNlcnZlci5oIgogI2luY2x1ZGUgIldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQ cm94eS5oIgogI2luY2x1ZGUgIldlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHkuaCIKICNpbmNsdWRl ICJXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkuaCIKQEAgLTE2NSw2ICsxNjYsOSBAQCBXZWJD b250ZXh0OjpXZWJDb250ZXh0KFByb2Nlc3NNb2RlbCBwcm9jZXNzTW9kZWwsIGNvbnN0IFN0cmlu ZyYgaW5qZWN0ZWRCdW5kbGVQYQogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAg IG1fcGx1Z2luU2l0ZURhdGFNYW5hZ2VyID0gV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyOjpjcmVh dGUodGhpcyk7CiAjZW5kaWYgLy8gRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCisjaWYgRU5B QkxFKElOU1BFQ1RPUl9TRVJWRVIpCisgICAgbV9pbnNwZWN0b3JTZXJ2ZXIgPSBXZWJJbnNwZWN0 b3JTZXJ2ZXI6OmNyZWF0ZSgpOworI2VuZGlmCiAKICAgICBhZGRTdXBwbGVtZW50PFdlYkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk+KCk7CiAgICAgYWRkU3VwcGxlbWVudDxXZWJDb29raWVN YW5hZ2VyUHJveHk+KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAppbmRleCAw ZDgzZDUzYzVlNDIwMzhjNWIyNmFlNWI3ZjhlNDE1NTRhODZlYmFkLi42NzhlMWJhOTdlMjE2Mzc0 ODVjOTE0ZjM0N2Y2ZWM3ZGY3YTVhNTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250 ZXh0LmgKQEAgLTYxLDYgKzYxLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBEb3dubG9h ZFByb3h5OwogY2xhc3MgV2ViQ29udGV4dFN1cHBsZW1lbnQ7CiBjbGFzcyBXZWJJY29uRGF0YWJh c2U7CitjbGFzcyBXZWJJbnNwZWN0b3JTZXJ2ZXI7CiBjbGFzcyBXZWJQYWdlR3JvdXA7CiBjbGFz cyBXZWJQYWdlUHJveHk7CiBzdHJ1Y3QgU3RhdGlzdGljc0RhdGE7CkBAIC0yMTMsNiArMjE0LDkg QEAgcHVibGljOgogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIFdlYlBsdWdp blNpdGVEYXRhTWFuYWdlciogcGx1Z2luU2l0ZURhdGFNYW5hZ2VyKCkgY29uc3QgeyByZXR1cm4g bV9wbHVnaW5TaXRlRGF0YU1hbmFnZXIuZ2V0KCk7IH0KICNlbmRpZgorI2lmIEVOQUJMRShJTlNQ RUNUT1JfU0VSVkVSKQorICAgIFdlYkluc3BlY3RvclNlcnZlciogaW5zcGVjdG9yU2VydmVyKCkg Y29uc3QgeyByZXR1cm4gbV9pbnNwZWN0b3JTZXJ2ZXIuZ2V0KCk7IH0KKyNlbmRpZgogCiAgICAg c3RydWN0IFN0YXRpc3RpY3MgewogICAgICAgICB1bnNpZ25lZCB3a1ZpZXdDb3VudDsKQEAgLTQy Myw2ICs0MjcsOSBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQog ICAgIFJlZlB0cjxXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXI+IG1fcGx1Z2luU2l0ZURhdGFNYW5h Z2VyOwogI2VuZGlmCisjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCisgICAgUmVmUHRyPFdl Ykluc3BlY3RvclNlcnZlcj4gbV9pbnNwZWN0b3JTZXJ2ZXI7CisjZW5kaWYKIAogICAgIFJlZlB0 cjxTdG9yYWdlTWFuYWdlcj4gbV9zdG9yYWdlTWFuYWdlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggYzA4ZjBhOGUxYzBjYmNjYTRm Y2FjZmRmOWMxMzlhNWZkZmZhMzYxMC4uYmUwYWNjYzE0ZjczYWNmY2UxYWQ5NzY4ZDk4ZjRiMjJi ZTYyYmIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3Rv clByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJv eHkuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogCisjaW5j bHVkZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94 eS5oIgogI2luY2x1ZGUgIldlYkZyYW1lUHJveHkuaCIKICNpbmNsdWRlICJXZWJJbnNwZWN0b3JN ZXNzYWdlcy5oIgpAQCAtMTA0LDcgKzEwNSw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6Omlu dmFsaWRhdGUoKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1JfU0VSVkVSKQogICAgIGlmIChtX3Jl bW90ZUluc3BlY3Rpb25QYWdlSWQpCi0gICAgICAgIFdlYkluc3BlY3RvclNlcnZlcjo6c2hhcmVk KCkudW5yZWdpc3RlclBhZ2UobV9yZW1vdGVJbnNwZWN0aW9uUGFnZUlkKTsKKyAgICAgICAgbV9w YWdlLT5wcm9jZXNzKCktPmNvbnRleHQoKS0+aW5zcGVjdG9yU2VydmVyKCktPnVucmVnaXN0ZXJQ YWdlKG1fcmVtb3RlSW5zcGVjdGlvblBhZ2VJZCk7CiAjZW5kaWYKIAogICAgIG1fcGFnZS0+cHJv Y2VzcygpLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYkluc3BlY3RvclByb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS0+cGFnZUlEKCkpOwpAQCAtMjgzLDcgKzI4 NCw3IEBAIHN0YXRpYyB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV0tQYWdl UmVmLCBXS0ZyYW1lUmVmIGZyYW1lUmVmLCBXS0ZyCiB2b2lkIFdlYkluc3BlY3RvclByb3h5Ojpl bmFibGVSZW1vdGVJbnNwZWN0aW9uKCkKIHsKICAgICBpZiAoIW1fcmVtb3RlSW5zcGVjdGlvblBh Z2VJZCkKLSAgICAgICAgbV9yZW1vdGVJbnNwZWN0aW9uUGFnZUlkID0gV2ViSW5zcGVjdG9yU2Vy dmVyOjpzaGFyZWQoKS5yZWdpc3RlclBhZ2UodGhpcyk7CisgICAgICAgIG1fcmVtb3RlSW5zcGVj dGlvblBhZ2VJZCA9IG1fcGFnZS0+cHJvY2VzcygpLT5jb250ZXh0KCktPmluc3BlY3RvclNlcnZl cigpLT5yZWdpc3RlclBhZ2UodGhpcyk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnJl bW90ZUZyb250ZW5kQ29ubmVjdGVkKCkKQEAgLTQwMyw3ICs0MDQsNyBAQCBib29sIFdlYkluc3Bl Y3RvclByb3h5OjpzaG91bGRPcGVuQXR0YWNoZWQoKQogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6 c2VuZE1lc3NhZ2VUb1JlbW90ZUZyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAg ICBBU1NFUlQobV9yZW1vdGVJbnNwZWN0aW9uUGFnZUlkKTsKLSAgICBXZWJJbnNwZWN0b3JTZXJ2 ZXI6OnNoYXJlZCgpLnNlbmRNZXNzYWdlT3ZlckNvbm5lY3Rpb24obV9yZW1vdGVJbnNwZWN0aW9u UGFnZUlkLCBtZXNzYWdlKTsKKyAgICBtX3BhZ2UtPnByb2Nlc3MoKS0+Y29udGV4dCgpLT5pbnNw ZWN0b3JTZXJ2ZXIoKS0+c2VuZE1lc3NhZ2VPdmVyQ29ubmVjdGlvbihtX3JlbW90ZUluc3BlY3Rp b25QYWdlSWQsIG1lc3NhZ2UpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwCmluZGV4IDY5ZWI2NmI5ZjQ1MGZiMGY3YzdiNTJh Y2Q1YmU0ZmJmZWMwOTIxNzYuLmI1NjNhYjRlNGY4ZTVhNGY5ZWYzZjM3NWE2ZTkxYmY5ZDhhNzJh ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVm bC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNw cApAQCAtMzksNyArMzksNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotc3RhdGljIHZvaWQg aW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcigpCitzdGF0aWMgdm9pZCBpbml0aWFsaXplSW5zcGVj dG9yU2VydmVyKFdlYkNvbnRleHQqIGNvbnRleHQpCiB7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9T RVJWRVIpCiAgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKQEAgLTcwLDcgKzcw LDcgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcigpCiAgICAgICAgIH0g ZWxzZQogICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZG4ndCBwYXJzZSAlcywgd3JvbmcgZm9y bWF0PyBVc2luZyAxMjcuMC4wLjE6Mjk5OSBpbnN0ZWFkLiIsIHNlcnZlckFkZHJlc3MudXRmOCgp LmRhdGEoKSk7CiAKLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3JTZXJ2ZXI6OnNoYXJlZCgpLmxp c3RlbihiaW5kQWRkcmVzcywgcG9ydCkpCisgICAgICAgIGlmICghY29udGV4dC0+aW5zcGVjdG9y U2VydmVyKCktPmxpc3RlbihiaW5kQWRkcmVzcywgcG9ydCkpCiAgICAgICAgICAgICBMT0dfRVJS T1IoIkNvdWxkbid0IHN0YXJ0IGxpc3RlbmluZyBvbjogSVAgYWRkcmVzcz0lcywgcG9ydD0lZC4i LCBiaW5kQWRkcmVzcy51dGY4KCkuZGF0YSgpLCBwb3J0KTsKIAogICAgICAgICByZXR1cm47CkBA IC04Nyw3ICs4Nyw3IEBAIFN0cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5KCkKIAogdm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7Ci0gICAgaW5pdGlhbGl6 ZUluc3BlY3RvclNlcnZlcigpOworICAgIGluaXRpYWxpemVJbnNwZWN0b3JTZXJ2ZXIodGhpcyk7 CiAKICAgICBwYXJhbWV0ZXJzLnVybFNjaGVtZXNSZWdpc3RlcmVkID0gc3VwcGxlbWVudDxXZWJT b3VwUmVxdWVzdE1hbmFnZXJQcm94eT4oKS0+cmVnaXN0ZXJlZFVSSVNjaGVtZXMoKTsKICAgICBz dXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4oKS0+Z2V0Q29va2llUGVyc2lzdGVudFN0 b3JhZ2UocGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVBhdGgsIHBhcmFtZXRlcnMu Y29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwCmluZGV4IGQ4M2RmMTIxNTg0Y2UzYmRlNDYyNTZkZTZl ZTEwZjM3NWEyODg0MTUuLjVhNTQwNTI1M2I4NWYxNTMzYjkzOTRjM2EwOTRjZTk3ZGZlYTJmZjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcApA QCAtNDEsNyArNDEsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotc3RhdGljIHZvaWQgaW5p dEluc3BlY3RvclNlcnZlcigpCitzdGF0aWMgdm9pZCBpbml0SW5zcGVjdG9yU2VydmVyKFdlYkNv bnRleHQqIGNvbnRleHQpCiB7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCiAgICAgc3Rh dGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKQEAgLTY5LDcgKzY5LDcgQEAgc3RhdGljIHZv aWQgaW5pdEluc3BlY3RvclNlcnZlcigpCiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgTE9H X0VSUk9SKCJDb3VsZG4ndCBwYXJzZSAlcywgd3JvbmcgZm9ybWF0PyBVc2UgMTI3LjAuMC4xOjI5 OTkgaW5zdGVhZC4iLCBzZXJ2ZXJBZGRyZXNzLnV0ZjgoKS5kYXRhKCkpOwogCi0gICAgICAgIGlm ICghV2ViSW5zcGVjdG9yU2VydmVyOjpzaGFyZWQoKS5saXN0ZW4oYmluZEFkZHJlc3MsIHBvcnQp KQorICAgICAgICBpZiAoIWNvbnRleHQtPmluc3BlY3RvclNlcnZlcigpLT5saXN0ZW4oYmluZEFk ZHJlc3MsIHBvcnQpKQogICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZG4ndCBzdGFydCBsaXN0 ZW5pbmcgb246IElQIGFkZHJlc3M9JXMsIHBvcnQ9JWQuIiwgYmluZEFkZHJlc3MudXRmOCgpLmRh dGEoKSwgcG9ydCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC04Niw3ICs4Niw3IEBAIFdU Rjo6U3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKQogCiB2b2lk IFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSAgICBpbml0SW5zcGVjdG9yU2VydmVyKCk7 CisgICAgaW5pdEluc3BlY3RvclNlcnZlcih0aGlzKTsKIAogICAgIHBhcmFtZXRlcnMudXJsU2No ZW1lc1JlZ2lzdGVyZWQgPSBzdXBwbGVtZW50PFdlYlNvdXBSZXF1ZXN0TWFuYWdlclByb3h5Pigp LT5yZWdpc3RlcmVkVVJJU2NoZW1lcygpOwogICAgIHN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdl clByb3h5PigpLT5nZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBl cnNpc3RlbnRTdG9yYWdlUGF0aCwgcGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5 cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4 dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJDb250ZXh0LmNwcAppbmRl eCBmYWFjYTkxYjJmZTg2YWE1MzNjY2FmMjZjYmMwNWM4NjFjOTVkZDIxLi44YWY3ZDczMmEwNjE3 YTRhYzUxZTRiMzU1NmQzYWZiOTJhMjRhMTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRXZWJDb250ZXh0LmNwcApAQCAtMzksNyArMzksNyBAQCBzdGF0aWMgUXRXZWJDb250 ZXh0KiBzX2RlZmF1bHRRdFdlYkNvbnRleHQgPSAwOwogc3RhdGljIE93blB0cjxRdERvd25sb2Fk TWFuYWdlcj4gc19kb3dubG9hZE1hbmFnZXI7CiBzdGF0aWMgT3duUHRyPFF0V2ViSWNvbkRhdGFi YXNlQ2xpZW50PiBzX2ljb25EYXRhYmFzZTsKIAotc3RhdGljIHZvaWQgaW5pdEluc3BlY3RvclNl cnZlcigpCitzdGF0aWMgdm9pZCBpbml0SW5zcGVjdG9yU2VydmVyKFdlYkNvbnRleHQqIGNvbnRl eHQpCiB7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCiAgICAgUVN0cmluZyBpbnNwZWN0 b3JFbnYgPSBRU3RyaW5nOjpmcm9tVXRmOChxZ2V0ZW52KCJRVFdFQktJVF9JTlNQRUNUT1JfU0VS VkVSIikpOwpAQCAtNjEsNyArNjEsNyBAQCBzdGF0aWMgdm9pZCBpbml0SW5zcGVjdG9yU2VydmVy KCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGJvb2wgc3VjY2Vz cyA9IFdlYkluc3BlY3RvclNlcnZlcjo6c2hhcmVkKCkubGlzdGVuKGJpbmRBZGRyZXNzLCBwb3J0 KTsKKyAgICAgICAgYm9vbCBzdWNjZXNzID0gY29udGV4dC0+aW5zcGVjdG9yU2VydmVyKCktPmxp c3RlbihiaW5kQWRkcmVzcywgcG9ydCk7CiAgICAgICAgIGlmIChzdWNjZXNzKSB7CiAgICAgICAg ICAgICBRU3RyaW5nIGluc3BlY3RvclNlcnZlclVybCA9IFFTdHJpbmc6OmZyb21MYXRpbjEoImh0 dHA6Ly8lMTolMiIpLmFyZyhiaW5kQWRkcmVzcykuYXJnKHBvcnQpOwogICAgICAgICAgICAgcVdh cm5pbmcoIkluc3BlY3RvciBzZXJ2ZXIgc3RhcnRlZCBzdWNjZXNzZnVsbHkuIFRyeSBwb2ludGlu ZyBhIFdlYktpdCBicm93c2VyIHRvICVzIiwgcVByaW50YWJsZShpbnNwZWN0b3JTZXJ2ZXJVcmwp KTsKQEAgLTcxLDE2ICs3MSw2IEBAIHN0YXRpYyB2b2lkIGluaXRJbnNwZWN0b3JTZXJ2ZXIoKQog I2VuZGlmCiB9CiAKLXN0YXRpYyB2b2lkIGdsb2JhbEluaXRpYWxpemF0aW9uKCkKLXsKLSAgICBz dGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOwotICAgIGlmIChpbml0aWFsaXplZCkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgaW5pdEluc3BlY3RvclNlcnZlcigpOwotICAgIGluaXRpYWxp emVkID0gdHJ1ZTsKLX0KLQogc3RhdGljIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0 ZWRCdW5kbGUoV0tDb250ZXh0UmVmLCBXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBlUmVm IG1lc3NhZ2VCb2R5LCBjb25zdCB2b2lkKikKIHsKICAgICBpZiAoIVdLU3RyaW5nSXNFcXVhbFRv VVRGOENTdHJpbmcobWVzc2FnZU5hbWUsICJNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0Iikp CkBAIC0xMjMsNyArMTEzLDcgQEAgUXRXZWJDb250ZXh0Ojp+UXRXZWJDb250ZXh0KCkKIC8vIFVz ZWQgZGlyZWN0bHkgb25seSBieSBXZWJLaXRUZXN0UnVubmVyLgogUGFzc1JlZlB0cjxRdFdlYkNv bnRleHQ+IFF0V2ViQ29udGV4dDo6Y3JlYXRlKFdlYkNvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAg Z2xvYmFsSW5pdGlhbGl6YXRpb24oKTsKKyAgICBpbml0SW5zcGVjdG9yU2VydmVyKGNvbnRleHQp OwogICAgIC8vIFRoZSBsaWZldGltZSBvZiBXZWJDb250ZXh0IGlzIGEgYml0IHNwZWNpYWwsIGl0 IGlzIGJvdW5kIHRvIHRoZSByZWZlcmVuY2UgaGVsZAogICAgIC8vIGJ5IFF0V2ViQ29udGV4dCBh dCBmaXJzdCBhbmQgdGhlbiBlbnRlcnMgYSBjaXJjdWxhciBkZXBlbmRlbmN5IHdpdGggV2ViUHJv Y2Vzc1Byb3h5CiAgICAgLy8gb25jZSB0aGUgZmlyc3QgcGFnZSBpcyBjcmVhdGVkIHVudGlsIHRo ZSB3ZWIgcHJvY2VzcyBleGl0cy4gQmVjYXVzZSBvZiB0aGlzIHdlIGNhbid0Cg== 188535 2013-02-15 04:15:35 -0800 2013-03-13 06:52:04 -0700 Patch bug-109921-20130215131201.patch text/plain 13995 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjk5YTI3NzVlZDU3NDU4 OTU1ODFjNjBmMzMzOThjYzA3M2NkMDBmMy4uOWExZmNiMTY4OGVmNzQ0YWU4Y2E2OTIyYzFmOWQz MGI2MjU2YTMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAyLTE1ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKKyAgICAgICAgW1dL Ml0gTWFrZSBXZWJJbnNwZWN0b3JTZXJ2ZXIgYSBtZW1iZXIgb2YgV2ViQ29udGV4dCBpbnN0ZWFk IG9mIGEgc2luZ2xldG9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDk5MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBc3N1bWluZyB0aGF0IHVzZXJzIHdvbid0IG5lZWQgdG8gc3Bhd24gbW9yZSB0aGFu IG9uZSBXS0NvbnRleHQgcGVyIGFwcGxpY2F0aW9uLAorICAgICAgICB0aGlzIGF0dGFjaGVzIHRo ZSBXZWJJbnNwZWN0b3Igc2VydmVyIGluc3RhbmNlIHRvIFdlYkNvbnRleHQgaW4gcHJlcGFyYXRp b24gZm9yCisgICAgICAgIGV4cG9zaW5nIGl0IHRocm91Z2ggV0tJbnNwZWN0b3JTZXJ2ZXIgaW4g dGhlIEMgQVBJLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNw cDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OnJlbW90ZUluc3BlY3RvclVy bCk6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2 ZXIuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9y U2VydmVyLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclNlcnZlcjo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkluc3BlY3RvclNlcnZlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNv bnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpXZWJDb250ZXh0KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAg ICAgKFdlYkNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjppbnNwZWN0b3JT ZXJ2ZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjppbnZhbGlkYXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OmVuYWJsZVJlbW90ZUluc3BlY3Rpb24pOgorICAgICAg ICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6c2VuZE1lc3NhZ2VUb1JlbW90ZUZyb250ZW5k KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwOgorICAgICAgICAo V2ViS2l0Ojppbml0aWFsaXplSW5zcGVjdG9yU2VydmVyKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9j ZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6aW5pdEluc3BlY3Rv clNlcnZlcik6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6 ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuY3BwOgor ICAgICAgICAoV2ViS2l0Ojppbml0SW5zcGVjdG9yU2VydmVyKToKKyAgICAgICAgKFdlYktpdDo6 UXRXZWJDb250ZXh0OjpjcmVhdGUpOgorCiAyMDEzLTAyLTA3ICBTaGVyaWZmIEJvdCAgPHdlYmtp dC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91 dCByMTQyMjEyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAKaW5kZXggM2E4MDEwYThiZDcyYjY4ZGE1NTNkYzU3NGYyMTUyYWQyMjliMGJj MS4uMGU2NGFmMjczMGUzOTkwOTlmY2EyMzAzZWJjZmJlOTJlZDg0Y2NlYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0zNCw2 ICszNCw3IEBACiAjaW5jbHVkZSAiUXRXZWJQYWdlRXZlbnRIYW5kbGVyLmgiCiAjaW5jbHVkZSAi UXRXZWJQYWdlUG9saWN5Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0Lmgi CisjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkZpbmRPcHRpb25zLmgiCiAj aWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCiAjaW5jbHVkZSAiV2ViSW5zcGVjdG9yUHJveHku aCIKQEAgLTEzOTMsNyArMTM5NCw4IEBAIHZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6 c2V0VXNlclNjcmlwdHMoY29uc3QgUUxpc3Q8UVVybD4mIHVzZXJTY3JpcHRzKQogUVVybCBRUXVp Y2tXZWJWaWV3RXhwZXJpbWVudGFsOjpyZW1vdGVJbnNwZWN0b3JVcmwoKSBjb25zdAogewogI2lm IEVOQUJMRShJTlNQRUNUT1JfU0VSVkVSKQotICAgIHJldHVybiBRVXJsKFdlYkluc3BlY3RvclNl cnZlcjo6c2hhcmVkKCkuaW5zcGVjdG9yVXJsRm9yUGFnZUlEKGRfcHRyLT53ZWJQYWdlUHJveHkt Pmluc3BlY3RvcigpLT5yZW1vdGVJbnNwZWN0aW9uUGFnZUlEKCkpKTsKKyAgICBRX0QoY29uc3Qg UVF1aWNrV2ViVmlldyk7CisgICAgcmV0dXJuIFFVcmwoZC0+Y29udGV4dC0+Y29udGV4dCgpLT5p bnNwZWN0b3JTZXJ2ZXIoKS0+aW5zcGVjdG9yVXJsRm9yUGFnZUlEKGRfcHRyLT53ZWJQYWdlUHJv eHktPmluc3BlY3RvcigpLT5yZW1vdGVJbnNwZWN0aW9uUGFnZUlEKCkpKTsKICNlbHNlCiAgICAg cmV0dXJuIFFVcmwoKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuY3BwCmluZGV4 IGJjNTg1ZTk0ZGM4NDM3MWU5NTZlZDBjZjVlNjllYWZiMDI2YjEyNzYuLjc0MTVkM2ZmOTU5OWUx YzE1OGUwNjRjNTkzMDY0OTUwMmJmZWUwMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5j cHAKQEAgLTUwLDEyICs1MCw2IEBAIHN0YXRpYyB1bnNpZ25lZCBwYWdlSWRGcm9tUmVxdWVzdFBh dGgoY29uc3QgU3RyaW5nJiBwYXRoKQogICAgIHJldHVybiBudW1iZXI7CiB9CiAKLVdlYkluc3Bl Y3RvclNlcnZlciYgV2ViSW5zcGVjdG9yU2VydmVyOjpzaGFyZWQoKQotewotICAgIHN0YXRpYyBX ZWJJbnNwZWN0b3JTZXJ2ZXImIHNlcnZlciA9ICpuZXcgV2ViSW5zcGVjdG9yU2VydmVyOwotICAg IHJldHVybiBzZXJ2ZXI7Ci19Ci0KIFdlYkluc3BlY3RvclNlcnZlcjo6V2ViSW5zcGVjdG9yU2Vy dmVyKCkKICAgICA6IFdlYlNvY2tldFNlcnZlcih0aGlzKQogICAgICwgbV9uZXh0QXZhaWxhYmxl UGFnZUlkKDEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9y U2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0lu c3BlY3RvclNlcnZlci9XZWJJbnNwZWN0b3JTZXJ2ZXIuaAppbmRleCAxMjRjNDZmZjI3NzQ1Y2Nj N2EwN2FiZjYxYjQ0YjUzNGU2Mjk4NjViLi40MzI2MDE5Yjg1NTQ4YmE0ODA4ZTA1NDY2ZGMyNjk3 ZjAwNmYwOWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVjdG9y U2VydmVyL1dlYkluc3BlY3RvclNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9JbnNwZWN0b3JTZXJ2ZXIvV2ViSW5zcGVjdG9yU2VydmVyLmgKQEAgLTM4LDEwICszOCwxMiBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViSW5zcGVjdG9yUHJveHk7CiAKLWNsYXNz IFdlYkluc3BlY3RvclNlcnZlciA6IHB1YmxpYyBXZWJTb2NrZXRTZXJ2ZXIsIHB1YmxpYyBXZWJT b2NrZXRTZXJ2ZXJDbGllbnQgeworY2xhc3MgV2ViSW5zcGVjdG9yU2VydmVyIDogcHVibGljIFJl ZkNvdW50ZWQ8V2ViSW5zcGVjdG9yU2VydmVyPiwgcHVibGljIFdlYlNvY2tldFNlcnZlciwgcHVi bGljIFdlYlNvY2tldFNlcnZlckNsaWVudCB7CiBwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQ dHI8V2ViSW5zcGVjdG9yU2VydmVyPiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFJlZihuZXcgV2Vi SW5zcGVjdG9yU2VydmVyKTsgfQogICAgIHR5cGVkZWYgSGFzaE1hcDx1bnNpZ25lZCwgV2ViSW5z cGVjdG9yUHJveHkqPiBDbGllbnRNYXA7Ci0gICAgc3RhdGljIFdlYkluc3BlY3RvclNlcnZlciYg c2hhcmVkKCk7CisKKyAgICB+V2ViSW5zcGVjdG9yU2VydmVyKCk7CiAKICAgICAvLyBQYWdlIHJl Z2lzdHJ5IHRvIG1hbmFnZSBrbm93biBwYWdlcy4KICAgICBpbnQgcmVnaXN0ZXJQYWdlKFdlYklu c3BlY3RvclByb3h5KiBjbGllbnQpOwpAQCAtNTEsNyArNTMsNiBAQCBwdWJsaWM6CiAKIHByaXZh dGU6CiAgICAgV2ViSW5zcGVjdG9yU2VydmVyKCk7Ci0gICAgfldlYkluc3BlY3RvclNlcnZlcigp OwogCiAgICAgLy8gV2ViU29ja2V0U2VydmVyQ2xpZW50IGltcGxlbWVudGF0aW9uLiBFdmVudHMg Y29taW5nIGZyb20gcmVtb3RlIGNvbm5lY3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNl aXZlVW5yZWNvZ25pemVkSFRUUFJlcXVlc3QoV2ViU29ja2V0U2VydmVyQ29ubmVjdGlvbiosIFBh c3NSZWZQdHI8V2ViQ29yZTo6SFRUUFJlcXVlc3Q+KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmNwcAppbmRleCBiN2ZmMTE1ZmQzZmJiNjAzNWQ4M2U5YjU0NDI2N2Y4NDUxYzI3 MTVhLi5kMzE0MjMzZTZiMTk0YWY4ZjE5NGIxM2ExMjc5OGVjNTUxN2JkNjQ1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCkBAIC02OSw2ICs2OSwxMCBAQAogI2luY2x1 ZGUgIldlYkJhdHRlcnlNYW5hZ2VyUHJveHkuaCIKICNlbmRpZgogCisjaWYgRU5BQkxFKElOU1BF Q1RPUl9TRVJWRVIpCisjaW5jbHVkZSAiV2ViSW5zcGVjdG9yU2VydmVyLmgiCisjZW5kaWYKKwog I2lmIEVOQUJMRShORVRXT1JLX0lORk8pCiAjaW5jbHVkZSAiV2ViTmV0d29ya0luZm9NYW5hZ2Vy UHJveHkuaCIKICNlbmRpZgpAQCAtMTY1LDYgKzE2OSw5IEBAIFdlYkNvbnRleHQ6OldlYkNvbnRl eHQoUHJvY2Vzc01vZGVsIHByb2Nlc3NNb2RlbCwgY29uc3QgU3RyaW5nJiBpbmplY3RlZEJ1bmRs ZVBhCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgbV9wbHVnaW5TaXRlRGF0 YU1hbmFnZXIgPSBXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXI6OmNyZWF0ZSh0aGlzKTsKICNlbmRp ZiAvLyBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKKyNpZiBFTkFCTEUoSU5TUEVDVE9SX1NF UlZFUikKKyAgICBtX2luc3BlY3RvclNlcnZlciA9IFdlYkluc3BlY3RvclNlcnZlcjo6Y3JlYXRl KCk7CisjZW5kaWYKIAogICAgIGFkZFN1cHBsZW1lbnQ8V2ViQXBwbGljYXRpb25DYWNoZU1hbmFn ZXJQcm94eT4oKTsKICAgICBhZGRTdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4oKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCmluZGV4IDBkODNkNTNjNWU0MjAzOGM1 YjI2YWU1YjdmOGU0MTU1NGE4NmViYWQuLjY3OGUxYmE5N2UyMTYzNzQ4NWM5MTRmMzQ3ZjZlYzdk ZjdhNWE1OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaApAQCAtNjEsNiAr NjEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIERvd25sb2FkUHJveHk7CiBjbGFzcyBX ZWJDb250ZXh0U3VwcGxlbWVudDsKIGNsYXNzIFdlYkljb25EYXRhYmFzZTsKK2NsYXNzIFdlYklu c3BlY3RvclNlcnZlcjsKIGNsYXNzIFdlYlBhZ2VHcm91cDsKIGNsYXNzIFdlYlBhZ2VQcm94eTsK IHN0cnVjdCBTdGF0aXN0aWNzRGF0YTsKQEAgLTIxMyw2ICsyMTQsOSBAQCBwdWJsaWM6CiAjaWYg RU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2Vy KiBwbHVnaW5TaXRlRGF0YU1hbmFnZXIoKSBjb25zdCB7IHJldHVybiBtX3BsdWdpblNpdGVEYXRh TWFuYWdlci5nZXQoKTsgfQogI2VuZGlmCisjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCisg ICAgV2ViSW5zcGVjdG9yU2VydmVyKiBpbnNwZWN0b3JTZXJ2ZXIoKSBjb25zdCB7IHJldHVybiBt X2luc3BlY3RvclNlcnZlci5nZXQoKTsgfQorI2VuZGlmCiAKICAgICBzdHJ1Y3QgU3RhdGlzdGlj cyB7CiAgICAgICAgIHVuc2lnbmVkIHdrVmlld0NvdW50OwpAQCAtNDIzLDYgKzQyNyw5IEBAIHBy aXZhdGU6CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgUmVmUHRyPFdlYlBs dWdpblNpdGVEYXRhTWFuYWdlcj4gbV9wbHVnaW5TaXRlRGF0YU1hbmFnZXI7CiAjZW5kaWYKKyNp ZiBFTkFCTEUoSU5TUEVDVE9SX1NFUlZFUikKKyAgICBSZWZQdHI8V2ViSW5zcGVjdG9yU2VydmVy PiBtX2luc3BlY3RvclNlcnZlcjsKKyNlbmRpZgogCiAgICAgUmVmUHRyPFN0b3JhZ2VNYW5hZ2Vy PiBtX3N0b3JhZ2VNYW5hZ2VyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYklu c3BlY3RvclByb3h5LmNwcAppbmRleCBjMDhmMGE4ZTFjMGNiY2NhNGZjYWNmZGY5YzEzOWE1ZmRm ZmEzNjEwLi5iZTBhY2NjMTRmNzNhY2ZjZTFhZDk3NjhkOThmNGIyMmJlNjJiYjJmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAgLTI5LDYg KzI5LDcgQEAKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAKKyNpbmNsdWRlICJXZWJDb250ZXh0 LmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmgiCiAjaW5jbHVkZSAi V2ViRnJhbWVQcm94eS5oIgogI2luY2x1ZGUgIldlYkluc3BlY3Rvck1lc3NhZ2VzLmgiCkBAIC0x MDQsNyArMTA1LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6aW52YWxpZGF0ZSgpCiB7CiAj aWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCiAgICAgaWYgKG1fcmVtb3RlSW5zcGVjdGlvblBh Z2VJZCkKLSAgICAgICAgV2ViSW5zcGVjdG9yU2VydmVyOjpzaGFyZWQoKS51bnJlZ2lzdGVyUGFn ZShtX3JlbW90ZUluc3BlY3Rpb25QYWdlSWQpOworICAgICAgICBtX3BhZ2UtPnByb2Nlc3MoKS0+ Y29udGV4dCgpLT5pbnNwZWN0b3JTZXJ2ZXIoKS0+dW5yZWdpc3RlclBhZ2UobV9yZW1vdGVJbnNw ZWN0aW9uUGFnZUlkKTsKICNlbmRpZgogCiAgICAgbV9wYWdlLT5wcm9jZXNzKCktPnJlbW92ZU1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgbV9wYWdlLT5wYWdlSUQoKSk7CkBAIC0yODMsNyArMjg0LDcgQEAgc3RhdGljIHZv aWQgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXS1BhZ2VSZWYsIFdLRnJhbWVSZWYg ZnJhbWVSZWYsIFdLRnIKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmVuYWJsZVJlbW90ZUluc3Bl Y3Rpb24oKQogewogICAgIGlmICghbV9yZW1vdGVJbnNwZWN0aW9uUGFnZUlkKQotICAgICAgICBt X3JlbW90ZUluc3BlY3Rpb25QYWdlSWQgPSBXZWJJbnNwZWN0b3JTZXJ2ZXI6OnNoYXJlZCgpLnJl Z2lzdGVyUGFnZSh0aGlzKTsKKyAgICAgICAgbV9yZW1vdGVJbnNwZWN0aW9uUGFnZUlkID0gbV9w YWdlLT5wcm9jZXNzKCktPmNvbnRleHQoKS0+aW5zcGVjdG9yU2VydmVyKCktPnJlZ2lzdGVyUGFn ZSh0aGlzKTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6cmVtb3RlRnJvbnRlbmRDb25u ZWN0ZWQoKQpAQCAtNDAzLDcgKzQwNCw3IEBAIGJvb2wgV2ViSW5zcGVjdG9yUHJveHk6OnNob3Vs ZE9wZW5BdHRhY2hlZCgpCiB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpzZW5kTWVzc2FnZVRvUmVt b3RlRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewogICAgIEFTU0VSVChtX3JlbW90 ZUluc3BlY3Rpb25QYWdlSWQpOwotICAgIFdlYkluc3BlY3RvclNlcnZlcjo6c2hhcmVkKCkuc2Vu ZE1lc3NhZ2VPdmVyQ29ubmVjdGlvbihtX3JlbW90ZUluc3BlY3Rpb25QYWdlSWQsIG1lc3NhZ2Up OworICAgIG1fcGFnZS0+cHJvY2VzcygpLT5jb250ZXh0KCktPmluc3BlY3RvclNlcnZlcigpLT5z ZW5kTWVzc2FnZU92ZXJDb25uZWN0aW9uKG1fcmVtb3RlSW5zcGVjdGlvblBhZ2VJZCwgbWVzc2Fn ZSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9XZWJDb250ZXh0RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29u dGV4dEVmbC5jcHAKaW5kZXggNjllYjY2YjlmNDUwZmIwZjdjN2I1MmFjZDViZTRmYmZlYzA5MjE3 Ni4uYjU2M2FiNGU0ZjhlNWE0ZjllZjNmMzc1YTZlOTFiZjlkOGE3MmFkNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwCkBAIC0zOSw3ICszOSw3 IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1zdGF0aWMgdm9pZCBpbml0aWFsaXplSW5zcGVj dG9yU2VydmVyKCkKK3N0YXRpYyB2b2lkIGluaXRpYWxpemVJbnNwZWN0b3JTZXJ2ZXIoV2ViQ29u dGV4dCogY29udGV4dCkKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SX1NFUlZFUikKICAgICBzdGF0 aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOwpAQCAtNzAsNyArNzAsNyBAQCBzdGF0aWMgdm9p ZCBpbml0aWFsaXplSW5zcGVjdG9yU2VydmVyKCkKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICBMT0dfRVJST1IoIkNvdWxkbid0IHBhcnNlICVzLCB3cm9uZyBmb3JtYXQ/IFVzaW5nIDEyNy4w LjAuMToyOTk5IGluc3RlYWQuIiwgc2VydmVyQWRkcmVzcy51dGY4KCkuZGF0YSgpKTsKIAotICAg ICAgICBpZiAoIVdlYkluc3BlY3RvclNlcnZlcjo6c2hhcmVkKCkubGlzdGVuKGJpbmRBZGRyZXNz LCBwb3J0KSkKKyAgICAgICAgaWYgKCFjb250ZXh0LT5pbnNwZWN0b3JTZXJ2ZXIoKS0+bGlzdGVu KGJpbmRBZGRyZXNzLCBwb3J0KSkKICAgICAgICAgICAgIExPR19FUlJPUigiQ291bGRuJ3Qgc3Rh cnQgbGlzdGVuaW5nIG9uOiBJUCBhZGRyZXNzPSVzLCBwb3J0PSVkLiIsIGJpbmRBZGRyZXNzLnV0 ZjgoKS5kYXRhKCksIHBvcnQpOwogCiAgICAgICAgIHJldHVybjsKQEAgLTg3LDcgKzg3LDcgQEAg U3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKQogCiB2b2lkIFdl YkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSAgICBpbml0aWFsaXplSW5zcGVjdG9yU2VydmVy KCk7CisgICAgaW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcih0aGlzKTsKIAogICAgIHBhcmFtZXRl cnMudXJsU2NoZW1lc1JlZ2lzdGVyZWQgPSBzdXBwbGVtZW50PFdlYlNvdXBSZXF1ZXN0TWFuYWdl clByb3h5PigpLT5yZWdpc3RlcmVkVVJJU2NoZW1lcygpOwogICAgIHN1cHBsZW1lbnQ8V2ViQ29v a2llTWFuYWdlclByb3h5PigpLT5nZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJz LmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCwgcGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50 U3RvcmFnZVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJDb250ZXh0R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4 dEd0ay5jcHAKaW5kZXggZDgzZGYxMjE1ODRjZTNiZGU0NjI1NmRlNmVlMTBmMzc1YTI4ODQxNS4u NWE1NDA1MjUzYjg1ZjE1MzNiOTM5NGMzYTA5NGNlOTdkZmVhMmZmMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwCkBAIC00MSw3ICs0MSw3IEBA CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1zdGF0aWMgdm9pZCBpbml0SW5zcGVjdG9yU2VydmVy KCkKK3N0YXRpYyB2b2lkIGluaXRJbnNwZWN0b3JTZXJ2ZXIoV2ViQ29udGV4dCogY29udGV4dCkK IHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SX1NFUlZFUikKICAgICBzdGF0aWMgYm9vbCBpbml0aWFs aXplZCA9IGZhbHNlOwpAQCAtNjksNyArNjksNyBAQCBzdGF0aWMgdm9pZCBpbml0SW5zcGVjdG9y U2VydmVyKCkKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0 IHBhcnNlICVzLCB3cm9uZyBmb3JtYXQ/IFVzZSAxMjcuMC4wLjE6Mjk5OSBpbnN0ZWFkLiIsIHNl cnZlckFkZHJlc3MudXRmOCgpLmRhdGEoKSk7CiAKLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3JT ZXJ2ZXI6OnNoYXJlZCgpLmxpc3RlbihiaW5kQWRkcmVzcywgcG9ydCkpCisgICAgICAgIGlmICgh Y29udGV4dC0+aW5zcGVjdG9yU2VydmVyKCktPmxpc3RlbihiaW5kQWRkcmVzcywgcG9ydCkpCiAg ICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0IHN0YXJ0IGxpc3RlbmluZyBvbjogSVAgYWRk cmVzcz0lcywgcG9ydD0lZC4iLCBiaW5kQWRkcmVzcy51dGY4KCkuZGF0YSgpLCBwb3J0KTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTg2LDcgKzg2LDcgQEAgV1RGOjpTdHJpbmcgV2ViQ29u dGV4dDo6YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpCiAKIHZvaWQgV2ViQ29udGV4dDo6cGxh dGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBw YXJhbWV0ZXJzKQogewotICAgIGluaXRJbnNwZWN0b3JTZXJ2ZXIoKTsKKyAgICBpbml0SW5zcGVj dG9yU2VydmVyKHRoaXMpOwogCiAgICAgcGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZCA9 IHN1cHBsZW1lbnQ8V2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHk+KCktPnJlZ2lzdGVyZWRVUklT Y2hlbWVzKCk7CiAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyUHJveHk+KCktPmdldENv b2tpZVBlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VQ YXRoLCBwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuY3BwCmluZGV4IGZhYWNhOTFiMmZlODZh YTUzM2NjYWYyNmNiYzA1Yzg2MWM5NWRkMjEuLjhhZjdkNzMyYTA2MTdhNGFjNTFlNGIzNTU2ZDNh ZmI5MmEyNGExMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdl YkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRl eHQuY3BwCkBAIC0zOSw3ICszOSw3IEBAIHN0YXRpYyBRdFdlYkNvbnRleHQqIHNfZGVmYXVsdFF0 V2ViQ29udGV4dCA9IDA7CiBzdGF0aWMgT3duUHRyPFF0RG93bmxvYWRNYW5hZ2VyPiBzX2Rvd25s b2FkTWFuYWdlcjsKIHN0YXRpYyBPd25QdHI8UXRXZWJJY29uRGF0YWJhc2VDbGllbnQ+IHNfaWNv bkRhdGFiYXNlOwogCi1zdGF0aWMgdm9pZCBpbml0SW5zcGVjdG9yU2VydmVyKCkKK3N0YXRpYyB2 b2lkIGluaXRJbnNwZWN0b3JTZXJ2ZXIoV2ViQ29udGV4dCogY29udGV4dCkKIHsKICNpZiBFTkFC TEUoSU5TUEVDVE9SX1NFUlZFUikKICAgICBRU3RyaW5nIGluc3BlY3RvckVudiA9IFFTdHJpbmc6 OmZyb21VdGY4KHFnZXRlbnYoIlFUV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVIiKSk7CkBAIC02MSw3 ICs2MSw3IEBAIHN0YXRpYyB2b2lkIGluaXRJbnNwZWN0b3JTZXJ2ZXIoKQogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgYm9vbCBzdWNjZXNzID0gV2ViSW5zcGVjdG9y U2VydmVyOjpzaGFyZWQoKS5saXN0ZW4oYmluZEFkZHJlc3MsIHBvcnQpOworICAgICAgICBib29s IHN1Y2Nlc3MgPSBjb250ZXh0LT5pbnNwZWN0b3JTZXJ2ZXIoKS0+bGlzdGVuKGJpbmRBZGRyZXNz LCBwb3J0KTsKICAgICAgICAgaWYgKHN1Y2Nlc3MpIHsKICAgICAgICAgICAgIFFTdHJpbmcgaW5z cGVjdG9yU2VydmVyVXJsID0gUVN0cmluZzo6ZnJvbUxhdGluMSgiaHR0cDovLyUxOiUyIikuYXJn KGJpbmRBZGRyZXNzKS5hcmcocG9ydCk7CiAgICAgICAgICAgICBxV2FybmluZygiSW5zcGVjdG9y IHNlcnZlciBzdGFydGVkIHN1Y2Nlc3NmdWxseS4gVHJ5IHBvaW50aW5nIGEgV2ViS2l0IGJyb3dz ZXIgdG8gJXMiLCBxUHJpbnRhYmxlKGluc3BlY3RvclNlcnZlclVybCkpOwpAQCAtNzEsMTYgKzcx LDYgQEAgc3RhdGljIHZvaWQgaW5pdEluc3BlY3RvclNlcnZlcigpCiAjZW5kaWYKIH0KIAotc3Rh dGljIHZvaWQgZ2xvYmFsSW5pdGlhbGl6YXRpb24oKQotewotICAgIHN0YXRpYyBib29sIGluaXRp YWxpemVkID0gZmFsc2U7Ci0gICAgaWYgKGluaXRpYWxpemVkKQotICAgICAgICByZXR1cm47Ci0K LSAgICBpbml0SW5zcGVjdG9yU2VydmVyKCk7Ci0gICAgaW5pdGlhbGl6ZWQgPSB0cnVlOwotfQot CiBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShXS0NvbnRl eHRSZWYsIFdLU3RyaW5nUmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVSZWYgbWVzc2FnZUJvZHksIGNv bnN0IHZvaWQqKQogewogICAgIGlmICghV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNz YWdlTmFtZSwgIk1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QiKSkKQEAgLTEyMyw3ICsxMTMs NyBAQCBRdFdlYkNvbnRleHQ6On5RdFdlYkNvbnRleHQoKQogLy8gVXNlZCBkaXJlY3RseSBvbmx5 IGJ5IFdlYktpdFRlc3RSdW5uZXIuCiBQYXNzUmVmUHRyPFF0V2ViQ29udGV4dD4gUXRXZWJDb250 ZXh0OjpjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCkKIHsKLSAgICBnbG9iYWxJbml0aWFsaXph dGlvbigpOworICAgIGluaXRJbnNwZWN0b3JTZXJ2ZXIoY29udGV4dCk7CiAgICAgLy8gVGhlIGxp ZmV0aW1lIG9mIFdlYkNvbnRleHQgaXMgYSBiaXQgc3BlY2lhbCwgaXQgaXMgYm91bmQgdG8gdGhl IHJlZmVyZW5jZSBoZWxkCiAgICAgLy8gYnkgUXRXZWJDb250ZXh0IGF0IGZpcnN0IGFuZCB0aGVu IGVudGVycyBhIGNpcmN1bGFyIGRlcGVuZGVuY3kgd2l0aCBXZWJQcm9jZXNzUHJveHkKICAgICAv LyBvbmNlIHRoZSBmaXJzdCBwYWdlIGlzIGNyZWF0ZWQgdW50aWwgdGhlIHdlYiBwcm9jZXNzIGV4 aXRzLiBCZWNhdXNlIG9mIHRoaXMgd2UgY2FuJ3QK