142931 2015-03-20 21:08:28 -0700 [Mac] Add an --allowed-host argument to DRT and WKTR to allow tests to connect to non-localhost servers 2015-03-26 11:15:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 142938 1 jer.noble jer.noble oldest_to_newest 1079026 0 jer.noble 2015-03-20 21:08:28 -0700 [Mac] Add an --allowed-host argument to DRT and WKTR to allow tests to connect to non-localhost servers 1079035 1 249162 jer.noble 2015-03-20 22:13:43 -0700 Created attachment 249162 Patch 1080055 2 249162 bfulgham 2015-03-25 15:05:35 -0700 Comment on attachment 249162 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249162&action=review r=me. > Tools/DumpRenderTree/TestRunner.h:56 > + void setAllowedHosts(std::set<std::string> hosts) { m_allowedHosts = hosts; } Should this be passed as a const reference? Or does C++ now know how to magically do a move here? 1080319 3 jer.noble 2015-03-26 10:19:22 -0700 (In reply to comment #2) > Comment on attachment 249162 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=249162&action=review > > r=me. > > > Tools/DumpRenderTree/TestRunner.h:56 > > + void setAllowedHosts(std::set<std::string> hosts) { m_allowedHosts = hosts; } > > Should this be passed as a const reference? Or does C++ now know how to > magically do a move here? I'll sprinkle on a little WTF::move. Thanks! 1080346 4 jer.noble 2015-03-26 11:15:09 -0700 Committed r182017: <http://trac.webkit.org/changeset/182017> 249162 2015-03-20 22:13:43 -0700 2015-03-25 15:05:35 -0700 Patch bug-142931-20150320221308.patch text/plain 16479 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODEwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmFkYWUyZjJkY2E1ZGI1ZWVlZmNjMzY1ZGRmZWY3NzFj YWNkMzcwNS4uNDljYTQxZTM4ZDBmMjlkYjQyZDkxN2Y4MjYzNzU2OTczYTFiZWFlOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5 IEBACisyMDE1LTAzLTIwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAg ICAgIFtNYWNdIEFkZCBhbiAtLWFsbG93ZWQtaG9zdCBhcmd1bWVudCB0byBEUlQgYW5kIFdLVFIg dG8gYWxsb3cgdGVzdHMgdG8gY29ubmVjdCB0byBub24tbG9jYWxob3N0IHNlcnZlcnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjkzMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgYm90 aCBEUlQgYW5kIFdLVFIgd2lsbCByZWZ1c2UgdG8gYWxsb3cgbmV0d29yayBjb25uZWN0aW9ucyB0 byBub24tbG9jYWxob3N0IHNlcnZlcnMKKyAgICAgICAgb3ZlciBIVFRQL0hUVFBTLiBGb3IgY2Vy dGFpbiB0ZXN0aW5nIHNjZW5hcmlvcywgaG93ZXZlciwgaXQgd291bGQgYmUgdXNlZnVsIGlmIGJv dGggRFJUIGFuZAorICAgICAgICBXS1RSIGNvdWxkIGJlIGFsbG93ZWQgdG8gbWFrZSBIVFRQL0hU VFBTIGNvbm5lY3Rpb25zIHRvIGNlcnRhaW4sIHNwZWNpZmljIHNlcnZlcnMgZGVmaW5lZCBhdAor ICAgICAgICBydW50aW1lLgorCisgICAgICAgIFRvIGFsbG93IHRoaXMsIGFkZCBhbiBvcHRpb25h bCBhcmd1bWVudCB0byBEUlQgYW5kIFdLVFIsIC0tYWxsb3dlZC1ob3N0LCB3aGljaCB3aWxsIGFk ZCB0aGUgc3BlY2lmaWVkCisgICAgICAgIGhvc3RuYW1lIHRvIGEgd2hpdGVsaXN0OyByZXF1ZXN0 cyB0byB0aGVzZSBob3N0cyB3aWxsIGFsbG93ZWQgdG8gcHJvY2VlZCBub3JtYWxseS4KKworICAg ICAgICBEcml2ZS1ieSBmaXg6IGluIEluamVjdGVkQnVuZGxlUGFnZTo6d2lsbFNlbmRSZXF1ZXN0 Rm9yRnJhbWUsIHdlIGdldCB0aGUgdG9wIGxvYWRpbmcgZnJhbWUgZnJvbSB0aGUKKyAgICAgICAg aW5qZWN0ZWQgYnVuZGxlLiBCdXQgYWZ0ZXIgdGhlIG1haW4gcmVzb3VyY2UgbG9hZCBjb21wbGV0 ZXMsIHRoZSBidW5kbGUgbnVsbHMgb3V0IGl0J3MgcG9pbnRlciB0byB0aGUKKyAgICAgICAgdG9w IGxvYWRpbmcgZnJhbWUsIHdoaWNoIGNhdXNlcyBhIHN1YnNlcXVlbnQgY3Jhc2ggd2hlbiBmdXJ0 aGVyIHJlc291cmNlcyBhcmUgcmVxdWVzdGVkLiBJbnN0ZWFkLCBnZXQKKyAgICAgICAgdGhlIHRv cCBsb2FkaW5nIGZyYW1lIGZyb20gdGhlIHBhZ2UsIGFzIHdlIGRvIGVsc2V3aGVyZSBpbiB0aGlz IGNsYXNzLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oOgorICAgICAg ICAoVGVzdFJ1bm5lcjo6YWxsb3dlZEhvc3RzKToKKyAgICAgICAgKFRlc3RSdW5uZXI6OnNldEFs bG93ZWRIb3N0cyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVl Lm1tOgorICAgICAgICAoaW5pdGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRpb25zKToK KyAgICAgICAgKHJ1blRlc3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJj ZUxvYWREZWxlZ2F0ZS5tbToKKyAgICAgICAgKGlzQWxsb3dlZEhvc3QpOgorICAgICAgICAoLVtS ZXNvdXJjZUxvYWREZWxlZ2F0ZSB3ZWJWaWV3OnJlc291cmNlOndpbGxTZW5kUmVxdWVzdDpyZWRp cmVjdFJlc3BvbnNlOmZyb21EYXRhU291cmNlOl0pOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwOgorICAgICAgICAoV1RSOjpJbmpl Y3RlZEJ1bmRsZTo6ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1 bmRsZTo6aXNBbGxvd2VkSG9zdCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdUUjo6aXNBbGxv d2VkSG9zdCk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6d2lsbFNlbmRSZXF1 ZXN0Rm9yRnJhbWUpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv VGVzdFJ1bm5lci5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5jcHA6Cisg ICAgICAgIChXVFI6OmhhbmRsZU9wdGlvbkFsbG93ZWRIb3N0KToKKyAgICAgICAgKFdUUjo6T3B0 aW9uc0hhbmRsZXI6Ok9wdGlvbnNIYW5kbGVyKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVy L09wdGlvbnMuaDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAo V1RSOjpUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lzdGVudFZhbHVlcyk6CisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oOgorCiAyMDE1LTAzLTE4ICBK ZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIEFsbG93IGlu dGVybmFsIGJ1aWxkcyB0byBvdmVycmlkZSBjb2RlIHNpZ25pbmcgc2V0dGluZ3MKZGlmZiAtLWdp dCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuaCBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL1Rlc3RSdW5uZXIuaAppbmRleCBmNjYzZmZiY2I1Y2U3ODViNDAwNWJkMjc4NGUzY2JjN2U0 NTc1MjhjLi4wMzdmNmFjYTU4MzM2ZWE5MzRhNjIyYWUxZTFmYjA1ODU1YjU0MzBiIDEwMDY0NAot LS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmgKKysrIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvVGVzdFJ1bm5lci5oCkBAIC01Miw2ICs1Miw4IEBAIHB1YmxpYzoKICAgICB2b2lk IG1ha2VXaW5kb3dPYmplY3QoSlNDb250ZXh0UmVmLCBKU09iamVjdFJlZiB3aW5kb3dPYmplY3Qs IEpTVmFsdWVSZWYqIGV4Y2VwdGlvbik7CiAKICAgICB2b2lkIGFkZERpc2FsbG93ZWRVUkwoSlNT dHJpbmdSZWYgdXJsKTsKKyAgICBjb25zdCBzdGQ6OnNldDxzdGQ6OnN0cmluZz4mIGFsbG93ZWRI b3N0cygpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dlZEhvc3RzOyB9CisgICAgdm9pZCBzZXRBbGxv d2VkSG9zdHMoc3RkOjpzZXQ8c3RkOjpzdHJpbmc+IGhvc3RzKSB7IG1fYWxsb3dlZEhvc3RzID0g aG9zdHM7IH0KICAgICB2b2lkIGFkZFVSTFRvUmVkaXJlY3Qoc3RkOjpzdHJpbmcgb3JpZ2luLCBz dGQ6OnN0cmluZyBkZXN0aW5hdGlvbik7CiAgICAgY29uc3Qgc3RkOjpzdHJpbmcmIHJlZGlyZWN0 aW9uRGVzdGluYXRpb25Gb3JVUkwoc3RkOjpzdHJpbmcpOwogICAgIHZvaWQgY2xlYXJBbGxBcHBs aWNhdGlvbkNhY2hlcygpOwpAQCAtNDE4LDExICs0MjAsMTIgQEAgcHJpdmF0ZToKICAgICBzdGQ6 OnN0cmluZyBtX3RpdGxlVGV4dERpcmVjdGlvbjsKIAogICAgIHN0ZDo6c2V0PHN0ZDo6c3RyaW5n PiBtX3dpbGxTZW5kUmVxdWVzdENsZWFySGVhZGVyczsKKyAgICBzdGQ6OnNldDxzdGQ6OnN0cmlu Zz4gbV9hbGxvd2VkSG9zdHM7CiAKICAgICBzdGQ6OnZlY3RvcjxjaGFyPiBtX2F1ZGlvUmVzdWx0 OwogCiAgICAgc3RkOjptYXA8c3RkOjpzdHJpbmcsIHN0ZDo6c3RyaW5nPiBtX1VSTHNUb1JlZGly ZWN0OwotICAgIAorCiAgICAgc3RhdGljIEpTQ2xhc3NSZWYgZ2V0SlNDbGFzcygpOwogICAgIHN0 YXRpYyBKU1N0YXRpY1ZhbHVlKiBzdGF0aWNWYWx1ZXMoKTsKICAgICBzdGF0aWMgSlNTdGF0aWNG dW5jdGlvbiogc3RhdGljRnVuY3Rpb25zKCk7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVt cFJlbmRlclRyZWUubW0KaW5kZXggZTIyZTNhN2U3M2EzYjI2NjRjODdiOTU0NzFlMTkzYWU0ZDMy MmY5ZS4uOTM3ZmI1YTVmMjlmNTY4ZjBjMmQ0NzI5YTRlMTU3OTAzZjhjODQ0NyAxMDA2NDQKLS0t IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtMjAyLDYgKzIwMiw3IEBA IHN0YXRpYyBpbnQgdXNlQWNjZWxlcmF0ZWREcmF3aW5nOwogc3RhdGljIGludCBnY0JldHdlZW5U ZXN0czsKIHN0YXRpYyBCT09MIHByaW50U2VwYXJhdG9yczsKIHN0YXRpYyBSZXRhaW5QdHI8Q0ZT dHJpbmdSZWY+IHBlcnNpc3RlbnRVc2VyU3R5bGVTaGVldExvY2F0aW9uOworc3RhdGljIHN0ZDo6 c2V0PHN0ZDo6c3RyaW5nPiBhbGxvd2VkSG9zdHM7CiAKIHN0YXRpYyBXZWJIaXN0b3J5SXRlbSAq cHJldlRlc3RCRkl0ZW0gPSBuaWw7ICAvLyBjdXJyZW50IGIvZiBpdGVtIGF0IHRoZSBlbmQgb2Yg dGhlIHByZXZpb3VzIHRlc3QKIApAQCAtMTA4MCw2ICsxMDgxLDcgQEAgc3RhdGljIHZvaWQgaW5p dGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRpb25zKGludCBhcmdjLCBjb25zdCBjaGFy ICphcmd2W10KICAgICAgICAgeyJhY2NlbGVyYXRlZC1kcmF3aW5nIiwgbm9fYXJndW1lbnQsICZ1 c2VBY2NlbGVyYXRlZERyYXdpbmcsIFlFU30sCiAgICAgICAgIHsiZ2MtYmV0d2Vlbi10ZXN0cyIs IG5vX2FyZ3VtZW50LCAmZ2NCZXR3ZWVuVGVzdHMsIFlFU30sCiAgICAgICAgIHsibm8tdGltZW91 dCIsIG5vX2FyZ3VtZW50LCAmdXNlVGltZW91dFdhdGNoZG9nLCBOT30sCisgICAgICAgIHsiYWxs b3dlZC1ob3N0IiwgcmVxdWlyZWRfYXJndW1lbnQsIG51bGxwdHIsICdhJ30sCiAgICAgICAgIHtu dWxscHRyLCAwLCBudWxscHRyLCAwfQogICAgIH07CiAgICAgCkBAIC0xMDkwLDYgKzEwOTIsOSBA QCBzdGF0aWMgdm9pZCBpbml0aWFsaXplR2xvYmFsc0Zyb21Db21tYW5kTGluZU9wdGlvbnMoaW50 IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXQogICAgICAgICAgICAgY2FzZSAnOic6ICAgLy8gbWlz c2luZyBhcmd1bWVudAogICAgICAgICAgICAgICAgIGV4aXQoMSk7CiAgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICBjYXNlICdhJzogLy8gImFsbG93ZWQtaG9zdCIKKyAgICAgICAg ICAgICAgICBhbGxvd2VkSG9zdHMuaW5zZXJ0KG9wdGFyZyk7CisgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0xODgwLDYgKzE4ODUsNyBAQCBzdGF0aWMgdm9p ZCBydW5UZXN0KGNvbnN0IHN0cmluZyYgaW5wdXRMaW5lKQogI2VuZGlmCiAKICAgICBnVGVzdFJ1 bm5lciA9IFRlc3RSdW5uZXI6OmNyZWF0ZSh0ZXN0VVJMLCBjb21tYW5kLmV4cGVjdGVkUGl4ZWxI YXNoKTsKKyAgICBnVGVzdFJ1bm5lci0+c2V0QWxsb3dlZEhvc3RzKGFsbG93ZWRIb3N0cyk7CiAg ICAgZ1Rlc3RSdW5uZXItPnNldEN1c3RvbVRpbWVvdXQoY29tbWFuZC50aW1lb3V0KTsKICAgICB0 b3BMb2FkaW5nRnJhbWUgPSBuaWw7CiAjaWYgIVBMQVRGT1JNKElPUykKZGlmZiAtLWdpdCBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbSBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQppbmRleCA5ZGQyYjQwZDgx MTMxZWVmYWU4NWFlYWNkMjFhMDM3Y2JiYWMwODE0Li4zZjFhMDQ5N2Q2MDE4MzI5MTEzYWNmMWNm ZTE3NjllYjMxODlmZGYyIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvUmVz b3VyY2VMb2FkRGVsZWdhdGUubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1Jlc291 cmNlTG9hZERlbGVnYXRlLm1tCkBAIC0xMzcsNiArMTM3LDExIEBAIEJPT0wgaG9zdElzVXNlZEJ5 U29tZVRlc3RzVG9HZW5lcmF0ZUVycm9yKE5TU3RyaW5nICpob3N0KQogICAgIHJldHVybiBOU09y ZGVyZWRTYW1lID09IFtob3N0IGNvbXBhcmU6QCIyNTUuMjU1LjI1NS4yNTUiXTsKIH0KIAorQk9P TCBpc0FsbG93ZWRIb3N0KE5TU3RyaW5nICpob3N0KQoreworICAgIHJldHVybiBnVGVzdFJ1bm5l ci0+YWxsb3dlZEhvc3RzKCkuY291bnQoaG9zdC5VVEY4U3RyaW5nKTsKK30KKwogLShOU1VSTFJl cXVlc3QgKil3ZWJWaWV3OiAoV2ViVmlldyAqKXd2IHJlc291cmNlOmlkZW50aWZpZXIgd2lsbFNl bmRSZXF1ZXN0OiAoTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCByZWRpcmVjdFJlc3BvbnNlOihOU1VS TFJlc3BvbnNlICopcmVkaXJlY3RSZXNwb25zZSBmcm9tRGF0YVNvdXJjZTooV2ViRGF0YVNvdXJj ZSAqKWRhdGFTb3VyY2UKIHsKICAgICBpZiAoIWRvbmUgJiYgZ1Rlc3RSdW5uZXItPmR1bXBSZXNv dXJjZUxvYWRDYWxsYmFja3MoKSkgewpAQCAtMTY1LDcgKzE3MCw3IEBAIEJPT0wgaG9zdElzVXNl ZEJ5U29tZVRlc3RzVG9HZW5lcmF0ZUVycm9yKE5TU3RyaW5nICpob3N0KQogICAgICAgICBOU1N0 cmluZyAqdGVzdEhvc3QgPSAwOwogICAgICAgICBpZiAoW2xvd2VyY2FzZVRlc3RVUkwgaGFzUHJl Zml4OkAiaHR0cDoiXSB8fCBbbG93ZXJjYXNlVGVzdFVSTCBoYXNQcmVmaXg6QCJodHRwczoiXSkK ICAgICAgICAgICAgIHRlc3RIb3N0ID0gW1tOU1VSTCBVUkxXaXRoU3RyaW5nOnRlc3RVUkxdIGhv c3RdOwotICAgICAgICBpZiAoIWlzTG9jYWxob3N0KGhvc3QpICYmICFob3N0SXNVc2VkQnlTb21l VGVzdHNUb0dlbmVyYXRlRXJyb3IoaG9zdCkgJiYgKCF0ZXN0SG9zdCB8fCBpc0xvY2FsaG9zdCh0 ZXN0SG9zdCkpKSB7CisgICAgICAgIGlmICghaXNMb2NhbGhvc3QoaG9zdCkgJiYgIWhvc3RJc1Vz ZWRCeVNvbWVUZXN0c1RvR2VuZXJhdGVFcnJvcihob3N0KSAmJiAhaXNBbGxvd2VkSG9zdChob3N0 KSAmJiAoIXRlc3RIb3N0IHx8IGlzTG9jYWxob3N0KHRlc3RIb3N0KSkpIHsKICAgICAgICAgICAg IHByaW50ZigiQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMICVzXG4iLCBbW3VybCBhYnNv bHV0ZVN0cmluZ10gY1N0cmluZ1VzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddKTsK ICAgICAgICAgICAgIHJldHVybiBuaWw7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAKaW5kZXgg ZDU3MDgxYmIxYjEzYjQ1MzA0MDk4MjM4ODUyZGExMmYyODJlNjQ4My4uOGNmY2NmMGI4YzNiM2Vj NGI4ZGYyNDBkM2M1MjhkOWRhZTRjN2U4MSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAKKysrIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAKQEAgLTE2Niw2ICsx NjYsMTcgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoV0tTdHJpbmdS ZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWcKICAgICAgICAgaWYgKHNob3VsZEdDKQog ICAgICAgICAgICAgV0tCdW5kbGVHYXJiYWdlQ29sbGVjdEphdmFTY3JpcHRPYmplY3RzKG1fYnVu ZGxlKTsKIAorICAgICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gYWxsb3dlZEhvc3RzS2V5 KEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJBbGxvd2VkSG9zdHMiKSk7 CisgICAgICAgIFdLVHlwZVJlZiBhbGxvd2VkSG9zdHNWYWx1ZSA9IFdLRGljdGlvbmFyeUdldEl0 ZW1Gb3JLZXkobWVzc2FnZUJvZHlEaWN0aW9uYXJ5LCBhbGxvd2VkSG9zdHNLZXkuZ2V0KCkpOwor ICAgICAgICBpZiAoYWxsb3dlZEhvc3RzVmFsdWUgJiYgV0tHZXRUeXBlSUQoYWxsb3dlZEhvc3Rz VmFsdWUpID09IFdLQXJyYXlHZXRUeXBlSUQoKSkgeworICAgICAgICAgICAgV0tBcnJheVJlZiBh bGxvd2VkSG9zdHNBcnJheSA9IHN0YXRpY19jYXN0PFdLQXJyYXlSZWY+KGFsbG93ZWRIb3N0c1Zh bHVlKTsKKyAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwLCBzaXplID0gV0tBcnJheUdldFNp emUoYWxsb3dlZEhvc3RzQXJyYXkpOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAgICAgICAgICAg V0tUeXBlUmVmIGl0ZW0gPSBXS0FycmF5R2V0SXRlbUF0SW5kZXgoYWxsb3dlZEhvc3RzQXJyYXks IGkpOworICAgICAgICAgICAgICAgIGlmIChpdGVtICYmIFdLR2V0VHlwZUlEKGl0ZW0pID09IFdL U3RyaW5nR2V0VHlwZUlEKCkpCisgICAgICAgICAgICAgICAgICAgIG1fYWxsb3dlZEhvc3RzLmFw cGVuZCh0b1dURlN0cmluZyhzdGF0aWNfY2FzdDxXS1N0cmluZ1JlZj4oaXRlbSkpKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorCiAgICAgICAgIG1fc3RhdGUgPSBJZGxlOwogICAgICAgICBt X2R1bXBQaXhlbHMgPSBmYWxzZTsKIApAQCAtNTk5LDQgKzYxMCwxMSBAQCB2b2lkIEluamVjdGVk QnVuZGxlOjpxdWV1ZU5vbkxvYWRpbmdTY3JpcHQoV0tTdHJpbmdSZWYgc2NyaXB0KQogICAgIFdL QnVuZGxlUG9zdE1lc3NhZ2UobV9idW5kbGUsIG1lc3NhZ2VOYW1lLmdldCgpLCBzY3JpcHQpOwog fQogCitib29sIEluamVjdGVkQnVuZGxlOjppc0FsbG93ZWRIb3N0KFdLU3RyaW5nUmVmIGhvc3Qp Cit7CisgICAgaWYgKG1fYWxsb3dlZEhvc3RzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIHJldHVybiBtX2FsbG93ZWRIb3N0cy5jb250YWlucyh0b1dURlN0cmluZyhob3N0 KSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdUUgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCmluZGV4IGQ3ZDRiYWRkY2Q0 MGQ4OGRkYmUzYWJiZDMzMzNhNWU0ZTJiYjI3YjUuLjI4MTkxOGFlM2E4ZjFhNjdhYzRlNjA2NmFk YTFmODg2ZmNkNGNiOTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmgKQEAgLTExNSw2ICsxMTUsOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCBxdWV1ZUxvYWRpbmdTY3JpcHQoV0tTdHJpbmdSZWYgc2NyaXB0KTsKICAgICB2 b2lkIHF1ZXVlTm9uTG9hZGluZ1NjcmlwdChXS1N0cmluZ1JlZiBzY3JpcHQpOwogCisgICAgYm9v bCBpc0FsbG93ZWRIb3N0KFdLU3RyaW5nUmVmKTsKKwogcHJpdmF0ZToKICAgICBJbmplY3RlZEJ1 bmRsZSgpOwogICAgIH5JbmplY3RlZEJ1bmRsZSgpOwpAQCAtMTY1LDYgKzE2Nyw4IEBAIHByaXZh dGU6CiAgICAgV0tSZXRhaW5QdHI8V0tEYXRhUmVmPiBtX2F1ZGlvUmVzdWx0OwogICAgIFdLUmV0 YWluUHRyPFdLSW1hZ2VSZWY+IG1fcGl4ZWxSZXN1bHQ7CiAgICAgV0tSZXRhaW5QdHI8V0tBcnJh eVJlZj4gbV9yZXBhaW50UmVjdHM7CisKKyAgICBWZWN0b3I8U3RyaW5nPiBtX2FsbG93ZWRIb3N0 czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdUUgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCmluZGV4 IDA2Yjk2OGI2ZDljNDliYTVmYTQ4N2ZmN2YwZmIxMmU4Y2IzZDIwNGEuLjEwMTNlYzk2MGU0NTM2 MmZiZGU0ZTgyMDIzY2UzMDYxODBhNDhmMzAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAorKysgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKQEAg LTEwNzQsNiArMTA3NCwxMSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNIVFRQT3JIVFRQU1NjaGVt ZShXS1N0cmluZ1JlZiBzY2hlbWUpCiAgICAgcmV0dXJuIFdLU3RyaW5nSXNFcXVhbFRvVVRGOENT dHJpbmdJZ25vcmluZ0Nhc2Uoc2NoZW1lLCAiaHR0cCIpIHx8IFdLU3RyaW5nSXNFcXVhbFRvVVRG OENTdHJpbmdJZ25vcmluZ0Nhc2Uoc2NoZW1lLCAiaHR0cHMiKTsKIH0KIAorc3RhdGljIGlubGlu ZSBib29sIGlzQWxsb3dlZEhvc3QoV0tTdHJpbmdSZWYgaG9zdCkKK3sKKyAgICByZXR1cm4gSW5q ZWN0ZWRCdW5kbGU6OnNpbmdsZXRvbigpLmlzQWxsb3dlZEhvc3QoaG9zdCk7Cit9CisKIFdLVVJM UmVxdWVzdFJlZiBJbmplY3RlZEJ1bmRsZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdL QnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCBpZGVu dGlmaWVyLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tVUkxSZXNwb25zZVJlZiByZXNwb25z ZSkKIHsKICAgICBhdXRvJiBpbmplY3RlZEJ1bmRsZSA9IEluamVjdGVkQnVuZGxlOjpzaW5nbGV0 b24oKTsKQEAgLTExMDgsNyArMTExMyw3IEBAIFdLVVJMUmVxdWVzdFJlZiBJbmplY3RlZEJ1bmRs ZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiBwYWdlCiAgICAg ICAgICYmICFpc0xvY2FsSG9zdChob3N0LmdldCgpKSkgewogICAgICAgICBib29sIG1haW5GcmFt ZUlzRXh0ZXJuYWwgPSBmYWxzZTsKICAgICAgICAgaWYgKGluamVjdGVkQnVuZGxlLmlzVGVzdFJ1 bm5pbmcoKSkgewotICAgICAgICAgICAgV0tCdW5kbGVGcmFtZVJlZiBtYWluRnJhbWUgPSBpbmpl Y3RlZEJ1bmRsZS50b3BMb2FkaW5nRnJhbWUoKTsKKyAgICAgICAgICAgIFdLQnVuZGxlRnJhbWVS ZWYgbWFpbkZyYW1lID0gV0tCdW5kbGVQYWdlR2V0TWFpbkZyYW1lKG1fcGFnZSk7CiAgICAgICAg ICAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gbWFpbkZyYW1lVVJMID0gYWRvcHRXSyhXS0J1bmRs ZUZyYW1lQ29weVVSTChtYWluRnJhbWUpKTsKICAgICAgICAgICAgIGlmICghbWFpbkZyYW1lVVJM IHx8IFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoYWRvcHRXSyhXS1VSTENvcHlTdHJpbmco bWFpbkZyYW1lVVJMLmdldCgpKSkuZ2V0KCksICJhYm91dDpibGFuayIpKQogICAgICAgICAgICAg ICAgIG1haW5GcmFtZVVSTCA9IGFkb3B0V0soV0tCdW5kbGVGcmFtZUNvcHlQcm92aXNpb25hbFVS TChtYWluRnJhbWUpKTsKQEAgLTExMTcsNyArMTEyMiw3IEBAIFdLVVJMUmVxdWVzdFJlZiBJbmpl Y3RlZEJ1bmRsZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiBw YWdlCiAgICAgICAgICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gbWFpbkZyYW1lU2NoZW1l ID0gYWRvcHRXSyhXS1VSTENvcHlTY2hlbWUobWFpbkZyYW1lVVJMLmdldCgpKSk7CiAgICAgICAg ICAgICBtYWluRnJhbWVJc0V4dGVybmFsID0gaXNIVFRQT3JIVFRQU1NjaGVtZShtYWluRnJhbWVT Y2hlbWUuZ2V0KCkpICYmICFpc0xvY2FsSG9zdChtYWluRnJhbWVIb3N0LmdldCgpKTsKICAgICAg ICAgfQotICAgICAgICBpZiAoIW1haW5GcmFtZUlzRXh0ZXJuYWwpIHsKKyAgICAgICAgaWYgKCFt YWluRnJhbWVJc0V4dGVybmFsICYmICFpc0FsbG93ZWRIb3N0KGhvc3QuZ2V0KCkpKSB7CiAgICAg ICAgICAgICBTdHJpbmdCdWlsZGVyIHN0cmluZ0J1aWxkZXI7CiAgICAgICAgICAgICBzdHJpbmdC dWlsZGVyLmFwcGVuZExpdGVyYWwoIkJsb2NrZWQgYWNjZXNzIHRvIGV4dGVybmFsIFVSTCAiKTsK ICAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKHRvV1RGU3RyaW5nKHVybFN0cmluZykp OwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0 UnVubmVyLmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rlc3RSdW5u ZXIuaAppbmRleCBjNWE4ZmE3YzgwY2YyMjJlYjQwMDVlYjM2ZWFmNjRjNDUzYzRmZjEyLi5hMmM3 ZjlkOTEwZTc0YjI2M2NiMzczYjA0NDQ1ZWE5MzY0NmFmMWI1IDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuaAorKysgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuaApAQCAtMzMxLDYgKzMz MSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3VzZXJTdHlsZVNoZWV0RW5hYmxlZDsKICAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gbV91c2VyU3R5bGVTaGVldExvY2F0aW9uOwogCisgICAg V0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gbV9hbGxvd2VkSG9zdHM7CisKICAgICBQbGF0Zm9ybVRp bWVyUmVmIG1fd2FpdFRvRHVtcFdhdGNoZG9nVGltZXI7CiB9OwogCmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9P cHRpb25zLmNwcAppbmRleCBiZTNlMjM3MTc5ZjA0ZWVlOGFhNTVlODYxNGIyMjQzOWQzMDM5MmQx Li4yODZjZDQ1OTgxMTE2YWMxNmYzMzIyMzQ0MmNjNWNiNmU5OTljZThmIDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL09wdGlvbnMuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvT3B0aW9ucy5jcHAKQEAgLTk5LDYgKzk5LDEyIEBAIGJvb2wgaGFuZGxlT3B0aW9uUmVt b3RlTGF5ZXJUcmVlKE9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IGNoYXIqLCBjb25zdCBjaGFyKikK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCBoYW5kbGVPcHRpb25BbGxvd2VkSG9zdChPcHRp b25zJiBvcHRpb25zLCBjb25zdCBjaGFyKiwgY29uc3QgY2hhciogaG9zdCkKK3sKKyAgICBvcHRp b25zLmFsbG93ZWRIb3N0cy5wdXNoX2JhY2soaG9zdCk7CisgICAgcmV0dXJuIHRydWU7Cit9CisK IGJvb2wgaGFuZGxlT3B0aW9uVW5tYXRjaGVkKE9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IGNoYXIq IG9wdGlvbiwgY29uc3QgY2hhciopCiB7CiAgICAgaWYgKG9wdGlvblswXSAmJiBvcHRpb25bMV0g JiYgb3B0aW9uWzBdID09ICctJyAmJiBvcHRpb25bMV0gPT0gJy0nKQpAQCAtMTIwLDYgKzEyNiw4 IEBAIE9wdGlvbnNIYW5kbGVyOjpPcHRpb25zSGFuZGxlcihPcHRpb25zJiBvKQogICAgIG9wdGlv bkxpc3QuYXBwZW5kKE9wdGlvbigiLS1jb21wbGV4LXRleHQiLCAiRm9yY2UgY29tcGxleCB0ZXN0 cy4iLCBoYW5kbGVPcHRpb25Db21wbGV4VGV4dCkpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5kKE9w dGlvbigiLS1hY2NlbGVyYXRlZC1kcmF3aW5nIiwgIlVzZSBhY2NlbGVyYXRlZCBkcmF3aW5nLiIs IGhhbmRsZU9wdGlvbkFjY2VsZXJhdGVkRHJhd2luZykpOwogICAgIG9wdGlvbkxpc3QuYXBwZW5k KE9wdGlvbigiLS1yZW1vdGUtbGF5ZXItdHJlZSIsICJVc2UgcmVtb3RlIGxheWVyIHRyZWUuIiwg aGFuZGxlT3B0aW9uUmVtb3RlTGF5ZXJUcmVlKSk7CisgICAgb3B0aW9uTGlzdC5hcHBlbmQoT3B0 aW9uKCItLWFsbG93ZWQtaG9zdCIsICJBbGxvd3MgYWNjZXNzIHRvIHRoZSBzcGVjaWZpZWQgaG9z dCBmcm9tIHRlc3RzLiIsIGhhbmRsZU9wdGlvbkFsbG93ZWRIb3N0LCB0cnVlKSk7CisKICAgICBv cHRpb25MaXN0LmFwcGVuZChPcHRpb24oMCwgMCwgaGFuZGxlT3B0aW9uVW5tYXRjaGVkKSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvT3B0aW9ucy5oIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmgKaW5kZXggNWJhNmFhZDVlNjk0YjQ3YzFiZmQxNTgx M2M2NDNiODU1ZWY1MDYwNy4uZWYwOTYzMGIxYTlmNDc0Y2NhMmNjNzlmYzkzYTgwOTZhMzRkNDVj YSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmgKKysrIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9PcHRpb25zLmgKQEAgLTQ3LDYgKzQ3LDcgQEAgc3RydWN0IE9w dGlvbnMgewogICAgIGJvb2wgc2hvdWxkVXNlQWNjZWxlcmF0ZWREcmF3aW5nOwogICAgIGJvb2wg c2hvdWxkVXNlUmVtb3RlTGF5ZXJUcmVlOwogICAgIHN0ZDo6dmVjdG9yPHN0ZDo6c3RyaW5nPiBw YXRoczsKKyAgICBzdGQ6OnZlY3RvcjxzdGQ6OnN0cmluZz4gYWxsb3dlZEhvc3RzOwogfTsKIAog Y2xhc3MgT3B0aW9uIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAK aW5kZXggOTM4YzJiN2FiMTBlODdiZWJlZWFmMTA5YzEzOGNhZTY2OGExMjJkNi4uZjk0M2QyOGNl YzZmOGZjYTVjYWY4MmFmZjM4YWQ1OGM3NTI3NGY3ZCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTMyNSw2ICszMjUsNyBAQCB2b2lkIFRlc3RDb250cm9s bGVyOjppbml0aWFsaXplKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgbV9zaG91 bGRVc2VBY2NlbGVyYXRlZERyYXdpbmcgPSBvcHRpb25zLnNob3VsZFVzZUFjY2VsZXJhdGVkRHJh d2luZzsKICAgICBtX3Nob3VsZFVzZVJlbW90ZUxheWVyVHJlZSA9IG9wdGlvbnMuc2hvdWxkVXNl UmVtb3RlTGF5ZXJUcmVlOwogICAgIG1fcGF0aHMgPSBvcHRpb25zLnBhdGhzOworICAgIG1fYWxs b3dlZEhvc3RzID0gb3B0aW9ucy5hbGxvd2VkSG9zdHM7CiAKICAgICBpZiAob3B0aW9ucy5wcmlu dFN1cHBvcnRlZEZlYXR1cmVzKSB7CiAgICAgICAgIC8vIEZJWE1FOiBPbiBXaW5kb3dzLCBEdW1w UmVuZGVyVHJlZSB1c2VzIHRoaXMgdG8gZXhwb3NlIHdoZXRoZXIgaXQgc3VwcG9ydHMgM2QKQEAg LTYxMiw2ICs2MTMsMTQgQEAgYm9vbCBUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lz dGVudFZhbHVlcygpCiAgICAgV0tSZXRhaW5QdHI8V0tCb29sZWFuUmVmPiBzaG91bGRHQ1ZhbHVl ID0gYWRvcHRXSyhXS0Jvb2xlYW5DcmVhdGUobV9nY0JldHdlZW5UZXN0cykpOwogICAgIFdLRGlj dGlvbmFyeVNldEl0ZW0ocmVzZXRNZXNzYWdlQm9keS5nZXQoKSwgc2hvdWxkR0NLZXkuZ2V0KCks IHNob3VsZEdDVmFsdWUuZ2V0KCkpOwogCisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IGFs bG93ZWRIb3N0c0tleSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIkFs bG93ZWRIb3N0cyIpKTsKKyAgICBXS1JldGFpblB0cjxXS011dGFibGVBcnJheVJlZj4gYWxsb3dl ZEhvc3RzVmFsdWUgPSBhZG9wdFdLKFdLTXV0YWJsZUFycmF5Q3JlYXRlKCkpOworICAgIGZvciAo YXV0byYgaG9zdCA6IG1fYWxsb3dlZEhvc3RzKSB7CisgICAgICAgIFdLUmV0YWluUHRyPFdLU3Ry aW5nUmVmPiB3a0hvc3QgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGhv c3QuY19zdHIoKSkpOworICAgICAgICBXS0FycmF5QXBwZW5kSXRlbShhbGxvd2VkSG9zdHNWYWx1 ZS5nZXQoKSwgd2tIb3N0LmdldCgpKTsKKyAgICB9CisgICAgV0tEaWN0aW9uYXJ5U2V0SXRlbShy ZXNldE1lc3NhZ2VCb2R5LmdldCgpLCBhbGxvd2VkSG9zdHNLZXkuZ2V0KCksIGFsbG93ZWRIb3N0 c1ZhbHVlLmdldCgpKTsKKwogICAgIFdLQ29udGV4dFBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRs ZShUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkuY29udGV4dCgpLCBtZXNzYWdlTmFtZS5nZXQo KSwgcmVzZXRNZXNzYWdlQm9keS5nZXQoKSk7CiAKICAgICBXS0NvbnRleHRTZXRTaG91bGRVc2VG b250U21vb3RoaW5nKFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5jb250ZXh0KCksIGZhbHNl KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaCBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAppbmRleCAwYzM2MmYwYzdi ZGEyYzEyMmMyMjA4ZTQ5NjhhNDJmOTUyNjJkYWUwLi41Njc1YWVmYmRiMGZkM2M5NjU4NDViNzE2 NTA5ZmQ1OGQxNGUyYzRlIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RD b250cm9sbGVyLmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5o CkBAIC0yMTQsNiArMjE0LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZ2NCZXR3ZWVuVGVzdHM7 CiAgICAgYm9vbCBtX3Nob3VsZER1bXBQaXhlbHNGb3JBbGxUZXN0czsKICAgICBzdGQ6OnZlY3Rv cjxzdGQ6OnN0cmluZz4gbV9wYXRoczsKKyAgICBzdGQ6OnZlY3RvcjxzdGQ6OnN0cmluZz4gbV9h bGxvd2VkSG9zdHM7CiAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IG1faW5qZWN0ZWRCdW5k bGVQYXRoOwogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBtX3Rlc3RQbHVnaW5EaXJlY3Rv cnk7CiAK