42372 2010-07-15 07:13:37 -0700 Web Inspector: differentiate between blocking and connecting timers. 2010-07-15 08:04:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 251859 0 pfeldman 2010-07-15 07:13:37 -0700 Also contains couple of drive-by fixes: - allows setting "cached" after the resource graph has been created. - prevents inspector from getting information about the same resource twice in case areMemoryCacheClientCallsEnabled == true. 251861 1 61655 pfeldman 2010-07-15 07:17:31 -0700 Created attachment 61655 [PATCH] Proposed change. 251867 2 61655 yurys 2010-07-15 07:28:47 -0700 Comment on attachment 61655 [PATCH] Proposed change. WebCore/loader/FrameLoader.cpp:3080 + page->inspectorController()->didLoadResourceFromMemoryCache(m_documentLoader.get(), resource); You seem to miss this call from the next branch. WebCore/inspector/InspectorResource.cpp:67 + , m_connection(false) What is this? 251870 3 61657 pfeldman 2010-07-15 07:30:33 -0700 Created attachment 61657 [PATCH] Fixed typos, added cached reporting branch. 251872 4 61657 yurys 2010-07-15 07:37:03 -0700 Comment on attachment 61657 [PATCH] Fixed typos, added cached reporting branch. WebCore/loader/FrameLoader.cpp:3080 + page->inspectorController()->didLoadResourceFromMemoryCache(m_documentLoader.get(), resource); Would be nice if we could get rid of duplicating this call. 251874 5 61659 pfeldman 2010-07-15 07:40:20 -0700 Created attachment 61659 [PATCH] To land. 251889 6 pfeldman 2010-07-15 08:04:10 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorResource.cpp M WebCore/inspector/InspectorResource.h M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/inspector.js M WebCore/loader/FrameLoader.cpp M WebCore/platform/network/ResourceResponseBase.cpp M WebCore/platform/network/ResourceResponseBase.h M WebKit/chromium/ChangeLog M WebKit/chromium/public/WebURLResponse.h M WebKit/chromium/src/WebURLResponse.cpp Committed r63425 61655 2010-07-15 07:17:31 -0700 2010-07-15 07:30:33 -0700 [PATCH] Proposed change. blocking_time text/plain 15053 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGE5NDRjNS4uOThiMmY4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0wNy0xNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaWZmZXJlbnRpYXRlIGJldHdlZW4g YmxvY2tpbmcgYW5kIGNvbm5lY3RpbmcgdGltZXJzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjM3MgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNl OjpJbnNwZWN0b3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6dXBkYXRlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6 OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6YnVpbGRPYmplY3RGb3JUaW1pbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZS5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCBjYWNoZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgY2FjaGVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fc2hvd1BvcG92ZXIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGgpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlR3JhcGgucHJvdG90eXBlLnJlZnJlc2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlR3JhcGgucHJvdG90eXBlLl9jYWNoZWRDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci51cGRhdGVS ZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6CisgICAg ICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlQmFzZTo6UmVzb3VyY2VSZXNwb25zZUJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZUJhc2U6OmNvbm5lY3Rpb25SZXVzZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZUJhc2U6OnNldENvbm5lY3Rpb25JRCk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oOgorCiAyMDEwLTA3LTE1ICBOaWtvbGFzIFpp bW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4IDkx YTU3ZTAuLjNjMmI4NDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAK QEAgLTY0LDYgKzY0LDcgQEAgSW5zcGVjdG9yUmVzb3VyY2U6Okluc3BlY3RvclJlc291cmNlKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGwKICAgICAsIG1fbG9hZEV2 ZW50VGltZSgtMS4wKQogICAgICwgbV9kb21Db250ZW50RXZlbnRUaW1lKC0xLjApCiAgICAgLCBt X2Nvbm5lY3Rpb25JRCgwKQorICAgICwgbV9jb25uZWN0aW9uKGZhbHNlKQogICAgICwgbV9pc01h aW5SZXNvdXJjZShmYWxzZSkKIHsKIH0KQEAgLTEzMSw2ICsxMzIsNyBAQCB2b2lkIEluc3BlY3Rv clJlc291cmNlOjp1cGRhdGVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25z ZSkKICAgICBtX3N1Z2dlc3RlZEZpbGVuYW1lID0gcmVzcG9uc2Uuc3VnZ2VzdGVkRmlsZW5hbWUo KTsKIAogICAgIG1fY29ubmVjdGlvbklEID0gcmVzcG9uc2UuY29ubmVjdGlvbklEKCk7CisgICAg bV9jb25uZWN0aW9uUmV1c2VkID0gcmVzcG9uc2UuY29ubmVjdGlvblJldXNlZCgpOwogICAgIG1f bG9hZFRpbWluZyA9IHJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpOwogICAgIG1fY2FjaGVk ID0gcmVzcG9uc2Uud2FzQ2FjaGVkKCk7CiAKQEAgLTE4Myw2ICsxODUsNyBAQCB2b2lkIEluc3Bl Y3RvclJlc291cmNlOjp1cGRhdGVTY3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250 ZW5kKQogICAgICAgICBwb3B1bGF0ZUhlYWRlcnNPYmplY3QoJnJlc3BvbnNlSGVhZGVycywgbV9y ZXNwb25zZUhlYWRlckZpZWxkcyk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJyZXNwb25zZUhl YWRlcnMiLCByZXNwb25zZUhlYWRlcnMpOwogICAgICAgICBqc29uT2JqZWN0LnNldCgiY29ubmVj dGlvbklEIiwgbV9jb25uZWN0aW9uSUQpOworICAgICAgICBqc29uT2JqZWN0LnNldCgiY29ubmVj dGlvblJldXNlZCIsIG1fY29ubmVjdGlvblJldXNlZCk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0 KCJjYWNoZWQiLCBtX2NhY2hlZCk7CiAgICAgICAgIGlmIChtX2xvYWRUaW1pbmcgJiYgIW1fY2Fj aGVkKQogICAgICAgICAgICAganNvbk9iamVjdC5zZXQoInRpbWluZyIsIGJ1aWxkT2JqZWN0Rm9y VGltaW5nKGZyb250ZW5kLCBtX2xvYWRUaW1pbmcuZ2V0KCkpKTsKQEAgLTM5NCw5ICszOTcsOSBA QCBTY3JpcHRPYmplY3QgSW5zcGVjdG9yUmVzb3VyY2U6OmJ1aWxkT2JqZWN0Rm9yVGltaW5nKElu c3BlY3RvckZyb250ZW5kKiBmcm9udGVuZAogICAgIGpzb25PYmplY3Quc2V0KCJwcm94eUR1cmF0 aW9uIiwgdGltaW5nLT5wcm94eVN0YXJ0ID09IC0xID8gLTEgOiAodGltaW5nLT5wcm94eUVuZCAt IHRpbWluZy0+cHJveHlTdGFydCkgLyAxMDAwLjApOwogICAgIGpzb25PYmplY3Quc2V0KCJkbnNE dXJhdGlvbiIsIHRpbWluZy0+ZG5zU3RhcnQgPT0gLTEgPyAtMSA6ICh0aW1pbmctPmRuc0VuZCAt IHRpbWluZy0+ZG5zU3RhcnQpIC8gMTAwMC4wKTsKICAgICBqc29uT2JqZWN0LnNldCgiY29ubmVj dER1cmF0aW9uIiwgdGltaW5nLT5jb25uZWN0U3RhcnQgPT0gLTEgPyAtMSA6ICh0aW1pbmctPmNv bm5lY3RFbmQgLSB0aW1pbmctPmNvbm5lY3RTdGFydCkgLyAxMDAwLjApOworICAgIGpzb25PYmpl Y3Quc2V0KCJzc2xEdXJhdGlvbiIsICh0aW1pbmctPnNzbEVuZCAtIHRpbWluZy0+c3NsU3RhcnQp IC8gMTAwMC4wKTsKICAgICBqc29uT2JqZWN0LnNldCgic2VuZER1cmF0aW9uIiwgKHRpbWluZy0+ c2VuZEVuZCAtIHRpbWluZy0+c2VuZFN0YXJ0KSAvIDEwMDAuMCk7CiAgICAganNvbk9iamVjdC5z ZXQoIndhaXREdXJhdGlvbiIsICh0aW1pbmctPnJlY2VpdmVIZWFkZXJzRW5kIC0gdGltaW5nLT5z ZW5kRW5kKSAgLyAxMDAwLjApOwotICAgIGpzb25PYmplY3Quc2V0KCJzc2xEdXJhdGlvbiIsICh0 aW1pbmctPnNzbEVuZCAtIHRpbWluZy0+c3NsU3RhcnQpIC8gMTAwMC4wKTsKICAgICByZXR1cm4g anNvbk9iamVjdDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UmVzb3VyY2UuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmgKaW5kZXgg ZWQ5ZWMzNy4uNDhlMWEyMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UmVzb3VyY2UuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5oCkBA IC0xNzQsNiArMTc0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBkb3VibGUgbV9s b2FkRXZlbnRUaW1lOwogICAgICAgICBkb3VibGUgbV9kb21Db250ZW50RXZlbnRUaW1lOwogICAg ICAgICB1bnNpZ25lZCBtX2Nvbm5lY3Rpb25JRDsKKyAgICAgICAgYm9vbCBtX2Nvbm5lY3Rpb25S ZXVzZWQ7CiAgICAgICAgIFJlZlB0cjxSZXNvdXJjZUxvYWRUaW1pbmc+IG1fbG9hZFRpbWluZzsK ICAgICAgICAgU2NyaXB0U3RyaW5nIG1fb3ZlcnJpZGVDb250ZW50OwogICAgICAgICBUeXBlIG1f b3ZlcnJpZGVDb250ZW50VHlwZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q cwppbmRleCAyYWUyM2EwLi5jZDUxYWMwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlLmpzCkBAIC0zMDgsNiArMzA4LDE3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisgICAgZ2V0IGNhY2hlZCgpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fY2FjaGVkOworICAgIH0sCisKKyAgICBzZXQgY2FjaGVkKHgp CisgICAgeworICAgICAgICB0aGlzLl9jYWNoZWQgPSB4OworICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycygiY2FjaGVkIGNoYW5nZWQiKTsKKyAgICB9LAorCiAgICAgZ2V0IG1p bWVUeXBlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9taW1lVHlwZTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCA4YWYxNTA1Li4z ODhjNDMyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzCkBAIC03NTEsMTMgKzc1MSwzNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHRhYmxlRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInRhYmxlIik7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IGFuY2hvci5wYXJl bnRFbGVtZW50LnJlc291cmNlOwotICAgICAgICB2YXIgZGF0YSA9IFtXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkJsb2NraW5nIiksIHJlc291cmNlLnRpbWluZy5yZXF1ZXN0VGltZSA9PT0gMCA/ICI/ IiA6IE51bWJlci5zZWNvbmRzVG9TdHJpbmcoTWF0aC5tYXgocmVzb3VyY2UudGltaW5nLnJlcXVl c3RUaW1lIC0gcmVzb3VyY2Uuc3RhcnRUaW1lLCAwKSksCi0gICAgICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiUHJveHkiKSwgcmVzb3VyY2UudGltaW5nLnByb3h5RHVyYXRp b24gPT0gLTEgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihub25lKSIpIDogTnVtYmVyLnNlY29u ZHNUb1N0cmluZyhyZXNvdXJjZS50aW1pbmcucHJveHlEdXJhdGlvbiksCi0gICAgICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRE5TIExvb2t1cCIpLCByZXNvdXJjZS50aW1p bmcuZG5zRHVyYXRpb24gPT0gLTEgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihyZXVzZWQpIikg OiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5kbnNEdXJhdGlvbiksCi0g ICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29ubmVjdGluZyIpLCBy ZXNvdXJjZS50aW1pbmcuY29ubmVjdER1cmF0aW9uID09IC0xID8gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIocmV1c2VkKSIpIDogTnVtYmVyLnNlY29uZHNUb1N0cmluZyhyZXNvdXJjZS50aW1pbmcu Y29ubmVjdER1cmF0aW9uKSwKLSAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJTZW5kaW5nIiksIE51bWJlci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGltaW5nLnNl bmREdXJhdGlvbiksCi0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygi V2FpdGluZyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy53YWl0RHVy YXRpb24pLAotICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlY2Vp dmluZyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLmVuZFRpbWUgLSByZXNvdXJj ZS5yZXNwb25zZVJlY2VpdmVkVGltZSldOworICAgICAgICB2YXIgZGF0YSA9IFtdOworCisgICAg ICAgIGlmIChyZXNvdXJjZS50aW1pbmcucHJveHlEdXJhdGlvbiAhPT0gLTEpCisgICAgICAgICAg ICBkYXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm94eSIpKTsKKyAgICAgICAgICAg IGRhdGEucHVzaChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5wcm94eUR1 cmF0aW9uKSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAocmVzb3VyY2UudGltaW5nLmRuc0R1 cmF0aW9uICE9PSAtMSkgeworICAgICAgICAgICAgZGF0YS5wdXNoKFdlYkluc3BlY3Rvci5VSVN0 cmluZygiRE5TIExvb2t1cCIpKTsKKyAgICAgICAgICAgIGRhdGEucHVzaChOdW1iZXIuc2Vjb25k c1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5kbnNEdXJhdGlvbikpOworICAgICAgICB9CisKKyAg ICAgICAgaWYgKHJlc291cmNlLnRpbWluZy5jb25uZWN0RHVyYXRpb24gIT09IC0xKSB7CisgICAg ICAgICAgICBpZiAocmVzb3VyY2UuY29ubmVjdGlvblJldXNlZCkKKyAgICAgICAgICAgICAgICBk YXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJCbG9ja2luZyIpKTsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICBkYXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJD b25uZWN0aW5nIikpOworICAgICAgICAgICAgZGF0YS5wdXNoKE51bWJlci5zZWNvbmRzVG9TdHJp bmcocmVzb3VyY2UudGltaW5nLmNvbm5lY3REdXJhdGlvbikpOworICAgICAgICB9CisKKyAgICAg ICAgZGF0YS5wdXNoKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VuZGluZyIpKTsKKyAgICAgICAg ZGF0YS5wdXNoKE51bWJlci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGltaW5nLnNlbmREdXJh dGlvbikpOworCisgICAgICAgIGRhdGEucHVzaChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldhaXRp bmciKSk7CisgICAgICAgIGRhdGEucHVzaChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNl LnRpbWluZy53YWl0RHVyYXRpb24pKTsKKworICAgICAgICBkYXRhLnB1c2goV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJSZWNlaXZpbmciKSk7CisgICAgICAgIGRhdGEucHVzaChOdW1iZXIuc2Vjb25k c1RvU3RyaW5nKHJlc291cmNlLmVuZFRpbWUgLSByZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGlt ZSkpOwogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZGF0YS5sZW5ndGg7IGkgKz0gMikg ewogICAgICAgICAgICAgdmFyIHRyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidHIiKTsKQEAg LTEyNTIsOCArMTI3Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUdyYXBoID0gZnVuY3Rpb24o cmVzb3VyY2UpCiAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMt Z3JhcGgtc2lkZSI7CiAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1v dXNlb3ZlciIsIHRoaXMucmVmcmVzaExhYmVsUG9zaXRpb25zLmJpbmQodGhpcyksIGZhbHNlKTsK IAotICAgIGlmIChyZXNvdXJjZS5jYWNoZWQpCi0gICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJyZXNvdXJjZS1jYWNoZWQiKTsKKyAgICB0aGlzLl9jYWNoZWRDaGFuZ2Vk KCk7CiAKICAgICB0aGlzLl9iYXJBcmVhRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwogICAgIHRoaXMuX2JhckFyZWFFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMt Z3JhcGgtYmFyLWFyZWEgaGlkZGVuIjsKQEAgLTEyNzcsNiArMTI5Nyw4IEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZUdyYXBoID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgdGhpcy5fYmFyQXJlYUVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbGFiZWxSaWdodEVsZW1lbnQpOwogCiAgICAgdGhpcy5f Z3JhcGhFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRlZ29yeS0iICsgcmVzb3Vy Y2UuY2F0ZWdvcnkubmFtZSk7CisKKyAgICByZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKCJjYWNo ZWQgY2hhbmdlZCIsIHRoaXMuX2NhY2hlZENoYW5nZWQsIHRoaXMpOwogfQogCiBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VHcmFwaC5wcm90b3R5cGUgPSB7CkBAIC0xNDAwLDUgKzE0MjIsMTEgQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlR3JhcGgucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9sYWJl bExlZnRFbGVtZW50LnRpdGxlID0gdG9vbHRpcDsKICAgICAgICAgdGhpcy5fbGFiZWxSaWdodEVs ZW1lbnQudGl0bGUgPSB0b29sdGlwOwogICAgICAgICB0aGlzLl9iYXJSaWdodEVsZW1lbnQudGl0 bGUgPSB0b29sdGlwOworICAgIH0sCisKKyAgICBfY2FjaGVkQ2hhbmdlZDogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UuY2FjaGVkKQorICAgICAgICAgICAgdGhp cy5fZ3JhcGhFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlLWNhY2hlZCIpOwogICAgIH0K IH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDdjMjU1YmIu Ljg4ZDkxMmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAt MTE2Nyw3ICsxMTY3LDYgQEAgV2ViSW5zcGVjdG9yLnVwZGF0ZVJlc291cmNlID0gZnVuY3Rpb24o aWRlbnRpZmllciwgcGF5bG9hZCkKICAgICAgICAgcmVzb3VyY2UubWFpblJlc291cmNlID0gcGF5 bG9hZC5tYWluUmVzb3VyY2U7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RNZXRob2QgPSBwYXls b2FkLnJlcXVlc3RNZXRob2Q7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RGb3JtRGF0YSA9IHBh eWxvYWQucmVxdWVzdEZvcm1EYXRhOwotICAgICAgICByZXNvdXJjZS5jYWNoZWQgPSBwYXlsb2Fk LmNhY2hlZDsKICAgICAgICAgcmVzb3VyY2UuZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRvY3VtZW50 VVJMOwogCiAgICAgICAgIGlmIChyZXNvdXJjZS5tYWluUmVzb3VyY2UpCkBAIC0xMTkwLDcgKzEx ODksOSBAQCBXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVy LCBwYXlsb2FkKQogICAgICAgICByZXNvdXJjZS5zdWdnZXN0ZWRGaWxlbmFtZSA9IHBheWxvYWQu c3VnZ2VzdGVkRmlsZW5hbWU7CiAgICAgICAgIHJlc291cmNlLnJlc3BvbnNlSGVhZGVycyA9IHBh eWxvYWQucmVzcG9uc2VIZWFkZXJzOwogICAgICAgICByZXNvdXJjZS5jb25uZWN0aW9uSUQgPSBw YXlsb2FkLmNvbm5lY3Rpb25JRDsKKyAgICAgICAgcmVzb3VyY2UuY29ubmVjdGlvblJldXNlZCA9 IHBheWxvYWQuY29ubmVjdGlvblJldXNlZDsKICAgICAgICAgcmVzb3VyY2UudGltaW5nID0gcGF5 bG9hZC50aW1pbmc7CisgICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHBheWxvYWQuY2FjaGVkOwog ICAgIH0KIAogICAgIGlmIChwYXlsb2FkLmRpZFR5cGVDaGFuZ2UpIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcAppbmRleCBiZDQ4NjZjLi41NjAwYzAwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0z MDcyLDE0ICszMDcyLDEzIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRlZFJlc291cmNlRnJvbU1l bW9yeUNhY2hlKGNvbnN0IENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkKICAgICBpZiAoIXBhZ2Up CiAgICAgICAgIHJldHVybjsKIAotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgcGFnZS0+aW5z cGVjdG9yQ29udHJvbGxlcigpLT5kaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUobV9kb2N1 bWVudExvYWRlci5nZXQoKSwgcmVzb3VyY2UpOwotI2VuZGlmCi0KICAgICBpZiAoIXJlc291cmNl LT5zZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkgfHwgbV9kb2N1bWVudExvYWRlci0+aGF2ZVRv bGRDbGllbnRBYm91dExvYWQocmVzb3VyY2UtPnVybCgpKSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgaWYgKCFwYWdlLT5hcmVNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZCgpKSB7CisjaWYg RU5BQkxFKElOU1BFQ1RPUikKKyAgICAgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5k aWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUobV9kb2N1bWVudExvYWRlci5nZXQoKSwgcmVz b3VyY2UpOworI2VuZGlmCiAgICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPnJlY29yZE1lbW9yeUNh Y2hlTG9hZEZvckZ1dHVyZUNsaWVudE5vdGlmaWNhdGlvbihyZXNvdXJjZS0+dXJsKCkpOwogICAg ICAgICBtX2RvY3VtZW50TG9hZGVyLT5kaWRUZWxsQ2xpZW50QWJvdXRMb2FkKHJlc291cmNlLT51 cmwoKSk7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCmluZGV4IDg5ZDMxZDcuLjIyZDMxZmIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcApAQCAt NDUsNiArNDUsNyBAQCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6UmVzb3VyY2VSZXNwb25zZUJhc2Uo KQogICAgICwgbV9sYXN0TW9kaWZpZWREYXRlKDApCiAgICAgLCBtX3dhc0NhY2hlZChmYWxzZSkK ICAgICAsIG1fY29ubmVjdGlvbklEKDApCisgICAgLCBtX2Nvbm5lY3Rpb25SZXVzZWQoZmFsc2Up CiAgICAgLCBtX2lzTnVsbCh0cnVlKQogICAgICwgbV9oYXZlUGFyc2VkQ2FjaGVDb250cm9sSGVh ZGVyKGZhbHNlKQogICAgICwgbV9oYXZlUGFyc2VkQWdlSGVhZGVyKGZhbHNlKQpAQCAtNzIsNiAr NzMsNyBAQCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6UmVzb3VyY2VSZXNwb25zZUJhc2UoY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeQogICAgICwgbV9sYXN0TW9kaWZpZWREYXRl KDApCiAgICAgLCBtX3dhc0NhY2hlZChmYWxzZSkKICAgICAsIG1fY29ubmVjdGlvbklEKDApCisg ICAgLCBtX2Nvbm5lY3Rpb25SZXVzZWQoZmFsc2UpCiAgICAgLCBtX2lzTnVsbChmYWxzZSkKICAg ICAsIG1faGF2ZVBhcnNlZENhY2hlQ29udHJvbEhlYWRlcihmYWxzZSkKICAgICAsIG1faGF2ZVBh cnNlZEFnZUhlYWRlcihmYWxzZSkKQEAgLTQ3MSw2ICs0NzMsMjAgQEAgdm9pZCBSZXNvdXJjZVJl c3BvbnNlQmFzZTo6c2V0V2FzQ2FjaGVkKGJvb2wgdmFsdWUpCiAgICAgbV93YXNDYWNoZWQgPSB2 YWx1ZTsKIH0KIAorYm9vbCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29ubmVjdGlvblJldXNlZCgp IGNvbnN0Cit7CisgICAgbGF6eUluaXQoKTsKKworICAgIHJldHVybiBtX2Nvbm5lY3Rpb25SZXVz ZWQ7Cit9CisKK3ZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnNldENvbm5lY3Rpb25SZXVzZWQo Ym9vbCBjb25uZWN0aW9uSUQpCit7CisgICAgbGF6eUluaXQoKTsKKworICAgIG1fY29ubmVjdGlv blJldXNlZCA9IGNvbm5lY3Rpb25SZXVzZWQ7Cit9CisKIHVuc2lnbmVkIFJlc291cmNlUmVzcG9u c2VCYXNlOjpjb25uZWN0aW9uSUQoKSBjb25zdAogewogICAgIGxhenlJbml0KCk7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaCBiL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oCmluZGV4IDg1OGE2 MTIuLjY1ZTI0YWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJj ZVJlc3BvbnNlQmFzZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJl c3BvbnNlQmFzZS5oCkBAIC0xMDAsNiArMTAwLDkgQEAgcHVibGljOgogICAgIHVuc2lnbmVkIGNv bm5lY3Rpb25JRCgpIGNvbnN0OwogICAgIHZvaWQgc2V0Q29ubmVjdGlvbklEKHVuc2lnbmVkKTsK IAorICAgIGJvb2wgY29ubmVjdGlvblJldXNlZCgpIGNvbnN0OworICAgIHZvaWQgc2V0Q29ubmVj dGlvblJldXNlZChib29sKTsKKwogICAgIGJvb2wgd2FzQ2FjaGVkKCkgY29uc3Q7CiAgICAgdm9p ZCBzZXRXYXNDYWNoZWQoYm9vbCk7CiAKQEAgLTEzNiw4ICsxMzksOSBAQCBwcm90ZWN0ZWQ6CiAg ICAgU3RyaW5nIG1faHR0cFN0YXR1c1RleHQ7CiAgICAgSFRUUEhlYWRlck1hcCBtX2h0dHBIZWFk ZXJGaWVsZHM7CiAgICAgdGltZV90IG1fbGFzdE1vZGlmaWVkRGF0ZTsKLSAgICBib29sIG1fd2Fz Q2FjaGVkOworICAgIGJvb2wgbV93YXNDYWNoZWQgOiAxOwogICAgIHVuc2lnbmVkIG1fY29ubmVj dGlvbklEOworICAgIGJvb2wgbV9jb25uZWN0aW9uUmV1c2VkIDogMTsKICAgICBSZWZQdHI8UmVz b3VyY2VMb2FkVGltaW5nPiBtX3Jlc291cmNlTG9hZFRpbWluZzsKIAogICAgIGJvb2wgbV9pc051 bGwgOiAxOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggODE4MDdjMi4uMjYyZTNiOSAxMDA2NDQKLS0tIGEvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMTUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2ViIEluc3BlY3RvcjogZGlmZmVyZW50aWF0ZSBiZXR3ZWVuIGJsb2NraW5nIGFuZCBjb25u ZWN0aW5nIHRpbWVycy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDIzNzIKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXNwb25zZS5oOgorICAg ICAgICAqIHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJl c3BvbnNlOjpjb25uZWN0aW9uUmV1c2VkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVVJMUmVzcG9u c2U6OnNldENvbm5lY3Rpb25SZXVzZWQpOgorCiAyMDEwLTA3LTE0ICBHZW9yZ2UgWWFrb3ZsZXYg IDxnZW9yZ2V5QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNo ZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgg Yi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgKaW5kZXggMmFhNjAzZC4u NDcyN2M3MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25z ZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaApAQCAtNzYs NiArNzYsOSBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSB1bnNpZ25lZCBjb25uZWN0aW9uSUQo KSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0Q29ubmVjdGlvbklEKHVuc2lnbmVkKTsK IAorICAgIFdFQktJVF9BUEkgYm9vbCBjb25uZWN0aW9uUmV1c2VkKCkgY29uc3Q7CisgICAgV0VC S0lUX0FQSSB2b2lkIHNldENvbm5lY3Rpb25SZXVzZWQoYm9vbCk7CisKICAgICBXRUJLSVRfQVBJ IFdlYlVSTExvYWRUaW1pbmcgbG9hZFRpbWluZygpOwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRM b2FkVGltaW5nKGNvbnN0IFdlYlVSTExvYWRUaW1pbmcmKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlVSTFJlc3BvbnNlLmNwcAppbmRleCAyYjdmYWNjLi5lNDE3MmU3IDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlVSTFJlc3BvbnNlLmNwcApAQCAtMTA3LDYgKzEwNywxNiBAQCB2b2lkIFdlYlVSTFJl c3BvbnNlOjpzZXRDb25uZWN0aW9uSUQodW5zaWduZWQgY29ubmVjdGlvbklEKQogICAgIG1fcHJp dmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRDb25uZWN0aW9uSUQoY29ubmVjdGlvbklEKTsK IH0KIAorYm9vbCBXZWJVUkxSZXNwb25zZTo6Y29ubmVjdGlvblJldXNlZCgpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5jb25uZWN0aW9uUmV1c2Vk KCk7Cit9CisKK3ZvaWQgV2ViVVJMUmVzcG9uc2U6OnNldENvbm5lY3Rpb25SZXVzZWQoYm9vbCBj b25uZWN0aW9uUmV1c2VkKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5z ZXRDb25uZWN0aW9uUmV1c2VkKGNvbm5lY3Rpb25SZXVzZWQpOworfQorCiBXZWJVUkxMb2FkVGlt aW5nIFdlYlVSTFJlc3BvbnNlOjpsb2FkVGltaW5nKCkKIHsKICAgICByZXR1cm4gV2ViVVJMTG9h ZFRpbWluZyhtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+cmVzb3VyY2VMb2FkVGltaW5n KCkpOwo= 61657 2010-07-15 07:30:33 -0700 2010-07-15 07:40:20 -0700 [PATCH] Fixed typos, added cached reporting branch. blocking_time text/plain 15582 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGE5NDRjNS4uOThiMmY4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0wNy0xNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaWZmZXJlbnRpYXRlIGJldHdlZW4g YmxvY2tpbmcgYW5kIGNvbm5lY3RpbmcgdGltZXJzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjM3MgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNl OjpJbnNwZWN0b3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6dXBkYXRlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6 OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6YnVpbGRPYmplY3RGb3JUaW1pbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZS5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCBjYWNoZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgY2FjaGVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fc2hvd1BvcG92ZXIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGgpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlR3JhcGgucHJvdG90eXBlLnJlZnJlc2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlR3JhcGgucHJvdG90eXBlLl9jYWNoZWRDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci51cGRhdGVS ZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6CisgICAg ICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlQmFzZTo6UmVzb3VyY2VSZXNwb25zZUJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZUJhc2U6OmNvbm5lY3Rpb25SZXVzZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZUJhc2U6OnNldENvbm5lY3Rpb25JRCk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oOgorCiAyMDEwLTA3LTE1ICBOaWtvbGFzIFpp bW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4IDkx YTU3ZTAuLmU2MTA3NGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAK QEAgLTY0LDYgKzY0LDcgQEAgSW5zcGVjdG9yUmVzb3VyY2U6Okluc3BlY3RvclJlc291cmNlKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGwKICAgICAsIG1fbG9hZEV2 ZW50VGltZSgtMS4wKQogICAgICwgbV9kb21Db250ZW50RXZlbnRUaW1lKC0xLjApCiAgICAgLCBt X2Nvbm5lY3Rpb25JRCgwKQorICAgICwgbV9jb25uZWN0aW9uUmV1c2VkKGZhbHNlKQogICAgICwg bV9pc01haW5SZXNvdXJjZShmYWxzZSkKIHsKIH0KQEAgLTEzMSw2ICsxMzIsNyBAQCB2b2lkIElu c3BlY3RvclJlc291cmNlOjp1cGRhdGVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSkKICAgICBtX3N1Z2dlc3RlZEZpbGVuYW1lID0gcmVzcG9uc2Uuc3VnZ2VzdGVkRmls ZW5hbWUoKTsKIAogICAgIG1fY29ubmVjdGlvbklEID0gcmVzcG9uc2UuY29ubmVjdGlvbklEKCk7 CisgICAgbV9jb25uZWN0aW9uUmV1c2VkID0gcmVzcG9uc2UuY29ubmVjdGlvblJldXNlZCgpOwog ICAgIG1fbG9hZFRpbWluZyA9IHJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpOwogICAgIG1f Y2FjaGVkID0gcmVzcG9uc2Uud2FzQ2FjaGVkKCk7CiAKQEAgLTE4Myw2ICsxODUsNyBAQCB2b2lk IEluc3BlY3RvclJlc291cmNlOjp1cGRhdGVTY3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQq IGZyb250ZW5kKQogICAgICAgICBwb3B1bGF0ZUhlYWRlcnNPYmplY3QoJnJlc3BvbnNlSGVhZGVy cywgbV9yZXNwb25zZUhlYWRlckZpZWxkcyk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJyZXNw b25zZUhlYWRlcnMiLCByZXNwb25zZUhlYWRlcnMpOwogICAgICAgICBqc29uT2JqZWN0LnNldCgi Y29ubmVjdGlvbklEIiwgbV9jb25uZWN0aW9uSUQpOworICAgICAgICBqc29uT2JqZWN0LnNldCgi Y29ubmVjdGlvblJldXNlZCIsIG1fY29ubmVjdGlvblJldXNlZCk7CiAgICAgICAgIGpzb25PYmpl Y3Quc2V0KCJjYWNoZWQiLCBtX2NhY2hlZCk7CiAgICAgICAgIGlmIChtX2xvYWRUaW1pbmcgJiYg IW1fY2FjaGVkKQogICAgICAgICAgICAganNvbk9iamVjdC5zZXQoInRpbWluZyIsIGJ1aWxkT2Jq ZWN0Rm9yVGltaW5nKGZyb250ZW5kLCBtX2xvYWRUaW1pbmcuZ2V0KCkpKTsKQEAgLTM5NCw5ICsz OTcsOSBAQCBTY3JpcHRPYmplY3QgSW5zcGVjdG9yUmVzb3VyY2U6OmJ1aWxkT2JqZWN0Rm9yVGlt aW5nKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZAogICAgIGpzb25PYmplY3Quc2V0KCJwcm94 eUR1cmF0aW9uIiwgdGltaW5nLT5wcm94eVN0YXJ0ID09IC0xID8gLTEgOiAodGltaW5nLT5wcm94 eUVuZCAtIHRpbWluZy0+cHJveHlTdGFydCkgLyAxMDAwLjApOwogICAgIGpzb25PYmplY3Quc2V0 KCJkbnNEdXJhdGlvbiIsIHRpbWluZy0+ZG5zU3RhcnQgPT0gLTEgPyAtMSA6ICh0aW1pbmctPmRu c0VuZCAtIHRpbWluZy0+ZG5zU3RhcnQpIC8gMTAwMC4wKTsKICAgICBqc29uT2JqZWN0LnNldCgi Y29ubmVjdER1cmF0aW9uIiwgdGltaW5nLT5jb25uZWN0U3RhcnQgPT0gLTEgPyAtMSA6ICh0aW1p bmctPmNvbm5lY3RFbmQgLSB0aW1pbmctPmNvbm5lY3RTdGFydCkgLyAxMDAwLjApOworICAgIGpz b25PYmplY3Quc2V0KCJzc2xEdXJhdGlvbiIsICh0aW1pbmctPnNzbEVuZCAtIHRpbWluZy0+c3Ns U3RhcnQpIC8gMTAwMC4wKTsKICAgICBqc29uT2JqZWN0LnNldCgic2VuZER1cmF0aW9uIiwgKHRp bWluZy0+c2VuZEVuZCAtIHRpbWluZy0+c2VuZFN0YXJ0KSAvIDEwMDAuMCk7CiAgICAganNvbk9i amVjdC5zZXQoIndhaXREdXJhdGlvbiIsICh0aW1pbmctPnJlY2VpdmVIZWFkZXJzRW5kIC0gdGlt aW5nLT5zZW5kRW5kKSAgLyAxMDAwLjApOwotICAgIGpzb25PYmplY3Quc2V0KCJzc2xEdXJhdGlv biIsICh0aW1pbmctPnNzbEVuZCAtIHRpbWluZy0+c3NsU3RhcnQpIC8gMTAwMC4wKTsKICAgICBy ZXR1cm4ganNvbk9iamVjdDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2UuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmgK aW5kZXggZWQ5ZWMzNy4uNDhlMWEyMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2UuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJj ZS5oCkBAIC0xNzQsNiArMTc0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBkb3Vi bGUgbV9sb2FkRXZlbnRUaW1lOwogICAgICAgICBkb3VibGUgbV9kb21Db250ZW50RXZlbnRUaW1l OwogICAgICAgICB1bnNpZ25lZCBtX2Nvbm5lY3Rpb25JRDsKKyAgICAgICAgYm9vbCBtX2Nvbm5l Y3Rpb25SZXVzZWQ7CiAgICAgICAgIFJlZlB0cjxSZXNvdXJjZUxvYWRUaW1pbmc+IG1fbG9hZFRp bWluZzsKICAgICAgICAgU2NyaXB0U3RyaW5nIG1fb3ZlcnJpZGVDb250ZW50OwogICAgICAgICBU eXBlIG1fb3ZlcnJpZGVDb250ZW50VHlwZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZS5qcwppbmRleCAyYWUyM2EwLi5jZDUxYWMwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlLmpzCkBAIC0zMDgsNiArMzA4LDE3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisgICAgZ2V0IGNhY2hlZCgpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fY2FjaGVkOworICAgIH0sCisKKyAgICBzZXQgY2Fj aGVkKHgpCisgICAgeworICAgICAgICB0aGlzLl9jYWNoZWQgPSB4OworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycygiY2FjaGVkIGNoYW5nZWQiKTsKKyAgICB9LAorCiAgICAg Z2V0IG1pbWVUeXBlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9taW1lVHlwZTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCA4YWYx NTA1Li4zODhjNDMyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl c1BhbmVsLmpzCkBAIC03NTEsMTMgKzc1MSwzNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFu ZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHRhYmxlRWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInRhYmxlIik7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IGFuY2hv ci5wYXJlbnRFbGVtZW50LnJlc291cmNlOwotICAgICAgICB2YXIgZGF0YSA9IFtXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkJsb2NraW5nIiksIHJlc291cmNlLnRpbWluZy5yZXF1ZXN0VGltZSA9PT0g MCA/ICI/IiA6IE51bWJlci5zZWNvbmRzVG9TdHJpbmcoTWF0aC5tYXgocmVzb3VyY2UudGltaW5n LnJlcXVlc3RUaW1lIC0gcmVzb3VyY2Uuc3RhcnRUaW1lLCAwKSksCi0gICAgICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJveHkiKSwgcmVzb3VyY2UudGltaW5nLnByb3h5 RHVyYXRpb24gPT0gLTEgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihub25lKSIpIDogTnVtYmVy LnNlY29uZHNUb1N0cmluZyhyZXNvdXJjZS50aW1pbmcucHJveHlEdXJhdGlvbiksCi0gICAgICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRE5TIExvb2t1cCIpLCByZXNvdXJj ZS50aW1pbmcuZG5zRHVyYXRpb24gPT0gLTEgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihyZXVz ZWQpIikgOiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5kbnNEdXJhdGlv biksCi0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29ubmVjdGlu ZyIpLCByZXNvdXJjZS50aW1pbmcuY29ubmVjdER1cmF0aW9uID09IC0xID8gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCIocmV1c2VkKSIpIDogTnVtYmVyLnNlY29uZHNUb1N0cmluZyhyZXNvdXJjZS50 aW1pbmcuY29ubmVjdER1cmF0aW9uKSwKLSAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTZW5kaW5nIiksIE51bWJlci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGlt aW5nLnNlbmREdXJhdGlvbiksCi0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiV2FpdGluZyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy53 YWl0RHVyYXRpb24pLAotICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJlY2VpdmluZyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLmVuZFRpbWUgLSBy ZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGltZSldOworICAgICAgICB2YXIgZGF0YSA9IFtdOwor CisgICAgICAgIGlmIChyZXNvdXJjZS50aW1pbmcucHJveHlEdXJhdGlvbiAhPT0gLTEpCisgICAg ICAgICAgICBkYXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcm94eSIpKTsKKyAgICAg ICAgICAgIGRhdGEucHVzaChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5w cm94eUR1cmF0aW9uKSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAocmVzb3VyY2UudGltaW5n LmRuc0R1cmF0aW9uICE9PSAtMSkgeworICAgICAgICAgICAgZGF0YS5wdXNoKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiRE5TIExvb2t1cCIpKTsKKyAgICAgICAgICAgIGRhdGEucHVzaChOdW1iZXIu c2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5kbnNEdXJhdGlvbikpOworICAgICAgICB9 CisKKyAgICAgICAgaWYgKHJlc291cmNlLnRpbWluZy5jb25uZWN0RHVyYXRpb24gIT09IC0xKSB7 CisgICAgICAgICAgICBpZiAocmVzb3VyY2UuY29ubmVjdGlvblJldXNlZCkKKyAgICAgICAgICAg ICAgICBkYXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJCbG9ja2luZyIpKTsKKyAgICAg ICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBkYXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJDb25uZWN0aW5nIikpOworICAgICAgICAgICAgZGF0YS5wdXNoKE51bWJlci5zZWNvbmRz VG9TdHJpbmcocmVzb3VyY2UudGltaW5nLmNvbm5lY3REdXJhdGlvbikpOworICAgICAgICB9CisK KyAgICAgICAgZGF0YS5wdXNoKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VuZGluZyIpKTsKKyAg ICAgICAgZGF0YS5wdXNoKE51bWJlci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGltaW5nLnNl bmREdXJhdGlvbikpOworCisgICAgICAgIGRhdGEucHVzaChXZWJJbnNwZWN0b3IuVUlTdHJpbmco IldhaXRpbmciKSk7CisgICAgICAgIGRhdGEucHVzaChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJl c291cmNlLnRpbWluZy53YWl0RHVyYXRpb24pKTsKKworICAgICAgICBkYXRhLnB1c2goV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJSZWNlaXZpbmciKSk7CisgICAgICAgIGRhdGEucHVzaChOdW1iZXIu c2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLmVuZFRpbWUgLSByZXNvdXJjZS5yZXNwb25zZVJlY2Vp dmVkVGltZSkpOwogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZGF0YS5sZW5ndGg7IGkg Kz0gMikgewogICAgICAgICAgICAgdmFyIHRyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidHIi KTsKQEAgLTEyNTIsOCArMTI3Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUdyYXBoID0gZnVu Y3Rpb24ocmVzb3VyY2UpCiAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNv dXJjZXMtZ3JhcGgtc2lkZSI7CiAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlb3ZlciIsIHRoaXMucmVmcmVzaExhYmVsUG9zaXRpb25zLmJpbmQodGhpcyksIGZh bHNlKTsKIAotICAgIGlmIChyZXNvdXJjZS5jYWNoZWQpCi0gICAgICAgIHRoaXMuX2dyYXBoRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJyZXNvdXJjZS1jYWNoZWQiKTsKKyAgICB0aGlzLl9jYWNoZWRD aGFuZ2VkKCk7CiAKICAgICB0aGlzLl9iYXJBcmVhRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwogICAgIHRoaXMuX2JhckFyZWFFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNv dXJjZXMtZ3JhcGgtYmFyLWFyZWEgaGlkZGVuIjsKQEAgLTEyNzcsNiArMTI5Nyw4IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZUdyYXBoID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgdGhpcy5fYmFy QXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbGFiZWxSaWdodEVsZW1lbnQpOwogCiAgICAg dGhpcy5fZ3JhcGhFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRlZ29yeS0iICsg cmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7CisKKyAgICByZXNvdXJjZS5hZGRFdmVudExpc3RlbmVy KCJjYWNoZWQgY2hhbmdlZCIsIHRoaXMuX2NhY2hlZENoYW5nZWQsIHRoaXMpOwogfQogCiBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VHcmFwaC5wcm90b3R5cGUgPSB7CkBAIC0xNDAwLDUgKzE0MjIsMTEg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGgucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll9sYWJlbExlZnRFbGVtZW50LnRpdGxlID0gdG9vbHRpcDsKICAgICAgICAgdGhpcy5fbGFiZWxS aWdodEVsZW1lbnQudGl0bGUgPSB0b29sdGlwOwogICAgICAgICB0aGlzLl9iYXJSaWdodEVsZW1l bnQudGl0bGUgPSB0b29sdGlwOworICAgIH0sCisKKyAgICBfY2FjaGVkQ2hhbmdlZDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UuY2FjaGVkKQorICAgICAgICAg ICAgdGhpcy5fZ3JhcGhFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlLWNhY2hlZCIpOwog ICAgIH0KIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDdj MjU1YmIuLjg4ZDkxMmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwpAQCAtMTE2Nyw3ICsxMTY3LDYgQEAgV2ViSW5zcGVjdG9yLnVwZGF0ZVJlc291cmNlID0gZnVu Y3Rpb24oaWRlbnRpZmllciwgcGF5bG9hZCkKICAgICAgICAgcmVzb3VyY2UubWFpblJlc291cmNl ID0gcGF5bG9hZC5tYWluUmVzb3VyY2U7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RNZXRob2Qg PSBwYXlsb2FkLnJlcXVlc3RNZXRob2Q7CiAgICAgICAgIHJlc291cmNlLnJlcXVlc3RGb3JtRGF0 YSA9IHBheWxvYWQucmVxdWVzdEZvcm1EYXRhOwotICAgICAgICByZXNvdXJjZS5jYWNoZWQgPSBw YXlsb2FkLmNhY2hlZDsKICAgICAgICAgcmVzb3VyY2UuZG9jdW1lbnRVUkwgPSBwYXlsb2FkLmRv Y3VtZW50VVJMOwogCiAgICAgICAgIGlmIChyZXNvdXJjZS5tYWluUmVzb3VyY2UpCkBAIC0xMTkw LDcgKzExODksOSBAQCBXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVu dGlmaWVyLCBwYXlsb2FkKQogICAgICAgICByZXNvdXJjZS5zdWdnZXN0ZWRGaWxlbmFtZSA9IHBh eWxvYWQuc3VnZ2VzdGVkRmlsZW5hbWU7CiAgICAgICAgIHJlc291cmNlLnJlc3BvbnNlSGVhZGVy cyA9IHBheWxvYWQucmVzcG9uc2VIZWFkZXJzOwogICAgICAgICByZXNvdXJjZS5jb25uZWN0aW9u SUQgPSBwYXlsb2FkLmNvbm5lY3Rpb25JRDsKKyAgICAgICAgcmVzb3VyY2UuY29ubmVjdGlvblJl dXNlZCA9IHBheWxvYWQuY29ubmVjdGlvblJldXNlZDsKICAgICAgICAgcmVzb3VyY2UudGltaW5n ID0gcGF5bG9hZC50aW1pbmc7CisgICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHBheWxvYWQuY2Fj aGVkOwogICAgIH0KIAogICAgIGlmIChwYXlsb2FkLmRpZFR5cGVDaGFuZ2UpIHsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAppbmRleCBiZDQ4NjZjLi5kOGFjYTE0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CkBAIC0zMDcyLDE0ICszMDcyLDEzIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRlZFJlc291cmNl RnJvbU1lbW9yeUNhY2hlKGNvbnN0IENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkKICAgICBpZiAo IXBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgcGFn ZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5kaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUo bV9kb2N1bWVudExvYWRlci5nZXQoKSwgcmVzb3VyY2UpOwotI2VuZGlmCi0KICAgICBpZiAoIXJl c291cmNlLT5zZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKCkgfHwgbV9kb2N1bWVudExvYWRlci0+ aGF2ZVRvbGRDbGllbnRBYm91dExvYWQocmVzb3VyY2UtPnVybCgpKSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgaWYgKCFwYWdlLT5hcmVNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZCgpKSB7 CisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKyAgICAgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxl cigpLT5kaWRMb2FkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUobV9kb2N1bWVudExvYWRlci5nZXQo KSwgcmVzb3VyY2UpOworI2VuZGlmCiAgICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPnJlY29yZE1l bW9yeUNhY2hlTG9hZEZvckZ1dHVyZUNsaWVudE5vdGlmaWNhdGlvbihyZXNvdXJjZS0+dXJsKCkp OwogICAgICAgICBtX2RvY3VtZW50TG9hZGVyLT5kaWRUZWxsQ2xpZW50QWJvdXRMb2FkKHJlc291 cmNlLT51cmwoKSk7CiAgICAgICAgIHJldHVybjsKQEAgLTMwODcsNiArMzA4Niw5IEBAIHZvaWQg RnJhbWVMb2FkZXI6OmxvYWRlZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKGNvbnN0IENhY2hlZFJl c291cmNlKiByZXNvdXJjZSkKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KHJlc291cmNl LT51cmwoKSk7CiAgICAgaWYgKG1fY2xpZW50LT5kaXNwYXRjaERpZExvYWRSZXNvdXJjZUZyb21N ZW1vcnlDYWNoZShtX2RvY3VtZW50TG9hZGVyLmdldCgpLCByZXF1ZXN0LCByZXNvdXJjZS0+cmVz cG9uc2UoKSwgcmVzb3VyY2UtPmVuY29kZWRTaXplKCkpKSB7CisjaWYgRU5BQkxFKElOU1BFQ1RP UikKKyAgICAgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5kaWRMb2FkUmVzb3VyY2VG cm9tTWVtb3J5Q2FjaGUobV9kb2N1bWVudExvYWRlci5nZXQoKSwgcmVzb3VyY2UpOworI2VuZGlm CiAgICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPmRpZFRlbGxDbGllbnRBYm91dExvYWQocmVzb3Vy Y2UtPnVybCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCmluZGV4IDg5ZDMxZDcuLmYzMDM0 NGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl QmFzZS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VC YXNlLmNwcApAQCAtNDUsNiArNDUsNyBAQCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6UmVzb3VyY2VS ZXNwb25zZUJhc2UoKQogICAgICwgbV9sYXN0TW9kaWZpZWREYXRlKDApCiAgICAgLCBtX3dhc0Nh Y2hlZChmYWxzZSkKICAgICAsIG1fY29ubmVjdGlvbklEKDApCisgICAgLCBtX2Nvbm5lY3Rpb25S ZXVzZWQoZmFsc2UpCiAgICAgLCBtX2lzTnVsbCh0cnVlKQogICAgICwgbV9oYXZlUGFyc2VkQ2Fj aGVDb250cm9sSGVhZGVyKGZhbHNlKQogICAgICwgbV9oYXZlUGFyc2VkQWdlSGVhZGVyKGZhbHNl KQpAQCAtNzIsNiArNzMsNyBAQCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6UmVzb3VyY2VSZXNwb25z ZUJhc2UoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeQogICAgICwgbV9sYXN0 TW9kaWZpZWREYXRlKDApCiAgICAgLCBtX3dhc0NhY2hlZChmYWxzZSkKICAgICAsIG1fY29ubmVj dGlvbklEKDApCisgICAgLCBtX2Nvbm5lY3Rpb25SZXVzZWQoZmFsc2UpCiAgICAgLCBtX2lzTnVs bChmYWxzZSkKICAgICAsIG1faGF2ZVBhcnNlZENhY2hlQ29udHJvbEhlYWRlcihmYWxzZSkKICAg ICAsIG1faGF2ZVBhcnNlZEFnZUhlYWRlcihmYWxzZSkKQEAgLTQ3MSw2ICs0NzMsMjAgQEAgdm9p ZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6c2V0V2FzQ2FjaGVkKGJvb2wgdmFsdWUpCiAgICAgbV93 YXNDYWNoZWQgPSB2YWx1ZTsKIH0KIAorYm9vbCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29ubmVj dGlvblJldXNlZCgpIGNvbnN0Cit7CisgICAgbGF6eUluaXQoKTsKKworICAgIHJldHVybiBtX2Nv bm5lY3Rpb25SZXVzZWQ7Cit9CisKK3ZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnNldENvbm5l Y3Rpb25SZXVzZWQoYm9vbCBjb25uZWN0aW9uUmV1c2VkKQoreworICAgIGxhenlJbml0KCk7CisK KyAgICBtX2Nvbm5lY3Rpb25SZXVzZWQgPSBjb25uZWN0aW9uUmV1c2VkOworfQorCiB1bnNpZ25l ZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29ubmVjdGlvbklEKCkgY29uc3QKIHsKICAgICBsYXp5 SW5pdCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVz cG9uc2VCYXNlLmggYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJh c2UuaAppbmRleCA4NThhNjEyLi42NWUyNGFkIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaApAQCAtMTAwLDYgKzEwMCw5IEBAIHB1YmxpYzoK ICAgICB1bnNpZ25lZCBjb25uZWN0aW9uSUQoKSBjb25zdDsKICAgICB2b2lkIHNldENvbm5lY3Rp b25JRCh1bnNpZ25lZCk7CiAKKyAgICBib29sIGNvbm5lY3Rpb25SZXVzZWQoKSBjb25zdDsKKyAg ICB2b2lkIHNldENvbm5lY3Rpb25SZXVzZWQoYm9vbCk7CisKICAgICBib29sIHdhc0NhY2hlZCgp IGNvbnN0OwogICAgIHZvaWQgc2V0V2FzQ2FjaGVkKGJvb2wpOwogCkBAIC0xMzYsOCArMTM5LDkg QEAgcHJvdGVjdGVkOgogICAgIFN0cmluZyBtX2h0dHBTdGF0dXNUZXh0OwogICAgIEhUVFBIZWFk ZXJNYXAgbV9odHRwSGVhZGVyRmllbGRzOwogICAgIHRpbWVfdCBtX2xhc3RNb2RpZmllZERhdGU7 Ci0gICAgYm9vbCBtX3dhc0NhY2hlZDsKKyAgICBib29sIG1fd2FzQ2FjaGVkIDogMTsKICAgICB1 bnNpZ25lZCBtX2Nvbm5lY3Rpb25JRDsKKyAgICBib29sIG1fY29ubmVjdGlvblJldXNlZCA6IDE7 CiAgICAgUmVmUHRyPFJlc291cmNlTG9hZFRpbWluZz4gbV9yZXNvdXJjZUxvYWRUaW1pbmc7CiAK ICAgICBib29sIG1faXNOdWxsIDogMTsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDgxODA3YzIuLjI2MmUzYjkg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA3LTE1ICBQYXZlbCBGZWxkbWFu ICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRpZmZlcmVudGlhdGUgYmV0d2VlbiBi bG9ja2luZyBhbmQgY29ubmVjdGluZyB0aW1lcnMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMzcyCisKKyAgICAgICAgKiBwdWJsaWMvV2ViVVJM UmVzcG9uc2UuaDoKKyAgICAgICAgKiBzcmMvV2ViVVJMUmVzcG9uc2UuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJVUkxSZXNwb25zZTo6Y29ubmVjdGlvblJldXNlZCk6CisgICAgICAgIChXZWJL aXQ6OldlYlVSTFJlc3BvbnNlOjpzZXRDb25uZWN0aW9uUmV1c2VkKToKKwogMjAxMC0wNy0xNCAg R2VvcmdlIFlha292bGV2ICA8Z2VvcmdleUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJVUkxSZXNwb25zZS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5o CmluZGV4IDJhYTYwM2QuLjQ3MjdjNzMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVVJMUmVzcG9uc2UuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJl c3BvbnNlLmgKQEAgLTc2LDYgKzc2LDkgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgdW5zaWdu ZWQgY29ubmVjdGlvbklEKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldENvbm5lY3Rp b25JRCh1bnNpZ25lZCk7CiAKKyAgICBXRUJLSVRfQVBJIGJvb2wgY29ubmVjdGlvblJldXNlZCgp IGNvbnN0OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXRDb25uZWN0aW9uUmV1c2VkKGJvb2wpOwor CiAgICAgV0VCS0lUX0FQSSBXZWJVUkxMb2FkVGltaW5nIGxvYWRUaW1pbmcoKTsKICAgICBXRUJL SVRfQVBJIHZvaWQgc2V0TG9hZFRpbWluZyhjb25zdCBXZWJVUkxMb2FkVGltaW5nJik7CiAKZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwIGIvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAKaW5kZXggMmI3ZmFjYy4uZTQxNzJlNyAx MDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAKKysrIGIv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAKQEAgLTEwNyw2ICsxMDcsMTYg QEAgdm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0Q29ubmVjdGlvbklEKHVuc2lnbmVkIGNvbm5lY3Rp b25JRCkKICAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+c2V0Q29ubmVjdGlvbklE KGNvbm5lY3Rpb25JRCk7CiB9CiAKK2Jvb2wgV2ViVVJMUmVzcG9uc2U6OmNvbm5lY3Rpb25SZXVz ZWQoKSBjb25zdAoreworICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+ Y29ubmVjdGlvblJldXNlZCgpOworfQorCit2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRDb25uZWN0 aW9uUmV1c2VkKGJvb2wgY29ubmVjdGlvblJldXNlZCkKK3sKKyAgICBtX3ByaXZhdGUtPm1fcmVz b3VyY2VSZXNwb25zZS0+c2V0Q29ubmVjdGlvblJldXNlZChjb25uZWN0aW9uUmV1c2VkKTsKK30K KwogV2ViVVJMTG9hZFRpbWluZyBXZWJVUkxSZXNwb25zZTo6bG9hZFRpbWluZygpCiB7CiAgICAg cmV0dXJuIFdlYlVSTExvYWRUaW1pbmcobV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPnJl c291cmNlTG9hZFRpbWluZygpKTsK 61659 2010-07-15 07:40:20 -0700 2010-07-15 07:40:20 -0700 [PATCH] To land. blocking_time text/plain 15584 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGE5NDRjNS4uOThiMmY4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAorMjAxMC0wNy0xNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaWZmZXJlbnRpYXRlIGJldHdlZW4g YmxvY2tpbmcgYW5kIGNvbm5lY3RpbmcgdGltZXJzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjM3MgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNl OjpJbnNwZWN0b3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6dXBkYXRlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6 OnVwZGF0ZVNjcmlwdE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJj ZTo6YnVpbGRPYmplY3RGb3JUaW1pbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZS5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCBjYWNoZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgY2FjaGVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fc2hvd1BvcG92ZXIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGgpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlR3JhcGgucHJvdG90eXBlLnJlZnJlc2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlR3JhcGgucHJvdG90eXBlLl9jYWNoZWRDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci51cGRhdGVS ZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6CisgICAg ICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlQmFzZTo6UmVzb3VyY2VSZXNwb25zZUJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZUJhc2U6OmNvbm5lY3Rpb25SZXVzZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZUJhc2U6OnNldENvbm5lY3Rpb25JRCk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oOgorCiAyMDEwLTA3LTE1ICBOaWtvbGFzIFpp bW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2UuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4IDkx YTU3ZTAuLmU2MTA3NGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAK QEAgLTY0LDYgKzY0LDcgQEAgSW5zcGVjdG9yUmVzb3VyY2U6Okluc3BlY3RvclJlc291cmNlKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgRG9jdW1lbnRMb2FkZXIqIGwKICAgICAsIG1fbG9hZEV2 ZW50VGltZSgtMS4wKQogICAgICwgbV9kb21Db250ZW50RXZlbnRUaW1lKC0xLjApCiAgICAgLCBt X2Nvbm5lY3Rpb25JRCgwKQorICAgICwgbV9jb25uZWN0aW9uUmV1c2VkKGZhbHNlKQogICAgICwg bV9pc01haW5SZXNvdXJjZShmYWxzZSkKIHsKIH0KQEAgLTEzMSw2ICsxMzIsNyBAQCB2b2lkIElu c3BlY3RvclJlc291cmNlOjp1cGRhdGVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBy ZXNwb25zZSkKICAgICBtX3N1Z2dlc3RlZEZpbGVuYW1lID0gcmVzcG9uc2Uuc3VnZ2VzdGVkRmls ZW5hbWUoKTsKIAogICAgIG1fY29ubmVjdGlvbklEID0gcmVzcG9uc2UuY29ubmVjdGlvbklEKCk7 CisgICAgbV9jb25uZWN0aW9uUmV1c2VkID0gcmVzcG9uc2UuY29ubmVjdGlvblJldXNlZCgpOwog ICAgIG1fbG9hZFRpbWluZyA9IHJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpOwogICAgIG1f Y2FjaGVkID0gcmVzcG9uc2Uud2FzQ2FjaGVkKCk7CiAKQEAgLTE4Myw2ICsxODUsNyBAQCB2b2lk IEluc3BlY3RvclJlc291cmNlOjp1cGRhdGVTY3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQq IGZyb250ZW5kKQogICAgICAgICBwb3B1bGF0ZUhlYWRlcnNPYmplY3QoJnJlc3BvbnNlSGVhZGVy cywgbV9yZXNwb25zZUhlYWRlckZpZWxkcyk7CiAgICAgICAgIGpzb25PYmplY3Quc2V0KCJyZXNw b25zZUhlYWRlcnMiLCByZXNwb25zZUhlYWRlcnMpOwogICAgICAgICBqc29uT2JqZWN0LnNldCgi Y29ubmVjdGlvbklEIiwgbV9jb25uZWN0aW9uSUQpOworICAgICAgICBqc29uT2JqZWN0LnNldCgi Y29ubmVjdGlvblJldXNlZCIsIG1fY29ubmVjdGlvblJldXNlZCk7CiAgICAgICAgIGpzb25PYmpl Y3Quc2V0KCJjYWNoZWQiLCBtX2NhY2hlZCk7CiAgICAgICAgIGlmIChtX2xvYWRUaW1pbmcgJiYg IW1fY2FjaGVkKQogICAgICAgICAgICAganNvbk9iamVjdC5zZXQoInRpbWluZyIsIGJ1aWxkT2Jq ZWN0Rm9yVGltaW5nKGZyb250ZW5kLCBtX2xvYWRUaW1pbmcuZ2V0KCkpKTsKQEAgLTM5NCw5ICsz OTcsOSBAQCBTY3JpcHRPYmplY3QgSW5zcGVjdG9yUmVzb3VyY2U6OmJ1aWxkT2JqZWN0Rm9yVGlt aW5nKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZAogICAgIGpzb25PYmplY3Quc2V0KCJwcm94 eUR1cmF0aW9uIiwgdGltaW5nLT5wcm94eVN0YXJ0ID09IC0xID8gLTEgOiAodGltaW5nLT5wcm94 eUVuZCAtIHRpbWluZy0+cHJveHlTdGFydCkgLyAxMDAwLjApOwogICAgIGpzb25PYmplY3Quc2V0 KCJkbnNEdXJhdGlvbiIsIHRpbWluZy0+ZG5zU3RhcnQgPT0gLTEgPyAtMSA6ICh0aW1pbmctPmRu c0VuZCAtIHRpbWluZy0+ZG5zU3RhcnQpIC8gMTAwMC4wKTsKICAgICBqc29uT2JqZWN0LnNldCgi Y29ubmVjdER1cmF0aW9uIiwgdGltaW5nLT5jb25uZWN0U3RhcnQgPT0gLTEgPyAtMSA6ICh0aW1p bmctPmNvbm5lY3RFbmQgLSB0aW1pbmctPmNvbm5lY3RTdGFydCkgLyAxMDAwLjApOworICAgIGpz b25PYmplY3Quc2V0KCJzc2xEdXJhdGlvbiIsICh0aW1pbmctPnNzbEVuZCAtIHRpbWluZy0+c3Ns U3RhcnQpIC8gMTAwMC4wKTsKICAgICBqc29uT2JqZWN0LnNldCgic2VuZER1cmF0aW9uIiwgKHRp bWluZy0+c2VuZEVuZCAtIHRpbWluZy0+c2VuZFN0YXJ0KSAvIDEwMDAuMCk7CiAgICAganNvbk9i amVjdC5zZXQoIndhaXREdXJhdGlvbiIsICh0aW1pbmctPnJlY2VpdmVIZWFkZXJzRW5kIC0gdGlt aW5nLT5zZW5kRW5kKSAgLyAxMDAwLjApOwotICAgIGpzb25PYmplY3Quc2V0KCJzc2xEdXJhdGlv biIsICh0aW1pbmctPnNzbEVuZCAtIHRpbWluZy0+c3NsU3RhcnQpIC8gMTAwMC4wKTsKICAgICBy ZXR1cm4ganNvbk9iamVjdDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2UuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmgK aW5kZXggZWQ5ZWMzNy4uNDhlMWEyMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2UuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJj ZS5oCkBAIC0xNzQsNiArMTc0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBkb3Vi bGUgbV9sb2FkRXZlbnRUaW1lOwogICAgICAgICBkb3VibGUgbV9kb21Db250ZW50RXZlbnRUaW1l OwogICAgICAgICB1bnNpZ25lZCBtX2Nvbm5lY3Rpb25JRDsKKyAgICAgICAgYm9vbCBtX2Nvbm5l Y3Rpb25SZXVzZWQ7CiAgICAgICAgIFJlZlB0cjxSZXNvdXJjZUxvYWRUaW1pbmc+IG1fbG9hZFRp bWluZzsKICAgICAgICAgU2NyaXB0U3RyaW5nIG1fb3ZlcnJpZGVDb250ZW50OwogICAgICAgICBU eXBlIG1fb3ZlcnJpZGVDb250ZW50VHlwZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZS5qcwppbmRleCAyYWUyM2EwLi5jZDUxYWMwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlLmpzCkBAIC0zMDgsNiArMzA4LDE3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisgICAgZ2V0IGNhY2hlZCgpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fY2FjaGVkOworICAgIH0sCisKKyAgICBzZXQgY2Fj aGVkKHgpCisgICAgeworICAgICAgICB0aGlzLl9jYWNoZWQgPSB4OworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycygiY2FjaGVkIGNoYW5nZWQiKTsKKyAgICB9LAorCiAgICAg Z2V0IG1pbWVUeXBlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9taW1lVHlwZTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCA4YWYx NTA1Li4yZWE2YjRmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl c1BhbmVsLmpzCkBAIC03NTEsMTMgKzc1MSwzNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFu ZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHRhYmxlRWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInRhYmxlIik7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IGFuY2hv ci5wYXJlbnRFbGVtZW50LnJlc291cmNlOwotICAgICAgICB2YXIgZGF0YSA9IFtXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkJsb2NraW5nIiksIHJlc291cmNlLnRpbWluZy5yZXF1ZXN0VGltZSA9PT0g MCA/ICI/IiA6IE51bWJlci5zZWNvbmRzVG9TdHJpbmcoTWF0aC5tYXgocmVzb3VyY2UudGltaW5n LnJlcXVlc3RUaW1lIC0gcmVzb3VyY2Uuc3RhcnRUaW1lLCAwKSksCi0gICAgICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJveHkiKSwgcmVzb3VyY2UudGltaW5nLnByb3h5 RHVyYXRpb24gPT0gLTEgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihub25lKSIpIDogTnVtYmVy LnNlY29uZHNUb1N0cmluZyhyZXNvdXJjZS50aW1pbmcucHJveHlEdXJhdGlvbiksCi0gICAgICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRE5TIExvb2t1cCIpLCByZXNvdXJj ZS50aW1pbmcuZG5zRHVyYXRpb24gPT0gLTEgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihyZXVz ZWQpIikgOiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy5kbnNEdXJhdGlv biksCi0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29ubmVjdGlu ZyIpLCByZXNvdXJjZS50aW1pbmcuY29ubmVjdER1cmF0aW9uID09IC0xID8gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCIocmV1c2VkKSIpIDogTnVtYmVyLnNlY29uZHNUb1N0cmluZyhyZXNvdXJjZS50 aW1pbmcuY29ubmVjdER1cmF0aW9uKSwKLSAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTZW5kaW5nIiksIE51bWJlci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGlt aW5nLnNlbmREdXJhdGlvbiksCi0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiV2FpdGluZyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLnRpbWluZy53 YWl0RHVyYXRpb24pLAotICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlJlY2VpdmluZyIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHJlc291cmNlLmVuZFRpbWUgLSBy ZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGltZSldOworICAgICAgICB2YXIgZGF0YSA9IFtdOwor CisgICAgICAgIGlmIChyZXNvdXJjZS50aW1pbmcucHJveHlEdXJhdGlvbiAhPT0gLTEpIHsKKyAg ICAgICAgICAgIGRhdGEucHVzaChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByb3h5IikpOworICAg ICAgICAgICAgZGF0YS5wdXNoKE51bWJlci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGltaW5n LnByb3h5RHVyYXRpb24pKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChyZXNvdXJjZS50aW1p bmcuZG5zRHVyYXRpb24gIT09IC0xKSB7CisgICAgICAgICAgICBkYXRhLnB1c2goV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJETlMgTG9va3VwIikpOworICAgICAgICAgICAgZGF0YS5wdXNoKE51bWJl ci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UudGltaW5nLmRuc0R1cmF0aW9uKSk7CisgICAgICAg IH0KKworICAgICAgICBpZiAocmVzb3VyY2UudGltaW5nLmNvbm5lY3REdXJhdGlvbiAhPT0gLTEp IHsKKyAgICAgICAgICAgIGlmIChyZXNvdXJjZS5jb25uZWN0aW9uUmV1c2VkKQorICAgICAgICAg ICAgICAgIGRhdGEucHVzaChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJsb2NraW5nIikpOworICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGRhdGEucHVzaChXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkNvbm5lY3RpbmciKSk7CisgICAgICAgICAgICBkYXRhLnB1c2goTnVtYmVyLnNlY29u ZHNUb1N0cmluZyhyZXNvdXJjZS50aW1pbmcuY29ubmVjdER1cmF0aW9uKSk7CisgICAgICAgIH0K KworICAgICAgICBkYXRhLnB1c2goV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZW5kaW5nIikpOwor ICAgICAgICBkYXRhLnB1c2goTnVtYmVyLnNlY29uZHNUb1N0cmluZyhyZXNvdXJjZS50aW1pbmcu c2VuZER1cmF0aW9uKSk7CisKKyAgICAgICAgZGF0YS5wdXNoKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiV2FpdGluZyIpKTsKKyAgICAgICAgZGF0YS5wdXNoKE51bWJlci5zZWNvbmRzVG9TdHJpbmco cmVzb3VyY2UudGltaW5nLndhaXREdXJhdGlvbikpOworCisgICAgICAgIGRhdGEucHVzaChXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlJlY2VpdmluZyIpKTsKKyAgICAgICAgZGF0YS5wdXNoKE51bWJl ci5zZWNvbmRzVG9TdHJpbmcocmVzb3VyY2UuZW5kVGltZSAtIHJlc291cmNlLnJlc3BvbnNlUmVj ZWl2ZWRUaW1lKSk7CiAKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBkYXRhLmxlbmd0aDsg aSArPSAyKSB7CiAgICAgICAgICAgICB2YXIgdHIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0 ciIpOwpAQCAtMTI1Miw4ICsxMjczLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGggPSBm dW5jdGlvbihyZXNvdXJjZSkKICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuY2xhc3NOYW1lID0gInJl c291cmNlcy1ncmFwaC1zaWRlIjsKICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2VvdmVyIiwgdGhpcy5yZWZyZXNoTGFiZWxQb3NpdGlvbnMuYmluZCh0aGlzKSwg ZmFsc2UpOwogCi0gICAgaWYgKHJlc291cmNlLmNhY2hlZCkKLSAgICAgICAgdGhpcy5fZ3JhcGhF bGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlLWNhY2hlZCIpOworICAgIHRoaXMuX2NhY2hl ZENoYW5nZWQoKTsKIAogICAgIHRoaXMuX2JhckFyZWFFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQuY2xhc3NOYW1lID0gInJl c291cmNlcy1ncmFwaC1iYXItYXJlYSBoaWRkZW4iOwpAQCAtMTI3Nyw2ICsxMjk3LDggQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlR3JhcGggPSBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB0aGlzLl9i YXJBcmVhRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9sYWJlbFJpZ2h0RWxlbWVudCk7CiAKICAg ICB0aGlzLl9ncmFwaEVsZW1lbnQuYWRkU3R5bGVDbGFzcygicmVzb3VyY2VzLWNhdGVnb3J5LSIg KyByZXNvdXJjZS5jYXRlZ29yeS5uYW1lKTsKKworICAgIHJlc291cmNlLmFkZEV2ZW50TGlzdGVu ZXIoImNhY2hlZCBjaGFuZ2VkIiwgdGhpcy5fY2FjaGVkQ2hhbmdlZCwgdGhpcyk7CiB9CiAKIFdl Ykluc3BlY3Rvci5SZXNvdXJjZUdyYXBoLnByb3RvdHlwZSA9IHsKQEAgLTE0MDAsNSArMTQyMiwx MSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX2xhYmVsTGVmdEVsZW1lbnQudGl0bGUgPSB0b29sdGlwOwogICAgICAgICB0aGlzLl9sYWJl bFJpZ2h0RWxlbWVudC50aXRsZSA9IHRvb2x0aXA7CiAgICAgICAgIHRoaXMuX2JhclJpZ2h0RWxl bWVudC50aXRsZSA9IHRvb2x0aXA7CisgICAgfSwKKworICAgIF9jYWNoZWRDaGFuZ2VkOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcy5yZXNvdXJjZS5jYWNoZWQpCisgICAgICAg ICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuYWRkU3R5bGVDbGFzcygicmVzb3VyY2UtY2FjaGVkIik7 CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg N2MyNTViYi4uODhkOTEyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCkBAIC0xMTY3LDcgKzExNjcsNiBAQCBXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3VyY2UgPSBm dW5jdGlvbihpZGVudGlmaWVyLCBwYXlsb2FkKQogICAgICAgICByZXNvdXJjZS5tYWluUmVzb3Vy Y2UgPSBwYXlsb2FkLm1haW5SZXNvdXJjZTsKICAgICAgICAgcmVzb3VyY2UucmVxdWVzdE1ldGhv ZCA9IHBheWxvYWQucmVxdWVzdE1ldGhvZDsKICAgICAgICAgcmVzb3VyY2UucmVxdWVzdEZvcm1E YXRhID0gcGF5bG9hZC5yZXF1ZXN0Rm9ybURhdGE7Ci0gICAgICAgIHJlc291cmNlLmNhY2hlZCA9 IHBheWxvYWQuY2FjaGVkOwogICAgICAgICByZXNvdXJjZS5kb2N1bWVudFVSTCA9IHBheWxvYWQu ZG9jdW1lbnRVUkw7CiAKICAgICAgICAgaWYgKHJlc291cmNlLm1haW5SZXNvdXJjZSkKQEAgLTEx OTAsNyArMTE4OSw5IEBAIFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSA9IGZ1bmN0aW9uKGlk ZW50aWZpZXIsIHBheWxvYWQpCiAgICAgICAgIHJlc291cmNlLnN1Z2dlc3RlZEZpbGVuYW1lID0g cGF5bG9hZC5zdWdnZXN0ZWRGaWxlbmFtZTsKICAgICAgICAgcmVzb3VyY2UucmVzcG9uc2VIZWFk ZXJzID0gcGF5bG9hZC5yZXNwb25zZUhlYWRlcnM7CiAgICAgICAgIHJlc291cmNlLmNvbm5lY3Rp b25JRCA9IHBheWxvYWQuY29ubmVjdGlvbklEOworICAgICAgICByZXNvdXJjZS5jb25uZWN0aW9u UmV1c2VkID0gcGF5bG9hZC5jb25uZWN0aW9uUmV1c2VkOwogICAgICAgICByZXNvdXJjZS50aW1p bmcgPSBwYXlsb2FkLnRpbWluZzsKKyAgICAgICAgcmVzb3VyY2UuY2FjaGVkID0gcGF5bG9hZC5j YWNoZWQ7CiAgICAgfQogCiAgICAgaWYgKHBheWxvYWQuZGlkVHlwZUNoYW5nZSkgewpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCmluZGV4IGJkNDg2NmMuLmQ4YWNhMTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAKQEAgLTMwNzIsMTQgKzMwNzIsMTMgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3Vy Y2VGcm9tTWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogICAgIGlm ICghcGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBw YWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNo ZShtX2RvY3VtZW50TG9hZGVyLmdldCgpLCByZXNvdXJjZSk7Ci0jZW5kaWYKLQogICAgIGlmICgh cmVzb3VyY2UtPnNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSB8fCBtX2RvY3VtZW50TG9hZGVy LT5oYXZlVG9sZENsaWVudEFib3V0TG9hZChyZXNvdXJjZS0+dXJsKCkpKQogICAgICAgICByZXR1 cm47CiAKICAgICBpZiAoIXBhZ2UtPmFyZU1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKCkp IHsKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQorICAgICAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9s bGVyKCktPmRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShtX2RvY3VtZW50TG9hZGVyLmdl dCgpLCByZXNvdXJjZSk7CisjZW5kaWYKICAgICAgICAgbV9kb2N1bWVudExvYWRlci0+cmVjb3Jk TWVtb3J5Q2FjaGVMb2FkRm9yRnV0dXJlQ2xpZW50Tm90aWZpY2F0aW9uKHJlc291cmNlLT51cmwo KSk7CiAgICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPmRpZFRlbGxDbGllbnRBYm91dExvYWQocmVz b3VyY2UtPnVybCgpKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzA4Nyw2ICszMDg2LDkgQEAgdm9p ZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVk UmVzb3VyY2UqIHJlc291cmNlKQogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QocmVzb3Vy Y2UtPnVybCgpKTsKICAgICBpZiAobV9jbGllbnQtPmRpc3BhdGNoRGlkTG9hZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIHJlcXVlc3QsIHJlc291cmNlLT5y ZXNwb25zZSgpLCByZXNvdXJjZS0+ZW5jb2RlZFNpemUoKSkpIHsKKyNpZiBFTkFCTEUoSU5TUEVD VE9SKQorICAgICAgICBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPmRpZExvYWRSZXNvdXJj ZUZyb21NZW1vcnlDYWNoZShtX2RvY3VtZW50TG9hZGVyLmdldCgpLCByZXNvdXJjZSk7CisjZW5k aWYKICAgICAgICAgbV9kb2N1bWVudExvYWRlci0+ZGlkVGVsbENsaWVudEFib3V0TG9hZChyZXNv dXJjZS0+dXJsKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKaW5kZXggODlkMzFkNy4uZjMw MzQ0ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9u c2VCYXNlLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25z ZUJhc2UuY3BwCkBAIC00NSw2ICs0NSw3IEBAIFJlc291cmNlUmVzcG9uc2VCYXNlOjpSZXNvdXJj ZVJlc3BvbnNlQmFzZSgpCiAgICAgLCBtX2xhc3RNb2RpZmllZERhdGUoMCkKICAgICAsIG1fd2Fz Q2FjaGVkKGZhbHNlKQogICAgICwgbV9jb25uZWN0aW9uSUQoMCkKKyAgICAsIG1fY29ubmVjdGlv blJldXNlZChmYWxzZSkKICAgICAsIG1faXNOdWxsKHRydWUpCiAgICAgLCBtX2hhdmVQYXJzZWRD YWNoZUNvbnRyb2xIZWFkZXIoZmFsc2UpCiAgICAgLCBtX2hhdmVQYXJzZWRBZ2VIZWFkZXIoZmFs c2UpCkBAIC03Miw2ICs3Myw3IEBAIFJlc291cmNlUmVzcG9uc2VCYXNlOjpSZXNvdXJjZVJlc3Bv bnNlQmFzZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5CiAgICAgLCBtX2xh c3RNb2RpZmllZERhdGUoMCkKICAgICAsIG1fd2FzQ2FjaGVkKGZhbHNlKQogICAgICwgbV9jb25u ZWN0aW9uSUQoMCkKKyAgICAsIG1fY29ubmVjdGlvblJldXNlZChmYWxzZSkKICAgICAsIG1faXNO dWxsKGZhbHNlKQogICAgICwgbV9oYXZlUGFyc2VkQ2FjaGVDb250cm9sSGVhZGVyKGZhbHNlKQog ICAgICwgbV9oYXZlUGFyc2VkQWdlSGVhZGVyKGZhbHNlKQpAQCAtNDcxLDYgKzQ3MywyMCBAQCB2 b2lkIFJlc291cmNlUmVzcG9uc2VCYXNlOjpzZXRXYXNDYWNoZWQoYm9vbCB2YWx1ZSkKICAgICBt X3dhc0NhY2hlZCA9IHZhbHVlOwogfQogCitib29sIFJlc291cmNlUmVzcG9uc2VCYXNlOjpjb25u ZWN0aW9uUmV1c2VkKCkgY29uc3QKK3sKKyAgICBsYXp5SW5pdCgpOworCisgICAgcmV0dXJuIG1f Y29ubmVjdGlvblJldXNlZDsKK30KKwordm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6c2V0Q29u bmVjdGlvblJldXNlZChib29sIGNvbm5lY3Rpb25SZXVzZWQpCit7CisgICAgbGF6eUluaXQoKTsK KworICAgIG1fY29ubmVjdGlvblJldXNlZCA9IGNvbm5lY3Rpb25SZXVzZWQ7Cit9CisKIHVuc2ln bmVkIFJlc291cmNlUmVzcG9uc2VCYXNlOjpjb25uZWN0aW9uSUQoKSBjb25zdAogewogICAgIGxh enlJbml0KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VS ZXNwb25zZUJhc2UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl QmFzZS5oCmluZGV4IDg1OGE2MTIuLjY1ZTI0YWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5oCkBAIC0xMDAsNiArMTAwLDkgQEAgcHVibGlj OgogICAgIHVuc2lnbmVkIGNvbm5lY3Rpb25JRCgpIGNvbnN0OwogICAgIHZvaWQgc2V0Q29ubmVj dGlvbklEKHVuc2lnbmVkKTsKIAorICAgIGJvb2wgY29ubmVjdGlvblJldXNlZCgpIGNvbnN0Owor ICAgIHZvaWQgc2V0Q29ubmVjdGlvblJldXNlZChib29sKTsKKwogICAgIGJvb2wgd2FzQ2FjaGVk KCkgY29uc3Q7CiAgICAgdm9pZCBzZXRXYXNDYWNoZWQoYm9vbCk7CiAKQEAgLTEzNiw4ICsxMzks OSBAQCBwcm90ZWN0ZWQ6CiAgICAgU3RyaW5nIG1faHR0cFN0YXR1c1RleHQ7CiAgICAgSFRUUEhl YWRlck1hcCBtX2h0dHBIZWFkZXJGaWVsZHM7CiAgICAgdGltZV90IG1fbGFzdE1vZGlmaWVkRGF0 ZTsKLSAgICBib29sIG1fd2FzQ2FjaGVkOworICAgIGJvb2wgbV93YXNDYWNoZWQgOiAxOwogICAg IHVuc2lnbmVkIG1fY29ubmVjdGlvbklEOworICAgIGJvb2wgbV9jb25uZWN0aW9uUmV1c2VkIDog MTsKICAgICBSZWZQdHI8UmVzb3VyY2VMb2FkVGltaW5nPiBtX3Jlc291cmNlTG9hZFRpbWluZzsK IAogICAgIGJvb2wgbV9pc051bGwgOiAxOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggODE4MDdjMi4uMjYyZTNi OSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMTUgIFBhdmVsIEZlbGRt YW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZGlmZmVyZW50aWF0ZSBiZXR3ZWVu IGJsb2NraW5nIGFuZCBjb25uZWN0aW5nIHRpbWVycy4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIzNzIKKworICAgICAgICAqIHB1YmxpYy9XZWJV UkxSZXNwb25zZS5oOgorICAgICAgICAqIHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlVSTFJlc3BvbnNlOjpjb25uZWN0aW9uUmV1c2VkKToKKyAgICAgICAgKFdl YktpdDo6V2ViVVJMUmVzcG9uc2U6OnNldENvbm5lY3Rpb25SZXVzZWQpOgorCiAyMDEwLTA3LTE0 ICBHZW9yZ2UgWWFrb3ZsZXYgIDxnZW9yZ2V5QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBGaXNoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlVSTFJlc3BvbnNlLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNl LmgKaW5kZXggMmFhNjAzZC4uNDcyN2M3MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJVUkxSZXNwb25zZS5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJM UmVzcG9uc2UuaApAQCAtNzYsNiArNzYsOSBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSB1bnNp Z25lZCBjb25uZWN0aW9uSUQoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0Q29ubmVj dGlvbklEKHVuc2lnbmVkKTsKIAorICAgIFdFQktJVF9BUEkgYm9vbCBjb25uZWN0aW9uUmV1c2Vk KCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldENvbm5lY3Rpb25SZXVzZWQoYm9vbCk7 CisKICAgICBXRUJLSVRfQVBJIFdlYlVSTExvYWRUaW1pbmcgbG9hZFRpbWluZygpOwogICAgIFdF QktJVF9BUEkgdm9pZCBzZXRMb2FkVGltaW5nKGNvbnN0IFdlYlVSTExvYWRUaW1pbmcmKTsKIApk aWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAgYi9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAppbmRleCAyYjdmYWNjLi5lNDE3MmU3 IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAorKysg Yi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcApAQCAtMTA3LDYgKzEwNywx NiBAQCB2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRDb25uZWN0aW9uSUQodW5zaWduZWQgY29ubmVj dGlvbklEKQogICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRDb25uZWN0aW9u SUQoY29ubmVjdGlvbklEKTsKIH0KIAorYm9vbCBXZWJVUkxSZXNwb25zZTo6Y29ubmVjdGlvblJl dXNlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNl LT5jb25uZWN0aW9uUmV1c2VkKCk7Cit9CisKK3ZvaWQgV2ViVVJMUmVzcG9uc2U6OnNldENvbm5l Y3Rpb25SZXVzZWQoYm9vbCBjb25uZWN0aW9uUmV1c2VkKQoreworICAgIG1fcHJpdmF0ZS0+bV9y ZXNvdXJjZVJlc3BvbnNlLT5zZXRDb25uZWN0aW9uUmV1c2VkKGNvbm5lY3Rpb25SZXVzZWQpOwor fQorCiBXZWJVUkxMb2FkVGltaW5nIFdlYlVSTFJlc3BvbnNlOjpsb2FkVGltaW5nKCkKIHsKICAg ICByZXR1cm4gV2ViVVJMTG9hZFRpbWluZyhtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+ cmVzb3VyY2VMb2FkVGltaW5nKCkpOwo=