58650 2011-04-15 03:57:36 -0700 Web Inspector: Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText 2011-04-15 10:32:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik webkit-unassigned apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 386500 0 vsevik 2011-04-15 03:57:36 -0700 Rename rawRequestHeadersText and RawResponseHeadersText to requestHeadersText and responseHeadersText 386502 1 89764 vsevik 2011-04-15 04:07:06 -0700 Created attachment 89764 Patch 386727 2 commit-queue 2011-04-15 10:29:30 -0700 The commit-queue encountered the following flaky tests while processing attachment 89764: transitions/change-values-during-transition.html bug 58673 (authors: jparent@google.com, mihaip@chromium.org, and pol@apple.com) http/tests/xmlhttprequest/basic-auth.html bug 51613 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 386729 3 89764 commit-queue 2011-04-15 10:32:23 -0700 Comment on attachment 89764 Patch Clearing flags on attachment: 89764 Committed r83987: <http://trac.webkit.org/changeset/83987> 386730 4 commit-queue 2011-04-15 10:32:26 -0700 All reviewed patches have been landed. Closing bug. 89764 2011-04-15 04:07:06 -0700 2011-04-15 10:32:23 -0700 Patch raw_rename text/plain 21248 vsevik ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZjdiZTBlLi4zNGVjNGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTEtMDQtMTUgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVuYW1lIHJhd1JlcXVlc3RIZWFkZXJzVGV4dCBhbmQgUmF3UmVzcG9uc2VIZWFkZXJz VGV4dCB0byByZXF1ZXN0SGVhZGVyc1RleHQgYW5kIHJlc3BvbnNlSGVhZGVyc1RleHQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4NjUwCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JS ZXNvdXJjZVJlc3BvbnNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtN YW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3Rv dHlwZS5fdXBkYXRlUmVzb3VyY2VXaXRoUmVzcG9uc2UpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJv dG90eXBlLmdldCByZXF1ZXN0SGVhZGVyc1RleHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlLnByb3RvdHlwZS5zZXQgcmVxdWVzdEhlYWRlcnNUZXh0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IHJlcXVlc3RIZWFkZXJzU2l6ZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCByZXNwb25zZUhlYWRlcnNU ZXh0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IHJlc3Bv bnNlSGVhZGVyc1RleHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlw ZS5nZXQgcmVzcG9uc2VIZWFkZXJzU2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UucHJvdG90eXBlLl9oZWFkZXJzU2l6ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZUhlYWRlcnNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl SGVhZGVyc1ZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlSGVhZGVyc1ZpZXcu cHJvdG90eXBlLl9yZWZyZXNoUmVxdWVzdEhlYWRlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlSGVhZGVyc1ZpZXcucHJvdG90eXBlLl9yZWZyZXNoUmVzcG9uc2VIZWFkZXJzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUhlYWRlcnNWaWV3LnByb3RvdHlwZS5fcmVm cmVzaEhlYWRlcnNUaXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VIZWFkZXJz Vmlldy5wcm90b3R5cGUuX3JlZnJlc2hIZWFkZXJzVGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2VIZWFkZXJzVmlldy5wcm90b3R5cGUuX3RvZ2dsZVJlcXVlc3RIZWFkZXJzVGV4 dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VIZWFkZXJzVmlldy5wcm90b3R5cGUu X3RvZ2dsZVJlc3BvbnNlSGVhZGVyc1RleHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlSGVhZGVyc1ZpZXcucHJvdG90eXBlLl9jcmVhdGVIZWFkZXJzVG9nZ2xlQnV0dG9uKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtQYW5lbC5jc3M6CisgICAgICAgICgu cmVzb3VyY2UtaGVhZGVycy12aWV3IC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkuaGVhZGVycy10ZXh0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlTG9hZEluZm8uaDoKKwogMjAx MS0wNC0xNSAgQmVuIFRheWxvciAgPGJlbnRheWxvci5zb2x4ODZAZ21haWwuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggN2VmN2JhYS4uMzdhM2Q3ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMzM2LDEwICszMzYsMTAgQEAKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJzdGF0dXMiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3Jp cHRpb24iOiAiSFRUUCByZXNwb25zZSBzdGF0dXMgY29kZS4iIH0sCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAic3RhdHVzVGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJIVFRQIHJlc3BvbnNlIHN0YXR1cyB0ZXh0LiIgfSwKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJoZWFkZXJzIiwgInR5cGUiOiAib2JqZWN0IiwgImRlc2NyaXB0aW9uIjogIkhU VFAgcmVzcG9uc2UgaGVhZGVycy4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi cmF3SGVhZGVyc1RleHQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiUmF3IEhUVFAgcmVzcG9uc2UgaGVhZGVycyB0ZXh0LiIgfSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJoZWFkZXJzVGV4dCIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJIVFRQIHJlc3BvbnNlIGhlYWRlcnMgdGV4 dC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibWltZVR5cGUiLCAidHlwZSI6 ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVzb3VyY2UgbWltZVR5cGUgYXMgZGV0ZXJtaW5l ZCBieSB0aGUgYnJvd3Nlci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVx dWVzdEhlYWRlcnMiLCAidHlwZSI6ICJvYmplY3QiLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3Jp cHRpb24iOiAiUmVmaW5lZCBIVFRQIHJlcXVlc3QgaGVhZGVycyB0aGF0IHdlcmUgYWN0dWFsbHkg dHJhbnNtaXR0ZWQgb3ZlciB0aGUgbmV0d29yay4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAicmF3UmVxdWVzdEhlYWRlcnNUZXh0IiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlv bmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlJhdyBIVFRQIHJlcXVlc3QgaGVhZGVycyB0ZXh0 LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1ZXN0SGVhZGVyc1RleHQi LCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiSFRU UCByZXF1ZXN0IGhlYWRlcnMgdGV4dC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAiY29ubmVjdGlvblJldXNlZCIsICJ0eXBlIjogImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAi U3BlY2lmaWVzIHdoZXRoZXIgcGh5c2ljYWwgY29ubmVjdGlvbiB3YXMgYWN0dWFsbHkgcmV1c2Vk IGZvciB0aGlzIHJlcXVlc3QuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNv bm5lY3Rpb25JRCIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJQaHlzaWNhbCBj b25uZWN0aW9uIGlkIHRoYXQgd2FzIGFjdHVhbGx5IHVzZWQgZm9yIHRoaXMgcmVxdWVzdC4iIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZnJvbURpc2tDYWNoZSIsICJ0eXBlIjog ImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiU3BlY2lmaWVzIHRo YXQgdGhlIHJlc291cmNlIHdhcyBsb2FkZWQgZnJvbSB0aGUgZGlzayBjYWNoZS4iIH0sCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAK aW5kZXggMTY5ODA2Mi4uNjUxYzI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcApAQCAtMjMxLDEyICsyMzEsMTIgQEAgc3Rh dGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvclJlc291cmNlUmVz cG9uc2UoY29uc3QgUmVzb3VyY2UKIAogICAgIGlmIChyZXNwb25zZS5yZXNvdXJjZUxvYWRJbmZv KCkpIHsKICAgICAgICAgcmVzcG9uc2VPYmplY3QtPnNldE9iamVjdCgiaGVhZGVycyIsIGJ1aWxk T2JqZWN0Rm9ySGVhZGVycyhyZXNwb25zZS5yZXNvdXJjZUxvYWRJbmZvKCktPnJlc3BvbnNlSGVh ZGVycykpOwotICAgICAgICBpZiAoIXJlc3BvbnNlLnJlc291cmNlTG9hZEluZm8oKS0+cmF3UmVz cG9uc2VIZWFkZXJzVGV4dC5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXNwb25zZU9iamVjdC0+ c2V0U3RyaW5nKCJyYXdIZWFkZXJzVGV4dCIsIHJlc3BvbnNlLnJlc291cmNlTG9hZEluZm8oKS0+ cmF3UmVzcG9uc2VIZWFkZXJzVGV4dCk7CisgICAgICAgIGlmICghcmVzcG9uc2UucmVzb3VyY2VM b2FkSW5mbygpLT5yZXNwb25zZUhlYWRlcnNUZXh0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHJl c3BvbnNlT2JqZWN0LT5zZXRTdHJpbmcoImhlYWRlcnNUZXh0IiwgcmVzcG9uc2UucmVzb3VyY2VM b2FkSW5mbygpLT5yZXNwb25zZUhlYWRlcnNUZXh0KTsKIAogICAgICAgICByZXNwb25zZU9iamVj dC0+c2V0T2JqZWN0KCJyZXF1ZXN0SGVhZGVycyIsIGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhyZXNw b25zZS5yZXNvdXJjZUxvYWRJbmZvKCktPnJlcXVlc3RIZWFkZXJzKSk7Ci0gICAgICAgIGlmICgh cmVzcG9uc2UucmVzb3VyY2VMb2FkSW5mbygpLT5yYXdSZXF1ZXN0SGVhZGVyc1RleHQuaXNFbXB0 eSgpKQotICAgICAgICAgICAgcmVzcG9uc2VPYmplY3QtPnNldFN0cmluZygicmF3UmVxdWVzdEhl YWRlcnNUZXh0IiwgcmVzcG9uc2UucmVzb3VyY2VMb2FkSW5mbygpLT5yYXdSZXF1ZXN0SGVhZGVy c1RleHQpOworICAgICAgICBpZiAoIXJlc3BvbnNlLnJlc291cmNlTG9hZEluZm8oKS0+cmVxdWVz dEhlYWRlcnNUZXh0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHJlc3BvbnNlT2JqZWN0LT5zZXRT dHJpbmcoInJlcXVlc3RIZWFkZXJzVGV4dCIsIHJlc3BvbnNlLnJlc291cmNlTG9hZEluZm8oKS0+ cmVxdWVzdEhlYWRlcnNUZXh0KTsKICAgICB9IGVsc2UKICAgICAgICAgcmVzcG9uc2VPYmplY3Qt PnNldE9iamVjdCgiaGVhZGVycyIsIGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhyZXNwb25zZS5odHRw SGVhZGVyRmllbGRzKCkpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggODQ4ODdkMy4uNGQ4Y2QyZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2Vy LmpzCkBAIC05MiwxMiArOTIsMTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmVzb3VyY2Uuc3RhdHVzQ29kZSA9IHJlc3BvbnNlLnN0YXR1 czsKICAgICAgICAgcmVzb3VyY2Uuc3RhdHVzVGV4dCA9IHJlc3BvbnNlLnN0YXR1c1RleHQ7CiAg ICAgICAgIHJlc291cmNlLnJlc3BvbnNlSGVhZGVycyA9IHJlc3BvbnNlLmhlYWRlcnM7Ci0gICAg ICAgIGlmIChyZXNwb25zZS5yYXdIZWFkZXJzVGV4dCkKLSAgICAgICAgICAgIHJlc291cmNlLnJh d1Jlc3BvbnNlSGVhZGVyc1RleHQgPSByZXNwb25zZS5yYXdIZWFkZXJzVGV4dDsKKyAgICAgICAg aWYgKHJlc3BvbnNlLmhlYWRlcnNUZXh0KQorICAgICAgICAgICAgcmVzb3VyY2UucmVzcG9uc2VI ZWFkZXJzVGV4dCA9IHJlc3BvbnNlLmhlYWRlcnNUZXh0OwogICAgICAgICBpZiAocmVzcG9uc2Uu cmVxdWVzdEhlYWRlcnMpCiAgICAgICAgICAgICByZXNvdXJjZS5yZXF1ZXN0SGVhZGVycyA9IHJl c3BvbnNlLnJlcXVlc3RIZWFkZXJzOwotICAgICAgICBpZiAocmVzcG9uc2UucmF3UmVxdWVzdEhl YWRlcnNUZXh0KQotICAgICAgICAgICAgcmVzb3VyY2UucmF3UmVxdWVzdEhlYWRlcnNUZXh0ID0g cmVzcG9uc2UucmF3UmVxdWVzdEhlYWRlcnNUZXh0OworICAgICAgICBpZiAocmVzcG9uc2UucmVx dWVzdEhlYWRlcnNUZXh0KQorICAgICAgICAgICAgcmVzb3VyY2UucmVxdWVzdEhlYWRlcnNUZXh0 ID0gcmVzcG9uc2UucmVxdWVzdEhlYWRlcnNUZXh0OwogCiAgICAgICAgIHJlc291cmNlLmNvbm5l Y3Rpb25SZXVzZWQgPSByZXNwb25zZS5jb25uZWN0aW9uUmV1c2VkOwogICAgICAgICByZXNvdXJj ZS5jb25uZWN0aW9uSUQgPSByZXNwb25zZS5jb25uZWN0aW9uSUQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCBkYTk4OWNiLi40Y2NlNWNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMK QEAgLTQwNywxNCArNDA3LDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJyZXF1ZXN0SGVhZGVycyBj aGFuZ2VkIik7CiAgICAgfSwKIAotICAgIGdldCByYXdSZXF1ZXN0SGVhZGVyc1RleHQoKQorICAg IGdldCByZXF1ZXN0SGVhZGVyc1RleHQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Jh d1JlcXVlc3RIZWFkZXJzVGV4dDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3JlcXVlc3RIZWFkZXJz VGV4dDsKICAgICB9LAogCi0gICAgc2V0IHJhd1JlcXVlc3RIZWFkZXJzVGV4dCh4KQorICAgIHNl dCByZXF1ZXN0SGVhZGVyc1RleHQoeCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Jhd1JlcXVlc3RI ZWFkZXJzVGV4dCA9IHg7CisgICAgICAgIHRoaXMuX3JlcXVlc3RIZWFkZXJzVGV4dCA9IHg7CiAg ICAgICAgIGRlbGV0ZSB0aGlzLl9yZXNwb25zZUhlYWRlcnNTaXplOwogCiAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJyZXF1ZXN0SGVhZGVycyBjaGFuZ2VkIik7CkBAIC00 MjMsOCArNDIzLDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICBn ZXQgcmVxdWVzdEhlYWRlcnNTaXplKCkKICAgICB7CiAgICAgICAgIGlmICh0eXBlb2YodGhpcy5f cmVxdWVzdEhlYWRlcnNTaXplKSA9PT0gInVuZGVmaW5lZCIpIHsKLSAgICAgICAgICAgIGlmICh0 aGlzLl9yYXdSZXF1ZXN0SGVhZGVyc1RleHQpCi0gICAgICAgICAgICAgICAgdGhpcy5fcmVxdWVz dEhlYWRlcnNTaXplID0gdGhpcy5fcmF3UmVxdWVzdEhlYWRlcnNUZXh0Lmxlbmd0aDsKKyAgICAg ICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0SGVhZGVyc1RleHQpCisgICAgICAgICAgICAgICAgdGhp cy5fcmVxdWVzdEhlYWRlcnNTaXplID0gdGhpcy5fcmVxdWVzdEhlYWRlcnNUZXh0Lmxlbmd0aDsK ICAgICAgICAgICAgIGVsc2UgCiAgICAgICAgICAgICAgICAgdGhpcy5fcmVxdWVzdEhlYWRlcnNT aXplID0gdGhpcy5faGVhZGVyc1NpemUodGhpcy5fcmVxdWVzdEhlYWRlcnMpCiAgICAgICAgIH0K QEAgLTQ4MiwxNCArNDgyLDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJyZXNwb25zZUhlYWRlcnMg Y2hhbmdlZCIpOwogICAgIH0sCiAgICAgCi0gICAgZ2V0IHJhd1Jlc3BvbnNlSGVhZGVyc1RleHQo KQorICAgIGdldCByZXNwb25zZUhlYWRlcnNUZXh0KCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0 aGlzLl9yYXdSZXNwb25zZUhlYWRlcnNUZXh0OworICAgICAgICByZXR1cm4gdGhpcy5fcmVzcG9u c2VIZWFkZXJzVGV4dDsKICAgICB9LAogCi0gICAgc2V0IHJhd1Jlc3BvbnNlSGVhZGVyc1RleHQo eCkKKyAgICBzZXQgcmVzcG9uc2VIZWFkZXJzVGV4dCh4KQogICAgIHsKLSAgICAgICAgdGhpcy5f cmF3UmVzcG9uc2VIZWFkZXJzVGV4dCA9IHg7CisgICAgICAgIHRoaXMuX3Jlc3BvbnNlSGVhZGVy c1RleHQgPSB4OwogICAgICAgICBkZWxldGUgdGhpcy5fcmVzcG9uc2VIZWFkZXJzU2l6ZTsKIAog ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygicmVzcG9uc2VIZWFkZXJzIGNo YW5nZWQiKTsKQEAgLTQ5OCw4ICs0OTgsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90 eXBlID0gewogICAgIGdldCByZXNwb25zZUhlYWRlcnNTaXplKCkKICAgICB7CiAgICAgICAgIGlm ICh0eXBlb2YodGhpcy5fcmVzcG9uc2VIZWFkZXJzU2l6ZSkgPT09ICJ1bmRlZmluZWQiKSB7Ci0g ICAgICAgICAgICBpZiAodGhpcy5fcmF3UmVzcG9uc2VIZWFkZXJzVGV4dCkKLSAgICAgICAgICAg ICAgICB0aGlzLl9yZXNwb25zZUhlYWRlcnNTaXplID0gdGhpcy5fcmF3UmVzcG9uc2VIZWFkZXJz VGV4dC5sZW5ndGg7CisgICAgICAgICAgICBpZiAodGhpcy5fcmVzcG9uc2VIZWFkZXJzVGV4dCkK KyAgICAgICAgICAgICAgICB0aGlzLl9yZXNwb25zZUhlYWRlcnNTaXplID0gdGhpcy5fcmVzcG9u c2VIZWFkZXJzVGV4dC5sZW5ndGg7CiAgICAgICAgICAgICBlbHNlIAogICAgICAgICAgICAgICAg IHRoaXMuX3Jlc3BvbnNlSGVhZGVyc1NpemUgPSB0aGlzLl9oZWFkZXJzU2l6ZSh0aGlzLl9yZXNw b25zZUhlYWRlcnMpCiAgICAgICAgIH0KQEAgLTU4NSw3ICs1ODUsNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIF9oZWFkZXJzU2l6ZTogZnVuY3Rpb24oaGVhZGVy cykKICAgICB7CiAgICAgICAgIC8vIFdlIHNob3VsZCB0YWtlIGFjdHVhbCBoZWFkZXJzIHNpemUg ZnJvbSBuZXR3b3JrIHN0YWNrLCB3aGVuIHBvc3NpYmxlLCBidXQgZmFsbCBiYWNrIHRvCi0gICAg ICAgIC8vIHRoaXMgbG91c3kgY29tcHV0YXRpb24gd2hlbiBubyByYXcgaGVhZGVycyBhcmUgYXZh aWxhYmxlLgorICAgICAgICAvLyB0aGlzIGxvdXN5IGNvbXB1dGF0aW9uIHdoZW4gbm8gaGVhZGVy cyB0ZXh0IGlzIGF2YWlsYWJsZS4KICAgICAgICAgdmFyIHNpemUgPSAwOwogICAgICAgICBmb3Ig KHZhciBoZWFkZXIgaW4gaGVhZGVycykKICAgICAgICAgICAgIHNpemUgKz0gaGVhZGVyLmxlbmd0 aCArIGhlYWRlcnNbaGVhZGVyXS5sZW5ndGggKyA0OyAvLyBfdHlwaWNhbF8gb3ZlcmhlYWQgcGVy IGhlYWRlciBpcyAiOiAiLmxlbmd0aCArICJcclxuIi5sZW5ndGguCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlSGVhZGVyc1ZpZXcuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlSGVhZGVyc1ZpZXcuanMK aW5kZXggMWY3NDM5Zi4uZjEzYTM5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZUhlYWRlcnNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VIZWFkZXJzVmlldy5qcwpAQCAtNjEsOCArNjEs OCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VIZWFkZXJzVmlldyA9IGZ1bmN0aW9uKHJlc291cmNl KQogCiAgICAgdGhpcy5fZGVjb2RlUmVxdWVzdFBhcmFtZXRlcnMgPSB0cnVlOwogCi0gICAgdGhp cy5fc2hvd1Jhd1JlcXVlc3RIZWFkZXJzVGV4dCA9IGZhbHNlOwotICAgIHRoaXMuX3Nob3dSYXdS ZXNwb25zZUhlYWRlcnNUZXh0ID0gZmFsc2U7CisgICAgdGhpcy5fc2hvd1JlcXVlc3RIZWFkZXJz VGV4dCA9IGZhbHNlOworICAgIHRoaXMuX3Nob3dSZXNwb25zZUhlYWRlcnNUZXh0ID0gZmFsc2U7 CiAKICAgICB0aGlzLl9xdWVyeVN0cmluZ1RyZWVFbGVtZW50ID0gbmV3IFRyZWVFbGVtZW50KCIi LCBudWxsLCB0cnVlKTsKICAgICB0aGlzLl9xdWVyeVN0cmluZ1RyZWVFbGVtZW50LmV4cGFuZGVk ID0gdHJ1ZTsKQEAgLTIxNCwxNCArMjE0LDE0IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUhlYWRl cnNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGFkZGl0aW9uYWxSb3cgPSBudWxsOwog ICAgICAgICBpZiAodHlwZW9mIHRoaXMuX3Jlc291cmNlLndlYlNvY2tldFJlcXVlc3RLZXkzICE9 PSAidW5kZWZpbmVkIikKICAgICAgICAgICAgIGFkZGl0aW9uYWxSb3cgPSB7aGVhZGVyOiAiKEtl eTMpIiwgdmFsdWU6IHRoaXMuX3Jlc291cmNlLndlYlNvY2tldFJlcXVlc3RLZXkzfTsKLSAgICAg ICAgaWYgKHRoaXMuX3Nob3dSYXdSZXF1ZXN0SGVhZGVyc1RleHQpCi0gICAgICAgICAgICB0aGlz Ll9yZWZyZXNoUmF3SGVhZGVyc1RleHQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXF1ZXN0IEhl YWRlcnMiKSwgdGhpcy5fcmVzb3VyY2UucmF3UmVxdWVzdEhlYWRlcnNUZXh0LCB0aGlzLl9yZXF1 ZXN0SGVhZGVyc1RyZWVFbGVtZW50KTsKKyAgICAgICAgaWYgKHRoaXMuX3Nob3dSZXF1ZXN0SGVh ZGVyc1RleHQpCisgICAgICAgICAgICB0aGlzLl9yZWZyZXNoSGVhZGVyc1RleHQoV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJSZXF1ZXN0IEhlYWRlcnMiKSwgdGhpcy5fcmVzb3VyY2UucmVxdWVzdEhl YWRlcnNUZXh0LCB0aGlzLl9yZXF1ZXN0SGVhZGVyc1RyZWVFbGVtZW50KTsKICAgICAgICAgZWxz ZSAKICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hIZWFkZXJzKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiUmVxdWVzdCBIZWFkZXJzIiksIHRoaXMuX3Jlc291cmNlLnNvcnRlZFJlcXVlc3RIZWFkZXJz LCBhZGRpdGlvbmFsUm93LCB0aGlzLl9yZXF1ZXN0SGVhZGVyc1RyZWVFbGVtZW50KTsKIAotICAg ICAgICBpZiAodGhpcy5fcmVzb3VyY2UucmF3UmVxdWVzdEhlYWRlcnNUZXh0KSB7IAotICAgICAg ICAgICAgdmFyIHRvZ2dsZUJ1dHRvbiA9IHRoaXMuX2NyZWF0ZUhlYWRlcnNUb2dnbGVCdXR0b24o dGhpcy5fc2hvd1Jhd1JlcXVlc3RIZWFkZXJzVGV4dCk7Ci0gICAgICAgICAgICB0b2dnbGVCdXR0 b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dnbGVSYXdSZXF1ZXN0SGVhZGVy c1RleHQuYmluZCh0aGlzKSk7CisgICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZS5yZXF1ZXN0SGVh ZGVyc1RleHQpIHsgCisgICAgICAgICAgICB2YXIgdG9nZ2xlQnV0dG9uID0gdGhpcy5fY3JlYXRl SGVhZGVyc1RvZ2dsZUJ1dHRvbih0aGlzLl9zaG93UmVxdWVzdEhlYWRlcnNUZXh0KTsKKyAgICAg ICAgICAgIHRvZ2dsZUJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2ds ZVJlcXVlc3RIZWFkZXJzVGV4dC5iaW5kKHRoaXMpKTsKICAgICAgICAgICAgIHRoaXMuX3JlcXVl c3RIZWFkZXJzVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKHRvZ2dsZUJ1 dHRvbik7CiAgICAgICAgIH0KIApAQCAtMjMzLDE0ICsyMzMsMTQgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlSGVhZGVyc1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgYWRkaXRpb25hbFJv dyA9IG51bGw7CiAgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fcmVzb3VyY2Uud2ViU29ja2V0Q2hh bGxlbmdlUmVzcG9uc2UgIT09ICJ1bmRlZmluZWQiKQogICAgICAgICAgICAgYWRkaXRpb25hbFJv dyA9IHtoZWFkZXI6ICIoQ2hhbGxlbmdlIFJlc3BvbnNlKSIsIHZhbHVlOiB0aGlzLl9yZXNvdXJj ZS53ZWJTb2NrZXRDaGFsbGVuZ2VSZXNwb25zZX07Ci0gICAgICAgIGlmICh0aGlzLl9zaG93UmF3 UmVzcG9uc2VIZWFkZXJzVGV4dCkKLSAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hSYXdIZWFkZXJz VGV4dChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc3BvbnNlIEhlYWRlcnMiKSwgdGhpcy5fcmVz b3VyY2UucmF3UmVzcG9uc2VIZWFkZXJzVGV4dCwgdGhpcy5fcmVzcG9uc2VIZWFkZXJzVHJlZUVs ZW1lbnQpOworICAgICAgICBpZiAodGhpcy5fc2hvd1Jlc3BvbnNlSGVhZGVyc1RleHQpCisgICAg ICAgICAgICB0aGlzLl9yZWZyZXNoSGVhZGVyc1RleHQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJS ZXNwb25zZSBIZWFkZXJzIiksIHRoaXMuX3Jlc291cmNlLnJlc3BvbnNlSGVhZGVyc1RleHQsIHRo aXMuX3Jlc3BvbnNlSGVhZGVyc1RyZWVFbGVtZW50KTsKICAgICAgICAgZWxzZQogICAgICAgICAg ICAgdGhpcy5fcmVmcmVzaEhlYWRlcnMoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNwb25zZSBI ZWFkZXJzIiksIHRoaXMuX3Jlc291cmNlLnNvcnRlZFJlc3BvbnNlSGVhZGVycywgYWRkaXRpb25h bFJvdywgdGhpcy5fcmVzcG9uc2VIZWFkZXJzVHJlZUVsZW1lbnQpOwogICAgICAgICAKLSAgICAg ICAgaWYgKHRoaXMuX3Jlc291cmNlLnJhd1Jlc3BvbnNlSGVhZGVyc1RleHQpIHsKLSAgICAgICAg ICAgIHZhciB0b2dnbGVCdXR0b24gPSB0aGlzLl9jcmVhdGVIZWFkZXJzVG9nZ2xlQnV0dG9uKHRo aXMuX3Nob3dSYXdSZXNwb25zZUhlYWRlcnNUZXh0KTsKLSAgICAgICAgICAgIHRvZ2dsZUJ1dHRv bi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZVJhd1Jlc3BvbnNlSGVhZGVy c1RleHQuYmluZCh0aGlzKSk7CisgICAgICAgIGlmICh0aGlzLl9yZXNvdXJjZS5yZXNwb25zZUhl YWRlcnNUZXh0KSB7CisgICAgICAgICAgICB2YXIgdG9nZ2xlQnV0dG9uID0gdGhpcy5fY3JlYXRl SGVhZGVyc1RvZ2dsZUJ1dHRvbih0aGlzLl9zaG93UmVzcG9uc2VIZWFkZXJzVGV4dCk7CisgICAg ICAgICAgICB0b2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dn bGVSZXNwb25zZUhlYWRlcnNUZXh0LmJpbmQodGhpcykpOwogICAgICAgICAgICAgdGhpcy5fcmVz cG9uc2VIZWFkZXJzVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKHRvZ2ds ZUJ1dHRvbik7CiAgICAgICAgIH0KICAgICB9LApAQCAtMjczLDEyICsyNzMsMTIgQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlSGVhZGVyc1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKICAgICAKLSAgICBfcmVmcmVzaEhlYWRlcnNUaXRsZTogZnVuY3Rpb24odGl0bGUsIGhlYWRl cnNUcmVlRWxlbWVudCwgaXNSYXdIZWFkZXJzVGV4dFNob3duLCBoZWFkZXJzTGVuZ3RoKQorICAg IF9yZWZyZXNoSGVhZGVyc1RpdGxlOiBmdW5jdGlvbih0aXRsZSwgaGVhZGVyc1RyZWVFbGVtZW50 LCBpc0hlYWRlcnNUZXh0U2hvd24sIGhlYWRlcnNMZW5ndGgpCiAgICAgewogICAgICAgICBoZWFk ZXJzVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAg IGhlYWRlcnNUcmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUodGl0bGUpKTsKICAgICAgICAgCi0gICAgICAgIGlmICghaXNSYXdIZWFk ZXJzVGV4dFNob3duKSB7CisgICAgICAgIGlmICghaXNIZWFkZXJzVGV4dFNob3duKSB7CiAgICAg ICAgICAgICB2YXIgaGVhZGVyQ291bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7 CiAgICAgICAgICAgICBoZWFkZXJDb3VudC5hZGRTdHlsZUNsYXNzKCJoZWFkZXItY291bnQiKTsK ICAgICAgICAgICAgIGhlYWRlckNvdW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIgKCVkKSIsIGhlYWRlcnNMZW5ndGgpOwpAQCAtMzE0LDcgKzMxNCw3IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZUhlYWRlcnNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0s CiAgICAgCi0gICAgX3JlZnJlc2hSYXdIZWFkZXJzVGV4dDogZnVuY3Rpb24odGl0bGUsIHJhd0hl YWRlcnNUZXh0LCBoZWFkZXJzVHJlZUVsZW1lbnQpCisgICAgX3JlZnJlc2hIZWFkZXJzVGV4dDog ZnVuY3Rpb24odGl0bGUsIGhlYWRlcnNUZXh0LCBoZWFkZXJzVHJlZUVsZW1lbnQpCiAgICAgewog ICAgICAgICBoZWFkZXJzVHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgCkBA IC0zMjIsMjQgKzMyMiwyNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VIZWFkZXJzVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBoZWFkZXJUcmVlRWxlbWVudCA9IG5ldyBUcmVlRWxlbWVu dChudWxsLCBudWxsLCBmYWxzZSk7CiAgICAgICAgIGhlYWRlclRyZWVFbGVtZW50LnNlbGVjdGFi bGUgPSBmYWxzZTsKICAgICAgICAgaGVhZGVyc1RyZWVFbGVtZW50LmFwcGVuZENoaWxkKGhlYWRl clRyZWVFbGVtZW50KTsKLSAgICAgICAgaGVhZGVyVHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50 LmFkZFN0eWxlQ2xhc3MoInJhdy1oZWFkZXJzLXRleHQiKTsKKyAgICAgICAgaGVhZGVyVHJlZUVs ZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhlYWRlcnMtdGV4dCIpOwogICAg ICAgICAKLSAgICAgICAgdmFyIHJhd0hlYWRlcnNUZXh0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgcmF3SGVhZGVyc1RleHRFbGVtZW50LmFkZFN0eWxl Q2xhc3MoImhlYWRlci12YWx1ZSIpOwotICAgICAgICByYXdIZWFkZXJzVGV4dEVsZW1lbnQuYWRk U3R5bGVDbGFzcygic291cmNlLWNvZGUiKTsKLSAgICAgICAgcmF3SGVhZGVyc1RleHRFbGVtZW50 LnRleHRDb250ZW50ID0gU3RyaW5nKHJhd0hlYWRlcnNUZXh0KS50cmltKCk7Ci0gICAgICAgIGhl YWRlclRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5hcHBlbmRDaGlsZChyYXdIZWFkZXJzVGV4 dEVsZW1lbnQpOworICAgICAgICB2YXIgaGVhZGVyc1RleHRFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgic3BhbiIpOworICAgICAgICBoZWFkZXJzVGV4dEVsZW1lbnQuYWRkU3R5bGVD bGFzcygiaGVhZGVyLXZhbHVlIik7CisgICAgICAgIGhlYWRlcnNUZXh0RWxlbWVudC5hZGRTdHls ZUNsYXNzKCJzb3VyY2UtY29kZSIpOworICAgICAgICBoZWFkZXJzVGV4dEVsZW1lbnQudGV4dENv bnRlbnQgPSBTdHJpbmcoaGVhZGVyc1RleHQpLnRyaW0oKTsKKyAgICAgICAgaGVhZGVyVHJlZUVs ZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKGhlYWRlcnNUZXh0RWxlbWVudCk7CiAg ICAgfSwKIAotICAgIF90b2dnbGVSYXdSZXF1ZXN0SGVhZGVyc1RleHQ6IGZ1bmN0aW9uKGV2ZW50 KQorICAgIF90b2dnbGVSZXF1ZXN0SGVhZGVyc1RleHQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsK LSAgICAgICAgdGhpcy5fc2hvd1Jhd1JlcXVlc3RIZWFkZXJzVGV4dCA9ICF0aGlzLl9zaG93UmF3 UmVxdWVzdEhlYWRlcnNUZXh0OworICAgICAgICB0aGlzLl9zaG93UmVxdWVzdEhlYWRlcnNUZXh0 ID0gIXRoaXMuX3Nob3dSZXF1ZXN0SGVhZGVyc1RleHQ7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hS ZXF1ZXN0SGVhZGVycygpOwogICAgIH0sCiAKLSAgICBfdG9nZ2xlUmF3UmVzcG9uc2VIZWFkZXJz VGV4dDogZnVuY3Rpb24oZXZlbnQpCisgICAgX3RvZ2dsZVJlc3BvbnNlSGVhZGVyc1RleHQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fc2hvd1Jhd1Jlc3BvbnNlSGVhZGVy c1RleHQgPSAhdGhpcy5fc2hvd1Jhd1Jlc3BvbnNlSGVhZGVyc1RleHQ7CisgICAgICAgIHRoaXMu X3Nob3dSZXNwb25zZUhlYWRlcnNUZXh0ID0gIXRoaXMuX3Nob3dSZXNwb25zZUhlYWRlcnNUZXh0 OwogICAgICAgICB0aGlzLl9yZWZyZXNoUmVzcG9uc2VIZWFkZXJzKCk7CiAgICAgfSwKIApAQCAt MzUxLDkgKzM1MSw5IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUhlYWRlcnNWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuIGJ1dHRvbjsKICAgICB9LAogICAgIAotICAgIF9jcmVhdGVI ZWFkZXJzVG9nZ2xlQnV0dG9uOiBmdW5jdGlvbihpc1Jhd0hlYWRlcnNUZXh0U2hvd24pCisgICAg X2NyZWF0ZUhlYWRlcnNUb2dnbGVCdXR0b246IGZ1bmN0aW9uKGlzSGVhZGVyc1RleHRTaG93bikK ICAgICB7Ci0gICAgICAgIHZhciB0b2dnbGVUaXRsZSA9IGlzUmF3SGVhZGVyc1RleHRTaG93biA/ IFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlldyBwYXJzZWQiKSA6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygidmlldyBzb3VyY2UiKTsKKyAgICAgICAgdmFyIHRvZ2dsZVRpdGxlID0gaXNIZWFkZXJz VGV4dFNob3duID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ2aWV3IHBhcnNlZCIpIDogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJ2aWV3IHNvdXJjZSIpOwogICAgICAgICByZXR1cm4gdGhpcy5fY3Jl YXRlVG9nZ2xlQnV0dG9uKHRvZ2dsZVRpdGxlKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtQYW5lbC5jc3MgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtQYW5lbC5jc3MKaW5kZXggMmNmMTk5 Ny4uOGZmNWU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9uZXR3b3JrUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvbmV0d29ya1BhbmVsLmNzcwpAQCAtNzQ3LDcgKzc0Nyw3IEBACiAgICAgbWFyZ2luLXRvcDog MXB4OwogfQogCi0ucmVzb3VyY2UtaGVhZGVycy12aWV3IC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGku cmF3LWhlYWRlcnMtdGV4dCB7CisucmVzb3VyY2UtaGVhZGVycy12aWV3IC5vdXRsaW5lLWRpc2Ns b3N1cmUgbGkuaGVhZGVycy10ZXh0IHsKICAgICB0ZXh0LWluZGVudDogMDsKICAgICBtYXJnaW4t bGVmdDogLTJweDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvUmVzb3VyY2VMb2FkSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZUxvYWRJbmZvLmgKaW5kZXggMzBlZjk0YS4uOTRjNWYyNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUxvYWRJbmZvLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUxvYWRJbmZvLmgKQEAgLTQxLDgg KzQxLDggQEAgc3RydWN0IFJlc291cmNlTG9hZEluZm8gOiBSZWZDb3VudGVkPFJlc291cmNlTG9h ZEluZm8+IHsKICAgICBsb25nIGxvbmcgZW5jb2RlZERhdGFMZW5ndGg7CiAgICAgSFRUUEhlYWRl ck1hcCByZXF1ZXN0SGVhZGVyczsKICAgICBIVFRQSGVhZGVyTWFwIHJlc3BvbnNlSGVhZGVyczsK LSAgICBTdHJpbmcgcmF3UmVxdWVzdEhlYWRlcnNUZXh0OwotICAgIFN0cmluZyByYXdSZXNwb25z ZUhlYWRlcnNUZXh0OworICAgIFN0cmluZyByZXF1ZXN0SGVhZGVyc1RleHQ7CisgICAgU3RyaW5n IHJlc3BvbnNlSGVhZGVyc1RleHQ7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IDAxNTk4NGIuLjI1YWRmMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUg KzEsMTkgQEAKIDIwMTEtMDQtMTUgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5v cmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogUmVuYW1lIHJhd1JlcXVlc3RIZWFkZXJzVGV4dCBhbmQgUmF3UmVzcG9uc2VI ZWFkZXJzVGV4dCB0byByZXF1ZXN0SGVhZGVyc1RleHQgYW5kIHJlc3BvbnNlSGVhZGVyc1RleHQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4NjUwCisK KyAgICAgICAgKiBwdWJsaWMvV2ViSFRUUExvYWRJbmZvLmg6CisgICAgICAgICogc3JjL1dlYkhU VFBMb2FkSW5mby5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkhUVFBMb2FkSW5mbzo6cmVxdWVz dEhlYWRlcnNUZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViSFRUUExvYWRJbmZvOjpzZXRSZXF1 ZXN0SGVhZGVyc1RleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJIVFRQTG9hZEluZm86OnJlc3Bv bnNlSGVhZGVyc1RleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJIVFRQTG9hZEluZm86OnNldFJl c3BvbnNlSGVhZGVyc1RleHQpOgorCisyMDExLTA0LTE1ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2 aWtAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogW0Nocm9taXVtXSBDcmVhdGUgdGVzdHMgZm9yIG5ldHdv cmsgcGFuZWwgdGltaW5nLCBzaXplIGFuZCByYXcgaGVhZGVycyB0ZXh0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJIVFRQTG9hZEluZm8uaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhUVFBMb2FkSW5mby5oCmluZGV4IDgwMzI0YWQuLjAw MjQ4NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhUVFBM b2FkSW5mby5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhUVFBMb2Fk SW5mby5oCkBAIC02OCwxMSArNjgsMTEgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgdm9pZCBh ZGRSZXF1ZXN0SGVhZGVyKGNvbnN0IFdlYlN0cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiB2 YWx1ZSk7CiAgICAgV0VCS0lUX0FQSSB2b2lkIGFkZFJlc3BvbnNlSGVhZGVyKGNvbnN0IFdlYlN0 cmluZyYgbmFtZSwgY29uc3QgV2ViU3RyaW5nJiB2YWx1ZSk7CiAKLSAgICBXRUJLSVRfQVBJIFdl YlN0cmluZyByYXdSZXF1ZXN0SGVhZGVyc1RleHQoKSBjb25zdDsKLSAgICBXRUJLSVRfQVBJIHZv aWQgc2V0UmF3UmVxdWVzdEhlYWRlcnNUZXh0KGNvbnN0IFdlYlN0cmluZyYpOworICAgIFdFQktJ VF9BUEkgV2ViU3RyaW5nIHJlcXVlc3RIZWFkZXJzVGV4dCgpIGNvbnN0OworICAgIFdFQktJVF9B UEkgdm9pZCBzZXRSZXF1ZXN0SGVhZGVyc1RleHQoY29uc3QgV2ViU3RyaW5nJik7CiAKLSAgICBX RUJLSVRfQVBJIFdlYlN0cmluZyByYXdSZXNwb25zZUhlYWRlcnNUZXh0KCkgY29uc3Q7Ci0gICAg V0VCS0lUX0FQSSB2b2lkIHNldFJhd1Jlc3BvbnNlSGVhZGVyc1RleHQoY29uc3QgV2ViU3RyaW5n Jik7CisgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgcmVzcG9uc2VIZWFkZXJzVGV4dCgpIGNvbnN0 OworICAgIFdFQktJVF9BUEkgdm9pZCBzZXRSZXNwb25zZUhlYWRlcnNUZXh0KGNvbnN0IFdlYlN0 cmluZyYpOwogCiAjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCiAgICAgV2ViSFRUUExvYWRJbmZv KFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpSZXNvdXJjZUxvYWRJbmZvPik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIVFRQTG9hZEluZm8uY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSFRUUExvYWRJbmZvLmNwcAppbmRleCAyYjY5OTFkLi45 Y2I0YWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIVFRQTG9h ZEluZm8uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkhUVFBMb2FkSW5m by5jcHAKQEAgLTEyMCwyOCArMTIwLDI4IEBAIHZvaWQgV2ViSFRUUExvYWRJbmZvOjphZGRSZXNw b25zZUhlYWRlcihjb25zdCBXZWJTdHJpbmcmIG5hbWUsIGNvbnN0IFdlYlN0cmluZyYKICAgICBh ZGRIZWFkZXIoJm1fcHJpdmF0ZS0+cmVzcG9uc2VIZWFkZXJzLCBuYW1lLCB2YWx1ZSk7CiB9CiAK LVdlYlN0cmluZyBXZWJIVFRQTG9hZEluZm86OnJhd1JlcXVlc3RIZWFkZXJzVGV4dCgpIGNvbnN0 CitXZWJTdHJpbmcgV2ViSFRUUExvYWRJbmZvOjpyZXF1ZXN0SGVhZGVyc1RleHQoKSBjb25zdAog ewogICAgIEFTU0VSVCghbV9wcml2YXRlLmlzTnVsbCgpKTsKLSAgICByZXR1cm4gbV9wcml2YXRl LT5yYXdSZXF1ZXN0SGVhZGVyc1RleHQ7CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+cmVxdWVzdEhl YWRlcnNUZXh0OwogfQogCi12b2lkIFdlYkhUVFBMb2FkSW5mbzo6c2V0UmF3UmVxdWVzdEhlYWRl cnNUZXh0KGNvbnN0IFdlYlN0cmluZyYgcmF3SGVhZGVyc1RleHQpCit2b2lkIFdlYkhUVFBMb2Fk SW5mbzo6c2V0UmVxdWVzdEhlYWRlcnNUZXh0KGNvbnN0IFdlYlN0cmluZyYgaGVhZGVyc1RleHQp CiB7CiAgICAgQVNTRVJUKCFtX3ByaXZhdGUuaXNOdWxsKCkpOwotICAgIG1fcHJpdmF0ZS0+cmF3 UmVxdWVzdEhlYWRlcnNUZXh0ID0gcmF3SGVhZGVyc1RleHQ7CisgICAgbV9wcml2YXRlLT5yZXF1 ZXN0SGVhZGVyc1RleHQgPSBoZWFkZXJzVGV4dDsKIH0KIAotV2ViU3RyaW5nIFdlYkhUVFBMb2Fk SW5mbzo6cmF3UmVzcG9uc2VIZWFkZXJzVGV4dCgpIGNvbnN0CitXZWJTdHJpbmcgV2ViSFRUUExv YWRJbmZvOjpyZXNwb25zZUhlYWRlcnNUZXh0KCkgY29uc3QKIHsKICAgICBBU1NFUlQoIW1fcHJp dmF0ZS5pc051bGwoKSk7Ci0gICAgcmV0dXJuIG1fcHJpdmF0ZS0+cmF3UmVzcG9uc2VIZWFkZXJz VGV4dDsKKyAgICByZXR1cm4gbV9wcml2YXRlLT5yZXNwb25zZUhlYWRlcnNUZXh0OwogfQogCi12 b2lkIFdlYkhUVFBMb2FkSW5mbzo6c2V0UmF3UmVzcG9uc2VIZWFkZXJzVGV4dChjb25zdCBXZWJT dHJpbmcmIHJhd0hlYWRlcnNUZXh0KQordm9pZCBXZWJIVFRQTG9hZEluZm86OnNldFJlc3BvbnNl SGVhZGVyc1RleHQoY29uc3QgV2ViU3RyaW5nJiBoZWFkZXJzVGV4dCkKIHsKICAgICBBU1NFUlQo IW1fcHJpdmF0ZS5pc051bGwoKSk7Ci0gICAgbV9wcml2YXRlLT5yYXdSZXNwb25zZUhlYWRlcnNU ZXh0ID0gcmF3SGVhZGVyc1RleHQ7CisgICAgbV9wcml2YXRlLT5yZXNwb25zZUhlYWRlcnNUZXh0 ID0gaGVhZGVyc1RleHQ7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=