61930 2011-06-02 08:45:29 -0700 Web Inspector: add an option for automatically attaching to new workers 2011-06-03 00:32:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 414158 0 yurys 2011-06-02 08:45:29 -0700 Sometimes it may make sense to automatically open inspector for new workers to start inspecting them from the very first steps. 414165 1 95766 yurys 2011-06-02 08:51:42 -0700 Created attachment 95766 Patch 414689 2 yurys 2011-06-03 00:32:41 -0700 Committed r87992: <http://trac.webkit.org/changeset/87992> 95766 2011-06-02 08:51:42 -0700 2011-06-02 15:28:40 -0700 Patch bug-61930-20110602195140.patch text/plain 23039 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogODc4MDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyMjE3MDQzYWZjNGVlOWM0 ODdlZTAwZDdmOWI2NDI5YzBmNmM4ZGYxLi4wYTllZGY3YmYxYmI3M2Y0NDZiNzc5NjdlZGE0YjUz YTZmMmYwNjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEgQEAKKzIwMTEtMDYtMDIgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIGFuIG9wdGlvbiBm b3IgYXV0b21hdGljYWxseSBhdHRhY2hpbmcgdG8gbmV3IHdvcmtlcnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxOTMwCisKKyAgICAgICAgV29ya2Vy IGxpc3QgaXMgZXh0ZW5kZWQgd2l0aCBhIGNoZWNrYm94IHRoYXQgbWFrZXMgaW5zcGVjdG9yIGF0 dGFjaCB0byBlYWNoCisgICAgICAgIG5ldyB3b3JrZXIuIFdoZW5ldmVyIGEgbmV3IHdvcmtlciBj b250ZXh0IHN0YXJ0cyBhIG5ldyBpbnNwZWN0b3Igd2luZG93IHdpbGwKKyAgICAgICAgYmUgb3Bl bmVkIGZvciBpdC4KKworICAgICAgICBBbHNvIHdvcmtlciBhZ2VudCBhbmQgd29ya2VyIGxpc3Qg d2lsbCBiZSB1cGRhdGVkIHdoZW4gd29ya2VyIGNvbnRleHQgaXMgdGVybWluYXRlZC4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWRJbXBsKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OndvcmtlckNvbnRleHRUZXJtaW5hdGVkKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yV29ya2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yV29ya2VyQWdlbnQ6OldvcmtlckZyb250ZW5kQ2hhbm5lbDo6fldvcmtlckZyb250ZW5k Q2hhbm5lbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JXb3JrZXJBZ2VudDo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvcldvcmtlckFnZW50OjpJbnNwZWN0b3JXb3Jr ZXJBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JXb3JrZXJBZ2VudDo6Y2xlYXJG cm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JXb3JrZXJBZ2VudDo6c2V0QXV0 b2Nvbm5lY3RUb1dvcmtlcnMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yV29ya2VyQWdl bnQ6OmRpZFN0YXJ0V29ya2VyQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JX b3JrZXJBZ2VudDo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWQpOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv V29ya2VyTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnBy b3RvdHlwZS5fd29ya2VyQ3JlYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTWFu YWdlci5wcm90b3R5cGUuX3dvcmtlclRlcm1pbmF0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lldvcmtlck1hbmFnZXIucHJvdG90eXBlLm9wZW5Xb3JrZXJJbnNwZWN0b3IpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIucHJvdG90eXBlLl9vcGVuSW5zcGVjdG9yV2luZG93 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnByb3RvdHlwZS5yZXNldCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTWVzc2FnZUZvcndhcmRlci5wcm90b3R5cGUu d29ya2VyQ3JlYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTWVzc2FnZUZvcndh cmRlci5wcm90b3R5cGUud29ya2VyVGVybWluYXRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Xb3JrZXJzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29y a2VyTGlzdFNpZGViYXJQYW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3JrZXJMaXN0U2lk ZWJhclBhbmUucHJvdG90eXBlLl93b3JrZXJBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu V29ya2VyTGlzdFNpZGViYXJQYW5lLnByb3RvdHlwZS5fd29ya2VyUmVtb3ZlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuV29ya2VyTGlzdFNpZGViYXJQYW5lLnByb3RvdHlwZS5fd29ya2Vyc0Ns ZWFyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLldvcmtlckxpc3RTaWRlYmFyUGFuZS5wcm90 b3R5cGUuX2FkZFdvcmtlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuV29ya2VyTGlzdFNpZGVi YXJQYW5lLnByb3RvdHlwZS5fd29ya2VySXRlbUNsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLldvcmtlckxpc3RTaWRlYmFyUGFuZS5wcm90b3R5cGUuX2F1dG9hdHRhY2hUb1dvcmtlcnND bGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5yZXNldCk6CisKIDIwMTEtMDYtMDEgIFl1cnkgU2VtaWtoYXRz a3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVs ZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNv biBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRleCA4MGQ2YzI3 YzA3NzJhNDM0MGExNTRmOWY4MDVmOTEzMGZmMmU0ZDE0Li4yZDM3ZWY4ZDZiMzdhZjhkNzFkZTMz NjQyM2I3Yjg1MzEzZjRhMjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uCkBAIC0xNzM4LDE0ICsxNzM4LDI4IEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMi OiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAid29ya2VySWQiLCAidHlwZSI6ICJp bnRlZ2VyIiB9CiAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRBdXRvY29ubmVjdFRvV29ya2VycyIsCisg ICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAidmFsdWUiLCAidHlwZSI6ICJib29sZWFuIiB9CisgICAgICAgICAgICAgICAgXQogICAg ICAgICAgICAgfQorCiAgICAgICAgIF0sCiAgICAgICAgICJldmVudHMiOiBbCiAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAid29ya2VyQ3JlYXRlZCIsCiAgICAgICAgICAg ICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAid29y a2VySWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInVybCIsICJ0eXBlIjogInN0cmluZyIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInVybCIsICJ0eXBlIjogInN0cmluZyIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJpbnNwZWN0b3JDb25uZWN0ZWQiLCAidHlwZSI6ICJib29sZWFuIiB9CisgICAgICAgICAg ICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAi bmFtZSI6ICJ3b3JrZXJUZXJtaW5hdGVkIiwKKyAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ3b3JrZXJJZCIsICJ0eXBlIjogImlu dGVnZXIiIH0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw CmluZGV4IGIwN2JhOThhNGZiNWQ1YzUzNWEyMWFjYjQ5YmI3YjIxODUwMzk4ODIuLjNhMzhiY2Vl ZGM1NDQ4ZjIxYjQ0NTAzOWY1Y2JhMzVhNDI3Y2UwNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTExMCw3ICsxMTAsNyBAQCBJ bnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UqIHBhZ2UsIEluc3Bl Y3RvckNsaWVudCogaW5zcGVjdG9yQwogICAgICwgbV9wcm9maWxlckFnZW50KEluc3BlY3RvclBy b2ZpbGVyQWdlbnQ6OmNyZWF0ZShtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCksIG1fY29uc29s ZUFnZW50LmdldCgpLCBwYWdlLCBtX3N0YXRlLmdldCgpKSkKICNlbmRpZgogI2lmIEVOQUJMRShX T1JLRVJTKQotICAgICwgbV93b3JrZXJBZ2VudChJbnNwZWN0b3JXb3JrZXJBZ2VudDo6Y3JlYXRl KG1faW5zdHJ1bWVudGluZ0FnZW50cy5nZXQoKSkpCisgICAgLCBtX3dvcmtlckFnZW50KEluc3Bl Y3RvcldvcmtlckFnZW50OjpjcmVhdGUobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpLCBtX3N0 YXRlLmdldCgpKSkKICNlbmRpZgogICAgICwgbV9wYWdlKHBhZ2UpCiAgICAgLCBtX2luc3BlY3Rv ckNsaWVudChpbnNwZWN0b3JDbGllbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDEzODljNmU1YjRjZTk1Mzgy N2JjMDk0YmRlMTU1ZmU5Zjk3YjI4OGUuLmQwODBhMzQ0NTYwYWMyODBjMjZlMTcxMjQyYWJkYzRi MzhiZjk2YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJ bnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC03MzMsNiArNzMzLDEyIEBAIHZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpkaWREZXN0cm95V29ya2VySW1wbChJbnN0cnVtZW50aW5nQWdlbnRz KiBpbnN0cnVtCiAgICAgaWYgKEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCA9IGluc3Ry dW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckFnZW50KCkpCiAgICAgICAgIGluc3BlY3RvckFnZW50 LT5kaWREZXN0cm95V29ya2VyKGlkKTsKIH0KKwordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OndvcmtlckNvbnRleHRUZXJtaW5hdGVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0 cnVtZW50aW5nQWdlbnRzLCBXb3JrZXJDb250ZXh0UHJveHkqIHByb3h5KQoreworICAgIGlmIChJ bnNwZWN0b3JXb3JrZXJBZ2VudCogd29ya2VyQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRzLT5p bnNwZWN0b3JXb3JrZXJBZ2VudCgpKQorICAgICAgICB3b3JrZXJBZ2VudC0+d29ya2VyQ29udGV4 dFRlcm1pbmF0ZWQocHJveHkpOworfQogI2VuZGlmCiAKICNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmgKaW5kZXggN2Y4NjA4ODY0ODdjYjQ5MjI2MzdhMzZjNjk2ZjkzZWVkMGJjMWMwMC4uNjUw YTAwODdmMTU2MDQzM2M0NzZiMWQxNDNhNzFkYjhhNzE4ZWYyMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaApAQCAtMTY0LDYg KzE2NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBkaWRTdGFydFdvcmtlckNvbnRleHQo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdvcmtlckNvbnRleHRQcm94eSosIGJvb2wgcGF1c2Vk LCBjb25zdCBLVVJMJik7CiAgICAgc3RhdGljIHZvaWQgZGlkQ3JlYXRlV29ya2VyKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqLCBpbnRwdHJfdCBpZCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNT aGFyZWRXb3JrZXIpOwogICAgIHN0YXRpYyB2b2lkIGRpZERlc3Ryb3lXb3JrZXIoU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCosIGludHB0cl90IGlkKTsKKyAgICBzdGF0aWMgdm9pZCB3b3JrZXJDb250 ZXh0VGVybWluYXRlZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgV29ya2VyQ29udGV4dFByb3h5 Kik7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShXRUJfU09DS0VUUykKQEAgLTI4Niw2ICsyODcsNyBA QCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZFN0YXJ0V29ya2VyQ29udGV4dEltcGwoSW5z dHJ1bWVudGluZ0FnZW50cyosIFdvcmtlckNvbnRleHRQcm94eSosIGNvbnN0IEtVUkwmKTsKICAg ICBzdGF0aWMgdm9pZCBkaWRDcmVhdGVXb3JrZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBp bnRwdHJfdCBpZCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNTaGFyZWRXb3JrZXIpOwogICAg IHN0YXRpYyB2b2lkIGRpZERlc3Ryb3lXb3JrZXJJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBp bnRwdHJfdCBpZCk7CisgICAgc3RhdGljIHZvaWQgd29ya2VyQ29udGV4dFRlcm1pbmF0ZWRJbXBs KEluc3RydW1lbnRpbmdBZ2VudHMqLCBXb3JrZXJDb250ZXh0UHJveHkqKTsKICNlbmRpZgogCiAj aWYgRU5BQkxFKFdFQl9TT0NLRVRTKQpAQCAtODg0LDYgKzg4NiwxNSBAQCBpbmxpbmUgdm9pZCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZERlc3Ryb3lXb3JrZXIoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogYwogICAgICAgICBkaWREZXN0cm95V29ya2VySW1wbChpbnN0cnVtZW50aW5nQWdl bnRzLCBpZCk7CiAjZW5kaWYKIH0KKworaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp3b3JrZXJDb250ZXh0VGVybWluYXRlZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250 ZXh0LCBXb3JrZXJDb250ZXh0UHJveHkqIHByb3h5KQoreworI2lmIEVOQUJMRShJTlNQRUNUT1Ip CisgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0 cnVtZW50aW5nQWdlbnRzRm9yQ29udGV4dChjb250ZXh0KSkKKyAgICAgICAgd29ya2VyQ29udGV4 dFRlcm1pbmF0ZWRJbXBsKGluc3RydW1lbnRpbmdBZ2VudHMsIHByb3h5KTsKKyNlbmRpZgorfQor CiAjZW5kaWYKIAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yV29ya2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcldv cmtlckFnZW50LmNwcAppbmRleCA4OWViNjMwYTg5NTAxNTI0Y2U0NWJkNzA5NjA2MDQ2YTU0ZDBk ZDFjLi5iMjQ3ZjYxMmEyZjgwOTJkZDA1OWI2NTdhMjRlZmMzZTM2ZjdkYzQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yV29ya2VyQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5jcHAKQEAgLTM2 LDYgKzM2LDcgQEAKIAogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVkZSAi SW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsLmgiCisjaW5jbHVkZSAiSW5zcGVjdG9yU3RhdGUuaCIK ICNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdl bnRzLmgiCiAjaW5jbHVkZSAiS1VSTC5oIgpAQCAtNDUsNiArNDYsMTAgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCituYW1lc3BhY2UgV29ya2VyQWdlbnRTdGF0ZSB7CitzdGF0aWMgY29uc3Qg Y2hhciBhdXRvY29ubmVjdFRvV29ya2Vyc1tdID0gImF1dG9jb25uZWN0VG9Xb3JrZXJzIjsKK307 CisKIGNsYXNzIEluc3BlY3RvcldvcmtlckFnZW50OjpXb3JrZXJGcm9udGVuZENoYW5uZWwgOiBw dWJsaWMgV29ya2VyQ29udGV4dFByb3h5OjpQYWdlSW5zcGVjdG9yIHsKIHB1YmxpYzoKICAgICBl eHBsaWNpdCBXb3JrZXJGcm9udGVuZENoYW5uZWwoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5k LCBXb3JrZXJDb250ZXh0UHJveHkqIHByb3h5KQpAQCAtNTYsNyArNjEsNiBAQCBwdWJsaWM6CiAg ICAgfQogICAgIHZpcnR1YWwgfldvcmtlckZyb250ZW5kQ2hhbm5lbCgpCiAgICAgewotICAgICAg ICBkaXNjb25uZWN0RnJvbVdvcmtlckNvbnRleHQoKTsKICAgICB9CiAKICAgICBpbnQgaWQoKSBj b25zdCB7IHJldHVybiBtX2lkOyB9CkBAIC0xMDAsMTQgKzEwNCwxNSBAQCBwcml2YXRlOgogCiBp bnQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6OldvcmtlckZyb250ZW5kQ2hhbm5lbDo6c19uZXh0SWQg PSAxOwogCi1QYXNzT3duUHRyPEluc3BlY3RvcldvcmtlckFnZW50PiBJbnNwZWN0b3JXb3JrZXJB Z2VudDo6Y3JlYXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMpCitQ YXNzT3duUHRyPEluc3BlY3RvcldvcmtlckFnZW50PiBJbnNwZWN0b3JXb3JrZXJBZ2VudDo6Y3Jl YXRlKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3RvclN0 YXRlKiBpbnNwZWN0b3JTdGF0ZSkKIHsKLSAgICByZXR1cm4gYWRvcHRQdHIobmV3IEluc3BlY3Rv cldvcmtlckFnZW50KGluc3RydW1lbnRpbmdBZ2VudHMpKTsKKyAgICByZXR1cm4gYWRvcHRQdHIo bmV3IEluc3BlY3RvcldvcmtlckFnZW50KGluc3RydW1lbnRpbmdBZ2VudHMsIGluc3BlY3RvclN0 YXRlKSk7CiB9CiAKLUluc3BlY3RvcldvcmtlckFnZW50OjpJbnNwZWN0b3JXb3JrZXJBZ2VudChJ bnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzKQorSW5zcGVjdG9yV29ya2Vy QWdlbnQ6Okluc3BlY3RvcldvcmtlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1l bnRpbmdBZ2VudHMsIEluc3BlY3RvclN0YXRlKiBpbnNwZWN0b3JTdGF0ZSkKICAgICA6IG1faW5z dHJ1bWVudGluZ0FnZW50cyhpbnN0cnVtZW50aW5nQWdlbnRzKQogICAgICwgbV9pbnNwZWN0b3JG cm9udGVuZCgwKQorICAgICwgbV9pbnNwZWN0b3JTdGF0ZShpbnNwZWN0b3JTdGF0ZSkKIHsKIH0K IApAQCAtMTI2LDcgKzEzMSwxMSBAQCB2b2lkIEluc3BlY3RvcldvcmtlckFnZW50OjpjbGVhckZy b250ZW5kKCkKIHsKICAgICBtX2luc3BlY3RvckZyb250ZW5kID0gMDsKICAgICBtX2luc3RydW1l bnRpbmdBZ2VudHMtPnNldEluc3BlY3RvcldvcmtlckFnZW50KDApOwotICAgIGRlbGV0ZUFsbFZh bHVlcyhtX2lkVG9DaGFubmVsKTsKKyAgICBtX2luc3BlY3RvclN0YXRlLT5zZXRCb29sZWFuKFdv cmtlckFnZW50U3RhdGU6OmF1dG9jb25uZWN0VG9Xb3JrZXJzLCBmYWxzZSk7CisgICAgZm9yIChX b3JrZXJDaGFubmVsczo6aXRlcmF0b3IgaXQgPSBtX2lkVG9DaGFubmVsLmJlZ2luKCk7IGl0ICE9 IG1faWRUb0NoYW5uZWwuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgaXQtPnNlY29uZC0+ZGlzY29u bmVjdEZyb21Xb3JrZXJDb250ZXh0KCk7CisgICAgICAgIGRlbGV0ZSBpdC0+c2Vjb25kOworICAg IH0KICAgICBtX2lkVG9DaGFubmVsLmNsZWFyKCk7CiB9CiAKQEAgLTE1NywxMyArMTY2LDMzIEBA IHZvaWQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6OnNlbmRNZXNzYWdlVG9Xb3JrZXIoRXJyb3JTdHJp bmcqIGVycm9yLCBpbnQgd29ya2VySWQsCiAgICAgICAgICplcnJvciA9ICJXb3JrZXIgaXMgZ29u ZSI7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6OnNldEF1dG9jb25uZWN0VG9Xb3Jr ZXJzKEVycm9yU3RyaW5nKiwgYm9vbCB2YWx1ZSkKK3sKKyAgICBtX2luc3BlY3RvclN0YXRlLT5z ZXRCb29sZWFuKFdvcmtlckFnZW50U3RhdGU6OmF1dG9jb25uZWN0VG9Xb3JrZXJzLCB2YWx1ZSk7 Cit9CisKIHZvaWQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6OmRpZFN0YXJ0V29ya2VyQ29udGV4dChX b3JrZXJDb250ZXh0UHJveHkqIHdvcmtlckNvbnRleHRQcm94eSwgY29uc3QgS1VSTCYgdXJsKQog ewogICAgIFdvcmtlckZyb250ZW5kQ2hhbm5lbCogY2hhbm5lbCA9IG5ldyBXb3JrZXJGcm9udGVu ZENoYW5uZWwobV9pbnNwZWN0b3JGcm9udGVuZCwgd29ya2VyQ29udGV4dFByb3h5KTsKICAgICBt X2lkVG9DaGFubmVsLnNldChjaGFubmVsLT5pZCgpLCBjaGFubmVsKTsKIAogICAgIEFTU0VSVCht X2luc3BlY3RvckZyb250ZW5kKTsKLSAgICBtX2luc3BlY3RvckZyb250ZW5kLT53b3JrZXIoKS0+ d29ya2VyQ3JlYXRlZChjaGFubmVsLT5pZCgpLCB1cmwuc3RyaW5nKCkpOworICAgIGJvb2wgYXV0 b2Nvbm5lY3RUb1dvcmtlcnMgPSBtX2luc3BlY3RvclN0YXRlLT5nZXRCb29sZWFuKFdvcmtlckFn ZW50U3RhdGU6OmF1dG9jb25uZWN0VG9Xb3JrZXJzKTsKKyAgICBpZiAoYXV0b2Nvbm5lY3RUb1dv cmtlcnMpCisgICAgICAgIGNoYW5uZWwtPmNvbm5lY3RUb1dvcmtlckNvbnRleHQoKTsKKyAgICBt X2luc3BlY3RvckZyb250ZW5kLT53b3JrZXIoKS0+d29ya2VyQ3JlYXRlZChjaGFubmVsLT5pZCgp LCB1cmwuc3RyaW5nKCksIGF1dG9jb25uZWN0VG9Xb3JrZXJzKTsKK30KKwordm9pZCBJbnNwZWN0 b3JXb3JrZXJBZ2VudDo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWQoV29ya2VyQ29udGV4dFByb3h5 KiBwcm94eSkKK3sKKyAgICBmb3IgKFdvcmtlckNoYW5uZWxzOjppdGVyYXRvciBpdCA9IG1faWRU b0NoYW5uZWwuYmVnaW4oKTsgaXQgIT0gbV9pZFRvQ2hhbm5lbC5lbmQoKTsgKytpdCkgeworICAg ICAgICBpZiAocHJveHkgPT0gaXQtPnNlY29uZC0+cHJveHkoKSkgeworICAgICAgICAgICAgbV9p bnNwZWN0b3JGcm9udGVuZC0+d29ya2VyKCktPndvcmtlclRlcm1pbmF0ZWQoaXQtPmZpcnN0KTsK KyAgICAgICAgICAgIGRlbGV0ZSBpdC0+c2Vjb25kOworICAgICAgICAgICAgbV9pZFRvQ2hhbm5l bC5yZW1vdmUoaXQpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yV29ya2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JXb3JrZXJBZ2VudC5oCmluZGV4IDc4NzFhZmY1MTIzYjFjMjE2MjdiODJkNTNjMjQz OTJhNjcxZWZmYjkuLjBjYWI0M2YxYWQ4MDQ3YWYwNDRkNmQ5YWUyMDk5NDdkOTVkYjFlODMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JXb3JrZXJBZ2VudC5oCkBA IC0zOSw2ICszOSw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBJbnNwZWN0b3JGcm9u dGVuZDsKIGNsYXNzIEluc3BlY3Rvck9iamVjdDsKK2NsYXNzIEluc3BlY3RvclN0YXRlOwogY2xh c3MgSW5zdHJ1bWVudGluZ0FnZW50czsKIGNsYXNzIEtVUkw7CiBjbGFzcyBXb3JrZXJDb250ZXh0 UHJveHk7CkBAIC00Nyw3ICs0OCw3IEBAIHR5cGVkZWYgU3RyaW5nIEVycm9yU3RyaW5nOwogCiBj bGFzcyBJbnNwZWN0b3JXb3JrZXJBZ2VudCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25Q dHI8SW5zcGVjdG9yV29ya2VyQWdlbnQ+IGNyZWF0ZShJbnN0cnVtZW50aW5nQWdlbnRzKik7Cisg ICAgc3RhdGljIFBhc3NPd25QdHI8SW5zcGVjdG9yV29ya2VyQWdlbnQ+IGNyZWF0ZShJbnN0cnVt ZW50aW5nQWdlbnRzKiwgSW5zcGVjdG9yU3RhdGUqKTsKICAgICB+SW5zcGVjdG9yV29ya2VyQWdl bnQoKTsKIAogICAgIHZvaWQgc2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqKTsKQEAgLTU1 LDIwICs1NiwyNCBAQCBwdWJsaWM6CiAKICAgICAvLyBDYWxsZWQgZnJvbSBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb24KICAgICB2b2lkIGRpZFN0YXJ0V29ya2VyQ29udGV4dChXb3JrZXJDb250ZXh0 UHJveHkqLCBjb25zdCBLVVJMJik7CisgICAgdm9pZCB3b3JrZXJDb250ZXh0VGVybWluYXRlZChX b3JrZXJDb250ZXh0UHJveHkqKTsKIAogICAgIC8vIENhbGxlZCBmcm9tIEluc3BlY3RvckJhY2tl bmREaXNwYXRjaGVyCiAgICAgdm9pZCBjb25uZWN0VG9Xb3JrZXIoRXJyb3JTdHJpbmcqLCBpbnQg d29ya2VySWQpOwogICAgIHZvaWQgZGlzY29ubmVjdEZyb21Xb3JrZXIoRXJyb3JTdHJpbmcqLCBp bnQgd29ya2VySWQpOwogICAgIHZvaWQgc2VuZE1lc3NhZ2VUb1dvcmtlcihFcnJvclN0cmluZyos IGludCB3b3JrZXJJZCwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG1lc3NhZ2UpOworICAg IHZvaWQgc2V0QXV0b2Nvbm5lY3RUb1dvcmtlcnMoRXJyb3JTdHJpbmcqLCBib29sIHZhbHVlKTsK IAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBJbnNwZWN0b3JXb3JrZXJBZ2VudChJbnN0cnVtZW50 aW5nQWdlbnRzKik7CisgICAgSW5zcGVjdG9yV29ya2VyQWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50 cyosIEluc3BlY3RvclN0YXRlKik7CiAKICAgICBJbnN0cnVtZW50aW5nQWdlbnRzKiBtX2luc3Ry dW1lbnRpbmdBZ2VudHM7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQqIG1faW5zcGVjdG9yRnJvbnRl bmQ7CisgICAgSW5zcGVjdG9yU3RhdGUqIG1faW5zcGVjdG9yU3RhdGU7CiAKICAgICBjbGFzcyBX b3JrZXJGcm9udGVuZENoYW5uZWw7Ci0gICAgSGFzaE1hcDxpbnQsIFdvcmtlckZyb250ZW5kQ2hh bm5lbCo+IG1faWRUb0NoYW5uZWw7CisgICAgdHlwZWRlZiBIYXNoTWFwPGludCwgV29ya2VyRnJv bnRlbmRDaGFubmVsKj4gV29ya2VyQ2hhbm5lbHM7CisgICAgV29ya2VyQ2hhbm5lbHMgbV9pZFRv Q2hhbm5lbDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya2VyTWFuYWdlci5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya2VyTWFuYWdlci5qcwppbmRleCA0NDU0OGQ3 YWY4ZTQ5Njc5NjQwMWE2NDc1NmZjOGQwNmFlNTg0OTA1Li5lYTczMTZhMmVlZmViOTE0MGM5MTcw NjRmNGQ4MTAyM2E3NWQ4NTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1dvcmtlck1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Xb3JrZXJNYW5hZ2VyLmpzCkBAIC02OSwxNCArNjksMjMgQEAgV2ViSW5zcGVj dG9yLldvcmtlck1hbmFnZXIubG9hZGVkID0gZnVuY3Rpb24oKQogV2ViSW5zcGVjdG9yLldvcmtl ck1hbmFnZXIuRXZlbnRzID0gewogICAgIFdvcmtlckFkZGVkOiAid29ya2VyLWFkZGVkIiwKICAg ICBXb3JrZXJSZW1vdmVkOiAid29ya2VyLXJlbW92ZWQiLAorICAgIFdvcmtlcnNDbGVhcmVkOiAi d29ya2Vycy1jbGVhcmVkIiwKICAgICBXb3JrZXJJbnNwZWN0b3JDbG9zZWQ6ICJ3b3JrZXItaW5z cGVjdG9yLWNsb3NlZCIKIH0KIAogV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIucHJvdG90eXBl ID0gewotICAgIF93b3JrZXJDcmVhdGVkOiBmdW5jdGlvbih3b3JrZXJJZCwgdXJsKQotICAgIHsK LSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLldvcmtl ck1hbmFnZXIuRXZlbnRzLldvcmtlckFkZGVkLCB7d29ya2VySWQ6IHdvcmtlcklkLCB1cmw6IHVy bH0pOwotICAgIH0sCisgICAgX3dvcmtlckNyZWF0ZWQ6IGZ1bmN0aW9uKHdvcmtlcklkLCB1cmws IGluc3BlY3RvckNvbm5lY3RlZCkKKyAgICAgeworICAgICAgICBpZiAoaW5zcGVjdG9yQ29ubmVj dGVkKQorICAgICAgICAgICAgdGhpcy5fb3Blbkluc3BlY3RvcldpbmRvdyh3b3JrZXJJZCk7Cisg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Xb3JrZXJN YW5hZ2VyLkV2ZW50cy5Xb3JrZXJBZGRlZCwge3dvcmtlcklkOiB3b3JrZXJJZCwgdXJsOiB1cmws IGluc3BlY3RvckNvbm5lY3RlZDogaW5zcGVjdG9yQ29ubmVjdGVkfSk7CisgICAgIH0sCisKKyAg ICBfd29ya2VyVGVybWluYXRlZDogZnVuY3Rpb24od29ya2VySWQpCisgICAgIHsKKyAgICAgICAg dGhpcy5jbG9zZVdvcmtlckluc3BlY3Rvcih3b3JrZXJJZCk7CisgICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLkV2ZW50cy5Xb3Jr ZXJSZW1vdmVkLCB3b3JrZXJJZCk7CisgICAgIH0sCiAKICAgICBfc2VuZE1lc3NhZ2VUb1dvcmtl ckluc3BlY3RvcjogZnVuY3Rpb24od29ya2VySWQsIG1lc3NhZ2UpCiAgICAgewpAQCAtODcsMTIg Kzk2LDE3IEBAIFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogICAg IG9wZW5Xb3JrZXJJbnNwZWN0b3I6IGZ1bmN0aW9uKHdvcmtlcklkKQogICAgIHsKKyAgICAgICAg dGhpcy5fb3Blbkluc3BlY3RvcldpbmRvdyh3b3JrZXJJZCk7CisgICAgICAgIFdvcmtlckFnZW50 LmNvbm5lY3RUb1dvcmtlcih3b3JrZXJJZCk7CisgICAgfSwKKworICAgIF9vcGVuSW5zcGVjdG9y V2luZG93OiBmdW5jdGlvbih3b3JrZXJJZCkKKyAgICB7CiAgICAgICAgIHZhciB1cmwgPSBsb2Nh dGlvbi5ocmVmICsgIiZ3b3JrZXJJZD0iICsgd29ya2VySWQ7CiAgICAgICAgIHVybCA9IHVybC5y ZXBsYWNlKCJkb2NrZWQ9dHJ1ZSYiLCAiIik7CiAgICAgICAgIHZhciB3b3JrZXJJbnNwZWN0b3JX aW5kb3cgPSB3aW5kb3cub3Blbih1cmwpOwogICAgICAgICB0aGlzLl93b3JrZXJJZFRvV2luZG93 W3dvcmtlcklkXSA9IHdvcmtlckluc3BlY3RvcldpbmRvdzsKICAgICAgICAgd29ya2VySW5zcGVj dG9yV2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImJlZm9yZXVubG9hZCIsIHRoaXMuX3dvcmtlcklu c3BlY3RvckNsb3NpbmcuYmluZCh0aGlzLCB3b3JrZXJJZCksIHRydWUpOwotICAgICAgICBXb3Jr ZXJBZ2VudC5jb25uZWN0VG9Xb3JrZXIod29ya2VySWQpOwogICAgIH0sCiAKICAgICBjbG9zZVdv cmtlckluc3BlY3RvcjogZnVuY3Rpb24od29ya2VySWQpCkBAIC0xMDIsNiArMTE2LDEzIEBAIFdl Ykluc3BlY3Rvci5Xb3JrZXJNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHdvcmtl ckluc3BlY3RvcldpbmRvdy5jbG9zZSgpOwogICAgIH0sCiAKKyAgICByZXNldDogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgZm9yICh2YXIgd29ya2VySWQgaW4gdGhpcy5fd29ya2VySWRUb1dp bmRvdykKKyAgICAgICAgICAgIHRoaXMuY2xvc2VXb3JrZXJJbnNwZWN0b3Iod29ya2VySWQpOwor ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuV29ya2Vy TWFuYWdlci5FdmVudHMuV29ya2Vyc0NsZWFyZWQpOworICAgIH0sCisKICAgICBfd29ya2VySW5z cGVjdG9yQ2xvc2luZzogZnVuY3Rpb24od29ya2VySWQsIGV2ZW50KQogICAgIHsKICAgICAgICAg ZGVsZXRlIHRoaXMuX3dvcmtlcklkVG9XaW5kb3dbd29ya2VySWRdOwpAQCAtMTMwLDkgKzE1MSwx NCBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTWVzc2FnZUZvcndhcmRlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBXb3JrZXJBZ2VudC5zZW5kTWVzc2FnZVRvV29ya2VyKHdvcmtlcklkLCBtZXNz YWdlKTsKICAgICB9LAogCi0gICAgd29ya2VyQ3JlYXRlZDogZnVuY3Rpb24od29ya2VySWQsIHVy bCkKKyAgICB3b3JrZXJDcmVhdGVkOiBmdW5jdGlvbih3b3JrZXJJZCwgdXJsLCBpbnNwZWN0b3JD b25uZWN0ZWQpCisgICAgeworICAgICAgICB0aGlzLl93b3JrZXJNYW5hZ2VyLl93b3JrZXJDcmVh dGVkKHdvcmtlcklkLCB1cmwsIGluc3BlY3RvckNvbm5lY3RlZCk7CisgICAgfSwKKworICAgIHdv cmtlclRlcm1pbmF0ZWQ6IGZ1bmN0aW9uKHdvcmtlcklkKQogICAgIHsKLSAgICAgICAgdGhpcy5f d29ya2VyTWFuYWdlci5fd29ya2VyQ3JlYXRlZCh3b3JrZXJJZCwgdXJsKTsKKyAgICAgICAgdGhp cy5fd29ya2VyTWFuYWdlci5fd29ya2VyVGVybWluYXRlZCh3b3JrZXJJZCk7CiAgICAgfSwKIAog ICAgIGRpc3BhdGNoTWVzc2FnZUZyb21Xb3JrZXI6IGZ1bmN0aW9uKHdvcmtlcklkLCBtZXNzYWdl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJz U2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtl cnNTaWRlYmFyUGFuZS5qcwppbmRleCBkZWU1NmFlNTdmN2M3MWI0MGYxNzAzNmExNTRkZThlMGJh N2E0ZTIxLi43NzE4NTRkYzFjYzEwMTljMDZhYWEyN2JlZDc1ZTA2ZTU2YzU1MWVhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtlcnNTaWRlYmFyUGFu ZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtlcnNTaWRl YmFyUGFuZS5qcwpAQCAtMTA3LDYgKzEwNywxNCBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTGlzdFNp ZGViYXJQYW5lID0gZnVuY3Rpb24od29ya2VyTWFuYWdlcikKIHsKICAgICBXZWJJbnNwZWN0b3Iu U2lkZWJhclBhbmUuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldvcmtlciBpbnNw ZWN0b3JzIikpOwogCisgICAgdGhpcy5fZW5hYmxlV29ya2Vyc0NoZWNrYm94ID0gbmV3IFdlYklu c3BlY3Rvci5DaGVja2JveCgKKyAgICAgICAgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWJ1ZyIp LAorICAgICAgICAic2lkZWJhci1wYW5lLXN1YnRpdGxlIiwKKyAgICAgICAgV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJBdXRvbWF0aWNhbGx5IGF0dGFjaCB0byBuZXcgd29ya2Vycy4gRW5hYmxpbmcg dGhpcyBvcHRpb24gd2lsbCBmb3JjZSBvcGVuaW5nIGluc3BlY3RvciBmb3IgYWxsIG5ldyB3b3Jr ZXJzLiIpKTsKKyAgICB0aGlzLnRpdGxlRWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fZW5hYmxl V29ya2Vyc0NoZWNrYm94LmVsZW1lbnQsIHRoaXMudGl0bGVFbGVtZW50LmZpcnN0Q2hpbGQpOwor ICAgIHRoaXMuX2VuYWJsZVdvcmtlcnNDaGVja2JveC5hZGRFdmVudExpc3RlbmVyKHRoaXMuX2F1 dG9hdHRhY2hUb1dvcmtlcnNDbGlja2VkLmJpbmQodGhpcykpOworICAgIHRoaXMuX2VuYWJsZVdv cmtlcnNDaGVja2JveC5jaGVja2VkID0gZmFsc2U7CisKICAgICB0aGlzLl93b3JrZXJMaXN0RWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgdGhpcy5fd29ya2VyTGlz dEVsZW1lbnQudGFiSW5kZXggPSAwOwogICAgIHRoaXMuX3dvcmtlckxpc3RFbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInByb3BlcnRpZXMtdHJlZSIpOwpAQCAtMTE4LDE5ICsxMjYsMjEgQEAgV2ViSW5z cGVjdG9yLldvcmtlckxpc3RTaWRlYmFyUGFuZSA9IGZ1bmN0aW9uKHdvcmtlck1hbmFnZXIpCiAK ICAgICB3b3JrZXJNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLldvcmtlck1h bmFnZXIuRXZlbnRzLldvcmtlckFkZGVkLCB0aGlzLl93b3JrZXJBZGRlZCwgdGhpcyk7CiAgICAg d29ya2VyTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2Vy LkV2ZW50cy5Xb3JrZXJSZW1vdmVkLCB0aGlzLl93b3JrZXJSZW1vdmVkLCB0aGlzKTsKKyAgICB3 b3JrZXJNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLldvcmtlck1hbmFnZXIu RXZlbnRzLldvcmtlcnNDbGVhcmVkLCB0aGlzLl93b3JrZXJzQ2xlYXJlZCwgdGhpcyk7CiAgICAg d29ya2VyTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Xb3JrZXJNYW5hZ2Vy LkV2ZW50cy5Xb3JrZXJJbnNwZWN0b3JDbG9zZWQsIHRoaXMuX3dvcmtlckluc3BlY3RvckNsb3Nl ZCwgdGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rvci5Xb3JrZXJMaXN0U2lkZWJhclBhbmUucHJvdG90 eXBlID0gewogICAgIF93b3JrZXJBZGRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAg ICB0aGlzLl9hZGRXb3JrZXIoZXZlbnQuZGF0YS53b3JrZXJJZCwgZXZlbnQuZGF0YS51cmwpOwor ICAgICAgICB0aGlzLl9hZGRXb3JrZXIoZXZlbnQuZGF0YS53b3JrZXJJZCwgZXZlbnQuZGF0YS51 cmwsIGV2ZW50LmRhdGEuaW5zcGVjdG9yQ29ubmVjdGVkKTsKICAgICB9LAogCiAgICAgX3dvcmtl clJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHdvcmtlckl0ZW0g PSB0aGlzLl9pZFRvV29ya2VySXRlbVtldmVudC5kYXRhXTsKLSAgICAgICAgd29ya2VySXRlbS5l bGVtZW50LnBhcmVudEVsZW1lbnQucmVtb3ZlQ2hpbGQod29ya2VySXRlbS5lbGVtZW50KTsKKyAg ICAgICAgZGVsZXRlIHRoaXMuX2lkVG9Xb3JrZXJJdGVtW2V2ZW50LmRhdGFdOworICAgICAgICB3 b3JrZXJJdGVtLmVsZW1lbnQucGFyZW50LnJlbW92ZUNoaWxkKHdvcmtlckl0ZW0uZWxlbWVudCk7 CiAgICAgfSwKIAogICAgIF93b3JrZXJJbnNwZWN0b3JDbG9zZWQ6IGZ1bmN0aW9uKGV2ZW50KQpA QCAtMTM5LDcgKzE0OSwxMyBAQCBXZWJJbnNwZWN0b3IuV29ya2VyTGlzdFNpZGViYXJQYW5lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgd29ya2VySXRlbS5jaGVja2JveC5jaGVja2VkID0gZmFsc2U7 CiAgICAgfSwKIAotICAgIF9hZGRXb3JrZXI6IGZ1bmN0aW9uKHdvcmtlcklkLCB1cmwpCisgICAg X3dvcmtlcnNDbGVhcmVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX2lk VG9Xb3JrZXJJdGVtID0ge307CisgICAgICAgIHRoaXMuX3dvcmtlckxpc3RUcmVlT3V0bGluZS5y ZW1vdmVDaGlsZHJlbigpOworICAgIH0sCisKKyAgICBfYWRkV29ya2VyOiBmdW5jdGlvbih3b3Jr ZXJJZCwgdXJsLCBpbnNwZWN0b3JDb25uZWN0ZWQpCiAgICAgewogICAgICAgICB2YXIgd29ya2Vy SXRlbSA9IHt9OwogICAgICAgICB3b3JrZXJJdGVtLndvcmtlcklkID0gd29ya2VySWQ7CkBAIC0x NDgsNiArMTY0LDcgQEAgV2ViSW5zcGVjdG9yLldvcmtlckxpc3RTaWRlYmFyUGFuZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHdvcmtlckl0ZW0uZWxlbWVudC5zZWxlY3RhYmxlID0gdHJ1ZTsKIAog ICAgICAgICB3b3JrZXJJdGVtLmNoZWNrYm94ID0gdGhpcy5fY3JlYXRlQ2hlY2tib3god29ya2Vy SXRlbS5lbGVtZW50KTsKKyAgICAgICAgd29ya2VySXRlbS5jaGVja2JveC5jaGVja2VkID0gaW5z cGVjdG9yQ29ubmVjdGVkOwogICAgICAgICB3b3JrZXJJdGVtLmNoZWNrYm94LmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgdGhpcy5fd29ya2VySXRlbUNsaWNrZWQuYmluZCh0aGlzLCB3b3JrZXJJ dGVtKSwgdHJ1ZSk7CiAKICAgICAgICAgdGhpcy5faWRUb1dvcmtlckl0ZW1bd29ya2VySWRdID0g d29ya2VySXRlbTsKQEAgLTE2OCw2ICsxODUsMTEgQEAgV2ViSW5zcGVjdG9yLldvcmtlckxpc3RT aWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl93b3JrZXJNYW5hZ2Vy Lm9wZW5Xb3JrZXJJbnNwZWN0b3Iod29ya2VySXRlbS53b3JrZXJJZCk7CiAgICAgICAgIGVsc2UK ICAgICAgICAgICAgIHRoaXMuX3dvcmtlck1hbmFnZXIuY2xvc2VXb3JrZXJJbnNwZWN0b3Iod29y a2VySXRlbS53b3JrZXJJZCk7CisgICAgfSwKKworICAgIF9hdXRvYXR0YWNoVG9Xb3JrZXJzQ2xp Y2tlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICBXb3JrZXJBZ2VudC5zZXRBdXRv Y29ubmVjdFRvV29ya2VycyhldmVudC50YXJnZXQuY2hlY2tlZCk7CiAgICAgfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IGM3 N2ZmMjA5M2EwNWZkZGNiMjcxZjIwM2JiZmQzNDMzMGEwOTVhYzAuLmNhMWNjOGI4NmU1ZGZkYTM5 ZDM0ZTgxNGZlYmMwZGZmNjkwZTUzYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC05ODQsNiArOTg0LDggQEAgV2ViSW5zcGVjdG9y LnJlc2V0ID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5jb25zb2xlLmNsZWFyTWVzc2FnZXMoKTsK ICAgICB0aGlzLmV4dGVuc2lvblNlcnZlci5ub3RpZnlJbnNwZWN0b3JSZXNldCgpOworICAgIGlm ICh0aGlzLndvcmtlck1hbmFnZXIpCisgICAgICAgIHRoaXMud29ya2VyTWFuYWdlci5yZXNldCgp OwogfQogCiBXZWJJbnNwZWN0b3IuYnJpbmdUb0Zyb250ID0gZnVuY3Rpb24oKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCAwYTNhMWQ4MGM4MzVlZTNmM2U5ZWQyOGNiY2Q2YmVjNGUzYWUy MzAwLi5mYTllNjc4Nzk3YmU2ZjJkZjQ3OWQ5YzE5NTdhZGQ4NTBlOTQ2N2Q4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA2LTAyICBZdXJ5IFNlbWlr aGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBhbiBvcHRpb24gZm9yIGF1 dG9tYXRpY2FsbHkgYXR0YWNoaW5nIHRvIG5ldyB3b3JrZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTkzMAorCisgICAgICAgIE5vdGlmaWNhdGlv biBhYm91dCB3b3JrZXIgY29udGV4dCB0ZXJtaW5hdGlvbiBhcmUgbm93IHNlbnQgdG8gdGhlIGlu c3BlY3Rvci4KKworICAgICAgICAqIHNyYy9XZWJXb3JrZXJDbGllbnRJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViV29ya2VyQ2xpZW50SW1wbDo6dGVybWluYXRlV29ya2VyQ29udGV4dCk6 CisgICAgICAgIChXZWJLaXQ6OldlYldvcmtlckNsaWVudEltcGw6OmRpc2Nvbm5lY3RGcm9tSW5z cGVjdG9yKToKKyAgICAgICAgKFdlYktpdDo6V2ViV29ya2VyQ2xpZW50SW1wbDo6d29ya2VyQ29u dGV4dERlc3Ryb3llZCk6CisKIDIwMTEtMDYtMDEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmll dy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4Nzc4 OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVu dEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQ2xpZW50SW1w bC5jcHAKaW5kZXggZDI5OGNmNDYyYjY3MGI3ZGM4YjU4NmVhYTdiYWRhNzhkZDJlODMyOS4uMzZi YmYxNDUzNjdjNTlmODJjN2EwZmRiYTBjYTY1NmRlNzhhMWViYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViV29ya2VyQ2xpZW50SW1wbC5jcHAKQEAgLTM5LDYgKzM5 LDcgQEAKICNpbmNsdWRlICJFcnJvckV2ZW50LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNs dWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgorI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRh dGlvbi5oIgogI2luY2x1ZGUgIk1lc3NhZ2VFdmVudC5oIgogI2luY2x1ZGUgIk1lc3NhZ2VQb3J0 LmgiCiAjaW5jbHVkZSAiTWVzc2FnZVBvcnRDaGFubmVsLmgiCkBAIC0xNjMsNiArMTY0LDcgQEAg dm9pZCBXZWJXb3JrZXJDbGllbnRJbXBsOjp0ZXJtaW5hdGVXb3JrZXJDb250ZXh0KCkKICAgICAg ICAgcmV0dXJuOwogICAgIH0KICAgICBtX3dlYldvcmtlci0+dGVybWluYXRlV29ya2VyQ29udGV4 dCgpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyQ29udGV4dFRlcm1pbmF0 ZWQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgpLCB0aGlzKTsKIH0KIAogdm9pZCBXZWJX b3JrZXJDbGllbnRJbXBsOjpwb3N0TWVzc2FnZVRvV29ya2VyQ29udGV4dCgKQEAgLTIxNyw3ICsy MTksOCBAQCB2b2lkIFdlYldvcmtlckNsaWVudEltcGw6OmNvbm5lY3RUb0luc3BlY3RvcihXb3Jr ZXJDb250ZXh0UHJveHk6OlBhZ2VJbnNwZWN0b3IqCiAKIHZvaWQgV2ViV29ya2VyQ2xpZW50SW1w bDo6ZGlzY29ubmVjdEZyb21JbnNwZWN0b3IoKQogewotICAgIG1fd2ViV29ya2VyLT5kZXRhY2hE ZXZUb29scygpOworICAgIGlmICghbV9hc2tlZFRvVGVybWluYXRlKQorICAgICAgICBtX3dlYldv cmtlci0+ZGV0YWNoRGV2VG9vbHMoKTsKICAgICBtX3BhZ2VJbnNwZWN0b3IgPSAwOwogfQogCkBA IC0zMjgsNiArMzMxLDcgQEAgdm9pZCBXZWJXb3JrZXJDbGllbnRJbXBsOjpyZXBvcnRQZW5kaW5n QWN0aXZpdHkoYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkpCiAKIHZvaWQgV2ViV29ya2VyQ2xpZW50 SW1wbDo6d29ya2VyQ29udGV4dERlc3Ryb3llZCgpCiB7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjp3b3JrZXJDb250ZXh0VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQu Z2V0KCksIHRoaXMpOwogfQogCiB2b2lkIFdlYldvcmtlckNsaWVudEltcGw6OndvcmtlckNvbnRl eHRDbG9zZWQoKQo=