170192 2017-03-28 12:56:54 -0700 [WebRTC] After r214441 addIceCandidate not longer accepts an RTCIceCandidateInit dictionary 2017-03-29 08:33:25 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 170118 1 clopez youennf alex aperez bugs-noreply cdumez commit-queue eric.carlson jonlee youennf oldest_to_newest 1292017 0 clopez 2017-03-28 12:56:54 -0700 I have detected this layout test failure on the WebKitGTK+ (OpenWebRTC) port caused by r214441 <https://trac.webkit.org/r214441> $ diff -U100 -u LayoutTests/platform/gtk/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt layout-test-results/fast/mediastream/RTCPeerConnection-addIceCandidate-actual.txt --- LayoutTests/platform/gtk/fast/mediastream/RTCPeerConnection-addIceCandidate-expected.txt 2017-03-16 17:49:20.780620966 +0100 +++ layout-test-results/fast/mediastream/RTCPeerConnection-addIceCandidate-actual.txt 2017-03-28 21:30:45.797590203 +0200 @@ -1,34 +1,34 @@ Test behavior of RTCPeerConnection.addIceCandidate On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". *** A remote description is needed before a candidate can be added PASS pc.remoteDescription is null PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'foo', sdpMid: 0})) rejected with InvalidStateError (DOM Exception 11): No remote description set PASS Remote description set *** Define sdpMid, badSdpMid, sdpMLineIndex and badSdpMLineIndex for testing PASS sdpMLineIndex is not badSdpMLineIndex PASS sdpMid is not null PASS sdpMid is not badSdpMid PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: badSdpMid})) rejected with OperationError (DOM Exception 34): sdpMid did not match any media description PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMLineIndex: badSdpMLineIndex})) rejected with OperationError (DOM Exception 34): sdpMLineIndex is out of range *** A (bad) sdpMid takes precedesce over valid sdpMLineIndex PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: badSdpMid, sdpMLineIndex: sdpMLineIndex})) rejected with OperationError (DOM Exception 34): sdpMid did not match any media description *** Test bad candidate content with valid sdpMid PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMid: sdpMid})) rejected with OperationError (DOM Exception 34): Invalid candidate content *** Test bad candidate content with valid sdpMLineIndex PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: 'bad content', sdpMLineIndex: sdpMLineIndex})) rejected with OperationError (DOM Exception 34): Invalid candidate content *** Test some OK input -PASS promise pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid}) fulfilled with undefined +FAIL promise pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid}) rejected unexpectedly. PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMLineIndex: sdpMLineIndex})) fulfilled with undefined *** A valid sdpMid takes precedesce over a bad sdpMLineIndex PASS promise pc.addIceCandidate(new RTCIceCandidate({candidate: validCandidate, sdpMid: sdpMid, sdpMLineIndex: badSdpMLineIndex})) fulfilled with undefined PASS End of test promise chain PASS successfullyParsed is true TEST COMPLETE Note that the GTK port has a different expectation for this test than the mac port. The test tries to call RTCPeerConnection.addIceCandidate() passing a Dictionary with some of the values allowed as per the definition of RTCIceCandidateInit here: https://www.w3.org/TR/webrtc/#dom-rtcicecandidateinit From LayoutTests/fast/mediastream/RTCPeerConnection-addIceCandidate.html: [...] .then(function () { debug("<br>*** Test some OK input"); // Testing passing a RTCIceCandidateInit return promiseShouldResolve("pc.addIceCandidate({candidate: validCandidate, sdpMid: sdpMid})"); [...] My understanding is that the promise should work. And it was working before r214441. I double-checked it: reverting r214441 locally makes the test pass back again. 1292038 1 youennf 2017-03-28 13:11:27 -0700 > *** Test some OK input > -PASS promise pc.addIceCandidate({candidate: validCandidate, sdpMid: > sdpMid}) fulfilled with undefined > +FAIL promise pc.addIceCandidate({candidate: validCandidate, sdpMid: > sdpMid}) rejected unexpectedly. This should be working. I'll check that. 1292153 2 305658 youennf 2017-03-28 16:00:28 -0700 Created attachment 305658 Patch 1292221 3 305658 jonlee 2017-03-28 17:25:10 -0700 Comment on attachment 305658 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=305658&action=review > Source/WebCore/ChangeLog:3 > + [WebRTC] After r214441 addIceCandidate not longer accepts an RTCIceCandidateInit dictionary Typo: no* longer 1292279 4 305701 youennf 2017-03-28 20:27:57 -0700 Created attachment 305701 Patch for landing 1292292 5 305701 commit-queue 2017-03-28 21:09:18 -0700 Comment on attachment 305701 Patch for landing Clearing flags on attachment: 305701 Committed r214527: <http://trac.webkit.org/changeset/214527> 1292293 6 commit-queue 2017-03-28 21:09:22 -0700 All reviewed patches have been landed. Closing bug. 1292396 7 clopez 2017-03-29 08:33:25 -0700 Committed r214535: <http://trac.webkit.org/changeset/214535> 305658 2017-03-28 16:00:28 -0700 2017-03-28 20:27:53 -0700 Patch bug-170192-20170328160028.patch text/plain 12297 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWNlZDZlZjJiZjQ5Y2Nh YWJkZDY4ODlkZWJmMzg4YjRkMDhlMDY4MC4uZDU4OWIxYzFiODI1NjIyZGE3ZDBhMjg4YWM3MGJk ZjQyMWQ0NDIzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE3LTAzLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBbV2ViUlRDXSBBZnRlciBy MjE0NDQxIGFkZEljZUNhbmRpZGF0ZSBub3QgbG9uZ2VyIGFjY2VwdHMgYW4gUlRDSWNlQ2FuZGlk YXRlSW5pdCBkaWN0aW9uYXJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzAxOTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDb3ZlcmVkIGJ5IHVwZGF0ZWQgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1bGVz L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5pZGw6IENhbmRpZGF0ZSBpcyBubyBsb25nZXIg YSByZXF1aXJlZCBmaWVsZCBpbiBSVENJY2VDYW5kaWRhdGVJbml0LgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb25JbnRlcm5hbHMuanM6IFJld29ya2luZyBk ZWZhdWx0c1RvTnVsbCB0byBoYW5kbGUgYm90aCB1bmRlZmluZWQgYW5kIG51bGwgY2FzZXMuCisK KzIwMTctMDMtMjggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCiAgICAgICAg IEZpeCBhZGRJY2VDYW5kaWRhdGUgYWZ0ZXIgcjIxNDQ0MQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMTQ2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmlkbCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmlkbAppbmRleCA3OWVm MTM5YWE4MGQ3YTE5NDJlMjI0Y2RhZTk4Zjc5NGE0Y2VkNGQ4Li40N2Q0NGI3N2RmZmFmOWQwYWMw YWViOTVjMTgxN2EwMmJiMTI2NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuaWRsCkBAIC02MSw4ICs2MSw3IEBACiAg ICAgQ29uZGl0aW9uYWw9V0VCX1JUQywKICAgICBFbmFibGVkQXRSdW50aW1lPVBlZXJDb25uZWN0 aW9uCiBdIGRpY3Rpb25hcnkgUlRDSWNlQ2FuZGlkYXRlSW5pdCB7Ci0gICAgLy8gRklYTUUgMTY5 NjYyOiBubyBsb25nZXIgcmVxdWlyZWQsIHdpdGggZGVmYXVsdCBzdHJpbmcKLSAgICByZXF1aXJl ZCBET01TdHJpbmcgY2FuZGlkYXRlOworICAgIERPTVN0cmluZyBjYW5kaWRhdGUgPSAiIjsKICAg ICBET01TdHJpbmc/IHNkcE1pZCA9IG51bGw7CiAgICAgdW5zaWduZWQgc2hvcnQ/IHNkcE1MaW5l SW5kZXggPSBudWxsOwogICAgIC8vIEZJWE1FIDE2OTY2MjogbWlzc2luZyB1ZnJhZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlv bkludGVybmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb25JbnRlcm5hbHMuanMKaW5kZXggOTk2NzFlYmVlMzJjM2U1OGIyODhhYmJmMjJh M2VmZjYzZTA4YTEzYy4uMzYyOWU3YmVmYjI0ZGI2OWY4ZTA0MGRhOWMxMWViNzI5ZDBiNjc5YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29u bmVjdGlvbkludGVybmFscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1BlZXJDb25uZWN0aW9uSW50ZXJuYWxzLmpzCkBAIC02MiwyNiArNjIsMTggQEAgZnVu Y3Rpb24gb2JqZWN0QW5kQ2FsbGJhY2tzT3ZlcmxvYWQoYXJncywgZnVuY3Rpb25OYW1lLCBvYmpl Y3RJbmZvLCBwcm9taXNlTW9kZSwKICAgICBsZXQgb2JqZWN0QXJnID0gYXJnc1swXTsKICAgICBs ZXQgb2JqZWN0QXJnT2sgPSBmYWxzZTsKIAotICAgIGlmICghYXJnc0NvdW50KSB7Ci0gICAgICAg IGlmICghb2JqZWN0SW5mby5kZWZhdWx0c1RvTnVsbCkKLSAgICAgICAgICAgIHJldHVybiBAUHJv bWlzZS5AcmVqZWN0KG5ldyBAVHlwZUVycm9yKCJOb3QgZW5vdWdoIGFyZ3VtZW50cyIpKTsKLQot ICAgICAgICBvYmplY3RBcmcgPSBudWxsOworICAgIGNvbnN0IGhhc01hdGNoaW5nVHlwZSA9IG9i amVjdEFyZyBpbnN0YW5jZW9mIG9iamVjdEluZm8uY29uc3RydWN0b3I7CisgICAgaWYgKGhhc01h dGNoaW5nVHlwZSkKICAgICAgICAgb2JqZWN0QXJnT2sgPSB0cnVlOwotICAgICAgICBhcmdzQ291 bnQgPSAxOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGNvbnN0IGhhc01hdGNoaW5nVHlwZSA9IG9i amVjdEFyZyBpbnN0YW5jZW9mIG9iamVjdEluZm8uY29uc3RydWN0b3I7Ci0gICAgICAgIGlmICho YXNNYXRjaGluZ1R5cGUpCisgICAgZWxzZSBpZiAob2JqZWN0QXJnID09IG51bGwgJiYgb2JqZWN0 SW5mby5kZWZhdWx0c1RvTnVsbCkgeworICAgICAgICBvYmplY3RBcmdPayA9IHRydWU7CisgICAg ICAgIG9iamVjdEFyZyA9IG51bGw7CisgICAgfSBlbHNlIGlmIChvYmplY3RJbmZvLm1heWJlRGlj dGlvbmFyeSkgeworICAgICAgICB0cnkgeworICAgICAgICAgICAgb2JqZWN0QXJnID0gbmV3IG9i amVjdEluZm8uY29uc3RydWN0b3Iob2JqZWN0QXJnKTsKICAgICAgICAgICAgIG9iamVjdEFyZ09r ID0gdHJ1ZTsKLSAgICAgICAgZWxzZSBpZiAob2JqZWN0SW5mby5kZWZhdWx0c1RvTnVsbCkKLSAg ICAgICAgICAgIG9iamVjdEFyZ09rID0gb2JqZWN0QXJnID09PSBudWxsIHx8IHR5cGVvZiBvYmpl Y3RBcmcgPT09ICJ1bmRlZmluZWQiOwotICAgICAgICBlbHNlIGlmIChvYmplY3RJbmZvLm1heWJl RGljdGlvbmFyeSkgewotICAgICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgICAgICBvYmplY3RB cmcgPSBuZXcgb2JqZWN0SW5mby5jb25zdHJ1Y3RvcihvYmplY3RBcmcpOwotICAgICAgICAgICAg ICAgIG9iamVjdEFyZ09rID0gdHJ1ZTsKLSAgICAgICAgICAgIH0gY2F0Y2ggKGUpIHsKLSAgICAg ICAgICAgICAgICBvYmplY3RBcmdPayA9IGZhbHNlOwotICAgICAgICAgICAgfQorICAgICAgICB9 IGNhdGNoIChlKSB7CisgICAgICAgICAgICBvYmplY3RBcmdPayA9IGZhbHNlOwogICAgICAgICB9 CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggNzE3Y2RjYTIzYjI1Yzc4OTliMTk0NGZmMTRiZWQ1NTk0OTVkYjJi My4uYTY1NjBkYjdlZGY3MmYzODJhNmI4MmIxMzA3NWU0OTljNWQ4MmNlNSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDE5IEBACiAyMDE3LTAzLTI4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAorICAgICAgICBbV2ViUlRDXSBBZnRlciByMjE0NDQxIGFkZEljZUNhbmRpZGF0ZSBub3QgbG9u Z2VyIGFjY2VwdHMgYW4gUlRDSWNlQ2FuZGlkYXRlSW5pdCBkaWN0aW9uYXJ5CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAxOTIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0v UlRDSWNlQ2FuZGlkYXRlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFt L1JUQ0ljZUNhbmRpZGF0ZS5odG1sOiBSZW1vdmluZyBubyBsb25nZXIgdmFsaWQgdGVzdHMuCisg ICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRh dGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5l Y3Rpb24tYWRkSWNlQ2FuZGlkYXRlLmh0bWw6IEFkZGluZyBtb3JlIHRlc3RzIHRvIGNvdmVyIG51 bGwvdW5kZWZpbmVkIGNhc2VzLgorICAgICAgICBFbnN1cmluZyBzZHBNaWQgaGFzIGEgdmFsaWQg dmFsdWUuCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9yZXNvdXJjZXMvcHJvbWlzZS11dGls cy5qczogSW1wcm92aW5nIGVycm9yIGxvZ2dpbmcuCisKKzIwMTctMDMtMjggIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCiAgICAgICAgIFVwZGF0ZSBMYXlvdXRUZXN0cy9mYXN0 L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS5odG1sIHRvIGdl dCBtb3JlIGNvdmVyYWdlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzAxOTQKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVh bS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0 cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0CmluZGV4IDQwNjIyMzk2NmJlMTQ5NDcw MWMyYWQzZmE3YjZkYTE2YjE2YzcyYWIuLjBiNGQ4ZDQ4M2Y5MTc5ZWQ0NTkxNWZmZGM3NDI0YmI4 ZTk1NDY3OTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDSWNl Q2FuZGlkYXRlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFt L1JUQ0ljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQKQEAgLTMzLDEyICszMyw2IEBAIFBBU1MgY2Fu ZGlkYXRlLnNkcE1MaW5lSW5kZXggaXMgNgogCiBEaWN0aW9uYXJ5IGFyZ3VtZW50IGlzIG1hbmRh dG9yeS4KIFBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSgpOyB0aHJldyBleGNlcHRpb24gVHlwZUVy cm9yOiBOb3QgZW5vdWdoIGFyZ3VtZW50cy4KLURpY3Rpb25hcnkgbWVtYmVyICdjYW5kaWRhdGUn IGlzIHJlcXVpcmVkLgotUEFTUyBuZXcgUlRDSWNlQ2FuZGlkYXRlKHt9KTsgdGhyZXcgZXhjZXB0 aW9uIFR5cGVFcnJvcjogTWVtYmVyIFJUQ0ljZUNhbmRpZGF0ZUluaXQuY2FuZGlkYXRlIGlzIHJl cXVpcmVkIGFuZCBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIERPTVN0cmluZy4KLVBBU1MgbmV3IFJU Q0ljZUNhbmRpZGF0ZSh7c2RwTWlkOiJiYXIiLCBzZHBNTGluZUluZGV4OjZ9KTsgdGhyZXcgZXhj ZXB0aW9uIFR5cGVFcnJvcjogTWVtYmVyIFJUQ0ljZUNhbmRpZGF0ZUluaXQuY2FuZGlkYXRlIGlz IHJlcXVpcmVkIGFuZCBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIERPTVN0cmluZy4KLVBBU1MgbmV3 IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTWlkOiJiYXIifSk7IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJy b3I6IE1lbWJlciBSVENJY2VDYW5kaWRhdGVJbml0LmNhbmRpZGF0ZSBpcyByZXF1aXJlZCBhbmQg bXVzdCBiZSBhbiBpbnN0YW5jZSBvZiBET01TdHJpbmcuCi1QQVNTIG5ldyBSVENJY2VDYW5kaWRh dGUoe3NkcE1MaW5lSW5kZXg6Nn0pOyB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBNZW1iZXIg UlRDSWNlQ2FuZGlkYXRlSW5pdC5jYW5kaWRhdGUgaXMgcmVxdWlyZWQgYW5kIG11c3QgYmUgYW4g aW5zdGFuY2Ugb2YgRE9NU3RyaW5nLgotCiBPbmUgb2YgdGhlICdzZHBNaWQnIG9yICdzZHBNTGlu ZUluZGV4JyBtZW1iZXJzIG11c3QgYmUgcHJlc2VudCAoYW5kIG5vdCBudWxsIG9yIHVuZGVmaW5l ZCkuCiBQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToiZm9vIn0pOyB0aHJldyBl eGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgogUEFTUyBuZXcgUlRDSWNlQ2FuZGlkYXRl KHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogbnVsbH0pOyB0aHJldyBleGNlcHRpb24gVHlwZUVy cm9yOiBUeXBlIGVycm9yLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVh bS9SVENJY2VDYW5kaWRhdGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRD SWNlQ2FuZGlkYXRlLmh0bWwKaW5kZXggM2JiOWU0ZWVmNmQ0NDYxOTFiODNiMDBjNjI4Y2NmOTUy MjM3MDZjYi4uMGMxNWRjNDJjYjRmYzY0Y2Q5NTViNTkxNWI3NWY0MWI0ODUxNjRhZiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5odG1sCkBA IC01NCwxMyArNTQsNiBAQAogICAgICAgICAgICAgZGVidWcoIkRpY3Rpb25hcnkgYXJndW1lbnQg aXMgbWFuZGF0b3J5LiIpOwogICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJY2VDYW5k aWRhdGUoKTsnKTsKIAotICAgICAgICAgICAgZGVidWcoIkRpY3Rpb25hcnkgbWVtYmVyICdjYW5k aWRhdGUnIGlzIHJlcXVpcmVkLiIpOwotICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJ Y2VDYW5kaWRhdGUoe30pOycpOwotICAgICAgICAgICAgc2hvdWxkVGhyb3coJ25ldyBSVENJY2VD YW5kaWRhdGUoe3NkcE1pZDoiYmFyIiwgc2RwTUxpbmVJbmRleDo2fSk7Jyk7Ci0gICAgICAgICAg ICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTWlkOiJiYXIifSk7Jyk7Ci0g ICAgICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTUxpbmVJbmRl eDo2fSk7Jyk7Ci0gICAgICAgICAgICBkZWJ1ZygiIik7Ci0KICAgICAgICAgICAgIGRlYnVnKCJP bmUgb2YgdGhlICdzZHBNaWQnIG9yICdzZHBNTGluZUluZGV4JyBtZW1iZXJzIG11c3QgYmUgcHJl c2VudCAoYW5kIG5vdCBudWxsIG9yIHVuZGVmaW5lZCkuIik7CiAgICAgICAgICAgICBzaG91bGRU aHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28ifSk7Jyk7CiAgICAgICAg ICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28iLCBz ZHBNaWQ6IG51bGx9KTsnKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJl YW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkSWNlQ2FuZGlkYXRlLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkSWNlQ2FuZGlkYXRl LWV4cGVjdGVkLnR4dAppbmRleCBhNzI5MmVhNDlhMWFiYzNlMjI2ZDM5MWNlYWZjMGUwMDNiMjll ZjI3Li5kZjZjNDFhMTY5NWJlMDk5ZTg1NWJiOTY0YjRhNjBhNTExOGE5NzE4IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNh bmRpZGF0ZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0CkBAIC0xOCwxMiAr MTgsMTcgQEAgRkFJTCBwcm9taXNlIHBjLmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlk YXRlKHtjYW5kaWRhdGU6IHZhbGlkQ2FuZGlkYXRlLAogKioqIEEgKGJhZCkgc2RwTWlkIHRha2Vz IHByZWNlZGVzY2Ugb3ZlciB2YWxpZCBzZHBNTGluZUluZGV4CiBGQUlMIHByb21pc2UgcGMuYWRk SWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRh dGUsIHNkcE1pZDogYmFkU2RwTWlkLCBzZHBNTGluZUluZGV4OiBzZHBNTGluZUluZGV4fSkpIGZ1 bGZpbGxlZCB1bmV4cGVjdGVkbHkuCiAqKiogVGVzdCBiYWQgY2FuZGlkYXRlIGNvbnRlbnQgd2l0 aCB2YWxpZCBzZHBNaWQKLUZBSUwgZXZhbHVhdGluZyBwYy5hZGRJY2VDYW5kaWRhdGUobmV3IFJU Q0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiAnYmFkIGNvbnRlbnQnLCBzZHBNaWQ6IHNkcE1pZH0p KSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yCitQQVNTIHByb21pc2UgcGMu YWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogJ2JhZCBjb250 ZW50Jywgc2RwTWlkOiBzZHBNaWR9KSkgcmVqZWN0ZWQgd2l0aCBPcGVyYXRpb25FcnJvciAoRE9N IEV4Y2VwdGlvbiAzNCk6IEV4cGVjdCBsaW5lOiBjYW5kaWRhdGU6PGNhbmRpZGF0ZS1zdHI+CiAq KiogVGVzdCBiYWQgY2FuZGlkYXRlIGNvbnRlbnQgd2l0aCB2YWxpZCBzZHBNTGluZUluZGV4CiBQ QVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRp ZGF0ZTogJ2JhZCBjb250ZW50Jywgc2RwTUxpbmVJbmRleDogc2RwTUxpbmVJbmRleH0pKSByZWpl Y3RlZCB3aXRoIE9wZXJhdGlvbkVycm9yIChET00gRXhjZXB0aW9uIDM0KTogRXhwZWN0IGxpbmU6 IGNhbmRpZGF0ZTo8Y2FuZGlkYXRlLXN0cj4KKyoqKiBUZXN0IHZhbGlkIGNhbmRpZGF0ZSB3aXRo IG5vIG1pZCBhbmQgbWxpbmVpbmRleAorUEFTUyBwcm9taXNlIHBjLmFkZEljZUNhbmRpZGF0ZSh7 Y2FuZGlkYXRlOiB2YWxpZENhbmRpZGF0ZX0pIHJlamVjdGVkIHdpdGggVHlwZUVycm9yOiBBcmd1 bWVudCAxICgnY2FuZGlkYXRlJykgdG8gUlRDUGVlckNvbm5lY3Rpb24uYWRkSWNlQ2FuZGlkYXRl IG11c3QgYmUgYW4gaW5zdGFuY2Ugb2YgUlRDSWNlQ2FuZGlkYXRlCiAKICoqKiBUZXN0IHNvbWUg T0sgaW5wdXQKLUZBSUwgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFs aWRDYW5kaWRhdGUsIHNkcE1pZDogc2RwTWlkfSkgcmVqZWN0ZWQgdW5leHBlY3RlZGx5LgorUEFT UyBwcm9taXNlIHBjLmFkZEljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiB2YWxpZENhbmRpZGF0ZSwg c2RwTWlkOiBzZHBNaWR9KSBmdWxmaWxsZWQgd2l0aCB1bmRlZmluZWQKK1BBU1MgcHJvbWlzZSBw Yy5hZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1MaW5lSW5k ZXg6IHNkcE1MaW5lSW5kZXh9KSBmdWxmaWxsZWQgd2l0aCB1bmRlZmluZWQKK1BBU1MgcHJvbWlz ZSBwYy5hZGRJY2VDYW5kaWRhdGUodW5kZWZpbmVkKSBmdWxmaWxsZWQgd2l0aCB1bmRlZmluZWQK K1BBU1MgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUobnVsbCkgZnVsZmlsbGVkIHdpdGggdW5k ZWZpbmVkCiBQQVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRh dGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5k ZXh9KSkgZnVsZmlsbGVkIHdpdGggdW5kZWZpbmVkCiAqKiogQSB2YWxpZCBzZHBNaWQgdGFrZXMg cHJlY2VkZXNjZSBvdmVyIGEgYmFkIHNkcE1MaW5lSW5kZXgKIFBBU1MgcHJvbWlzZSBwYy5hZGRJ Y2VDYW5kaWRhdGUobmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiB2YWxpZENhbmRpZGF0 ZSwgc2RwTWlkOiBzZHBNaWQsIHNkcE1MaW5lSW5kZXg6IGJhZFNkcE1MaW5lSW5kZXh9KSkgZnVs ZmlsbGVkIHdpdGggdW5kZWZpbmVkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlh c3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUuaHRt bAppbmRleCA5Y2RlYWU5YjQ2OGY0YzAxYjk0YjI1Y2UxYjZmNzEwYjk1NjhiMWFiLi4zODg3OWNm M2ZhMGNmOWNmYmQ5OGYzMzk4MmFmOTIzOTU1M2ZmMDU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS5odG1s CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRk SWNlQ2FuZGlkYXRlLmh0bWwKQEAgLTU1LDYgKzU1LDggQEAKICAgICAgICAgICAgICAgICBiYWRT ZHBNaWQgPSBzZHBNaWQgKyAiX2ZvbyI7CiAgICAgICAgICAgICAgICAgc2hvdWxkTm90QmUoInNk cE1pZCIsICJiYWRTZHBNaWQiKTsKIAorICAgICAgICAgICAgICAgIHNkcE1pZCA9IDE7CisKICAg ICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJlamVjdCgicGMuYWRkSWNlQ2FuZGlk YXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1p ZDogYmFkU2RwTWlkfSkpIik7CiAgICAgICAgICAgICB9KQogICAgICAgICAgICAgLnRoZW4oZnVu Y3Rpb24gKCkgewpAQCAtNzMsMTEgKzc1LDI0IEBACiAgICAgICAgICAgICAgICAgcmV0dXJuIHBy b21pc2VTaG91bGRSZWplY3QoInBjLmFkZEljZUNhbmRpZGF0ZShuZXcgUlRDSWNlQ2FuZGlkYXRl KHtjYW5kaWRhdGU6ICdiYWQgY29udGVudCcsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5kZXh9 KSkiKTsKICAgICAgICAgICAgIH0pCiAgICAgICAgICAgICAudGhlbihmdW5jdGlvbiAoKSB7Cisg ICAgICAgICAgICAgICAgZGVidWcoIioqKiBUZXN0IHZhbGlkIGNhbmRpZGF0ZSB3aXRoIG5vIG1p ZCBhbmQgbWxpbmVpbmRleCIpOworICAgICAgICAgICAgICAgIHJldHVybiBwcm9taXNlU2hvdWxk UmVqZWN0KCJwYy5hZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGV9KSIp OworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uICgpIHsKICAgICAg ICAgICAgICAgICBkZWJ1ZygiPGJyPioqKiBUZXN0IHNvbWUgT0sgaW5wdXQiKTsKICAgICAgICAg ICAgICAgICAvLyBUZXN0aW5nIHBhc3NpbmcgYSBSVENJY2VDYW5kaWRhdGVJbml0CiAgICAgICAg ICAgICAgICAgcmV0dXJuIHByb21pc2VTaG91bGRSZXNvbHZlKCJwYy5hZGRJY2VDYW5kaWRhdGUo e2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1pZDogc2RwTWlkfSkiKTsKICAgICAgICAg ICAgIH0pCiAgICAgICAgICAgICAudGhlbihmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICAgICAg cmV0dXJuIHByb21pc2VTaG91bGRSZXNvbHZlKCJwYy5hZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0 ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5kZXh9KSIpOworICAg ICAgICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uICgpIHsKKyAgICAgICAgICAg ICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJlc29sdmUoInBjLmFkZEljZUNhbmRpZGF0ZSh1bmRl ZmluZWQpIik7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKCkg eworICAgICAgICAgICAgICAgIHJldHVybiBwcm9taXNlU2hvdWxkUmVzb2x2ZSgicGMuYWRkSWNl Q2FuZGlkYXRlKG51bGwpIik7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4oZnVu Y3Rpb24gKCkgewogICAgICAgICAgICAgICAgIC8vIFRlc3RpbmcgcGFzc2luZyBhIFJUQ0ljZUNh bmRpZGF0ZQogICAgICAgICAgICAgICAgIHJldHVybiBwcm9taXNlU2hvdWxkUmVzb2x2ZSgicGMu YWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5k aWRhdGUsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5kZXh9KSkiKTsKICAgICAgICAgICAgIH0p CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL3Jlc291cmNlcy9wcm9t aXNlLXV0aWxzLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNvdXJjZXMvcHJv bWlzZS11dGlscy5qcwppbmRleCBmZDBjMzk2NmVhYjEyYTVhODdmMDM0YWYwOWI5Njc2N2JhNGNj ZWQxLi5kMzcxYzQzZTM3ODI0YjQ0YTIzOWU4MTgwZDFmMzZjODkyYWJlYmYyIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL3Jlc291cmNlcy9wcm9taXNlLXV0aWxzLmpz CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vcmVzb3VyY2VzL3Byb21pc2UtdXRp bHMuanMKQEAgLTI4LDcgKzI4LDcgQEAgZnVuY3Rpb24gcHJvbWlzZVNob3VsZFJlc29sdmUoZXhw cikgewogICAgICAgICAgICAgZG9uZSgpOwogICAgICAgICB9KQogICAgICAgICAuY2F0Y2goZnVu Y3Rpb24gKHJlYXNvbikgewotICAgICAgICAgICAgdGVzdEZhaWxlZCgicHJvbWlzZSAiICsgZXhw ciArICIgcmVqZWN0ZWQgdW5leHBlY3RlZGx5LiIpOworICAgICAgICAgICAgdGVzdEZhaWxlZCgi cHJvbWlzZSAiICsgZXhwciArICIgcmVqZWN0ZWQgdW5leHBlY3RlZGx5OiIgKyByZWFzb24pOwog ICAgICAgICAgICAgZG9uZSgpOwogICAgICAgICB9KTsKICAgICB9KTsK 305701 2017-03-28 20:27:57 -0700 2017-03-28 21:09:18 -0700 Patch for landing bug-170192-20170328202757.patch text/plain 12141 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA0NDA5ZmE5MGU1YjBl Nzc5NjgwNTNjMTMxMTQxMmMyZTJlZGE2NC4uOWJmMGY4ZjBjZjg2NmU2ZDUwMWYwMDUzOTgwZTRj ZmZmYzUxZjUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTAzLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViUlRDXSBBZnRlciBy MjE0NDQxIGFkZEljZUNhbmRpZGF0ZSBubyBsb25nZXIgYWNjZXB0cyBhbiBSVENJY2VDYW5kaWRh dGVJbml0IGRpY3Rpb25hcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MDE5MgorCisgICAgICAgIFJldmlld2VkIGJ5IEpvbiBMZWUuCisKKyAgICAg ICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENJY2VDYW5kaWRhdGUuaWRsOiBDYW5kaWRhdGUgaXMgbm8gbG9uZ2VyIGEgcmVxdWly ZWQgZmllbGQgaW4gUlRDSWNlQ2FuZGlkYXRlSW5pdC4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uSW50ZXJuYWxzLmpzOiBSZXdvcmtpbmcgZGVmYXVsdHNU b051bGwgdG8gaGFuZGxlIGJvdGggdW5kZWZpbmVkIGFuZCBudWxsIGNhc2VzLgorCiAyMDE3LTAz LTI3ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkg YXR0YWNoIEF0dHJpYnV0ZXMgdG8gYSBnaXZlbiBlbGVtZW50IG9uZSB0aW1lCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5pZGwg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5pZGwK aW5kZXggNzllZjEzOWFhODBkN2ExOTQyZTIyNGNkYWU5OGY3OTRhNGNlZDRkOC4uNDdkNDRiNzdk ZmZhZjlkMGFjMGFlYjk1YzE4MTdhMDJiYjEyNjUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuaWRsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmlkbApAQCAtNjEsOCAr NjEsNyBAQAogICAgIENvbmRpdGlvbmFsPVdFQl9SVEMsCiAgICAgRW5hYmxlZEF0UnVudGltZT1Q ZWVyQ29ubmVjdGlvbgogXSBkaWN0aW9uYXJ5IFJUQ0ljZUNhbmRpZGF0ZUluaXQgewotICAgIC8v IEZJWE1FIDE2OTY2Mjogbm8gbG9uZ2VyIHJlcXVpcmVkLCB3aXRoIGRlZmF1bHQgc3RyaW5nCi0g ICAgcmVxdWlyZWQgRE9NU3RyaW5nIGNhbmRpZGF0ZTsKKyAgICBET01TdHJpbmcgY2FuZGlkYXRl ID0gIiI7CiAgICAgRE9NU3RyaW5nPyBzZHBNaWQgPSBudWxsOwogICAgIHVuc2lnbmVkIHNob3J0 PyBzZHBNTGluZUluZGV4ID0gbnVsbDsKICAgICAvLyBGSVhNRSAxNjk2NjI6IG1pc3NpbmcgdWZy YWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb25JbnRlcm5hbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1BlZXJDb25uZWN0aW9uSW50ZXJuYWxzLmpzCmluZGV4IDk5NjcxZWJlZTMyYzNlNThi Mjg4YWJiZjIyYTNlZmY2M2UwOGExM2MuLjM2MjllN2JlZmIyNGRiNjlmOGUwNDBkYTljMTFlYjcy OWQwYjY3OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb25JbnRlcm5hbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbkludGVybmFscy5qcwpAQCAtNjIsMjYgKzYy LDE4IEBAIGZ1bmN0aW9uIG9iamVjdEFuZENhbGxiYWNrc092ZXJsb2FkKGFyZ3MsIGZ1bmN0aW9u TmFtZSwgb2JqZWN0SW5mbywgcHJvbWlzZU1vZGUsCiAgICAgbGV0IG9iamVjdEFyZyA9IGFyZ3Nb MF07CiAgICAgbGV0IG9iamVjdEFyZ09rID0gZmFsc2U7CiAKLSAgICBpZiAoIWFyZ3NDb3VudCkg ewotICAgICAgICBpZiAoIW9iamVjdEluZm8uZGVmYXVsdHNUb051bGwpCi0gICAgICAgICAgICBy ZXR1cm4gQFByb21pc2UuQHJlamVjdChuZXcgQFR5cGVFcnJvcigiTm90IGVub3VnaCBhcmd1bWVu dHMiKSk7Ci0KLSAgICAgICAgb2JqZWN0QXJnID0gbnVsbDsKKyAgICBjb25zdCBoYXNNYXRjaGlu Z1R5cGUgPSBvYmplY3RBcmcgaW5zdGFuY2VvZiBvYmplY3RJbmZvLmNvbnN0cnVjdG9yOworICAg IGlmIChoYXNNYXRjaGluZ1R5cGUpCiAgICAgICAgIG9iamVjdEFyZ09rID0gdHJ1ZTsKLSAgICAg ICAgYXJnc0NvdW50ID0gMTsKLSAgICB9IGVsc2UgewotICAgICAgICBjb25zdCBoYXNNYXRjaGlu Z1R5cGUgPSBvYmplY3RBcmcgaW5zdGFuY2VvZiBvYmplY3RJbmZvLmNvbnN0cnVjdG9yOwotICAg ICAgICBpZiAoaGFzTWF0Y2hpbmdUeXBlKQorICAgIGVsc2UgaWYgKG9iamVjdEFyZyA9PSBudWxs ICYmIG9iamVjdEluZm8uZGVmYXVsdHNUb051bGwpIHsKKyAgICAgICAgb2JqZWN0QXJnT2sgPSB0 cnVlOworICAgICAgICBvYmplY3RBcmcgPSBudWxsOworICAgIH0gZWxzZSBpZiAob2JqZWN0SW5m by5tYXliZURpY3Rpb25hcnkpIHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIG9iamVjdEFy ZyA9IG5ldyBvYmplY3RJbmZvLmNvbnN0cnVjdG9yKG9iamVjdEFyZyk7CiAgICAgICAgICAgICBv YmplY3RBcmdPayA9IHRydWU7Ci0gICAgICAgIGVsc2UgaWYgKG9iamVjdEluZm8uZGVmYXVsdHNU b051bGwpCi0gICAgICAgICAgICBvYmplY3RBcmdPayA9IG9iamVjdEFyZyA9PT0gbnVsbCB8fCB0 eXBlb2Ygb2JqZWN0QXJnID09PSAidW5kZWZpbmVkIjsKLSAgICAgICAgZWxzZSBpZiAob2JqZWN0 SW5mby5tYXliZURpY3Rpb25hcnkpIHsKLSAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAg ICAgb2JqZWN0QXJnID0gbmV3IG9iamVjdEluZm8uY29uc3RydWN0b3Iob2JqZWN0QXJnKTsKLSAg ICAgICAgICAgICAgICBvYmplY3RBcmdPayA9IHRydWU7Ci0gICAgICAgICAgICB9IGNhdGNoIChl KSB7Ci0gICAgICAgICAgICAgICAgb2JqZWN0QXJnT2sgPSBmYWxzZTsKLSAgICAgICAgICAgIH0K KyAgICAgICAgfSBjYXRjaCAoZSkgeworICAgICAgICAgICAgb2JqZWN0QXJnT2sgPSBmYWxzZTsK ICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZjZmMyMGI5MjA1MDRlNDYyYmM1ODU5MzU4YjNl MWQ1MDkwZGM2ZTEuLjEwNzI2ZWNlMmMzZGM2N2YxY2IxNjY5OTViNjk2N2QzMDA5ZTAyNGYgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNy0wMy0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CisKKyAgICAgICAgW1dlYlJUQ10gQWZ0ZXIgcjIxNDQ0MSBhZGRJY2VDYW5kaWRh dGUgbm8gbG9uZ2VyIGFjY2VwdHMgYW4gUlRDSWNlQ2FuZGlkYXRlSW5pdCBkaWN0aW9uYXJ5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAxOTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBKb24gTGVlLgorCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVh bS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJl YW0vUlRDSWNlQ2FuZGlkYXRlLmh0bWw6IFJlbW92aW5nIG5vIGxvbmdlciB2YWxpZCB0ZXN0cy4K KyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRp ZGF0ZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29u bmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUuaHRtbDogQWRkaW5nIG1vcmUgdGVzdHMgdG8gY292ZXIg bnVsbC91bmRlZmluZWQgY2FzZXMuCisgICAgICAgIEVuc3VyaW5nIHNkcE1pZCBoYXMgYSB2YWxp ZCB2YWx1ZS4KKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL3Jlc291cmNlcy9wcm9taXNlLXV0 aWxzLmpzOiBJbXByb3ZpbmcgZXJyb3IgbG9nZ2luZy4KKwogMjAxNy0wMy0yNyAgQnJlbnQgRnVs Z2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IGF0dGFjaCBBdHRyaWJ1 dGVzIHRvIGEgZ2l2ZW4gZWxlbWVudCBvbmUgdGltZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUtZXhwZWN0ZWQudHh0CmluZGV4IDQw NjIyMzk2NmJlMTQ5NDcwMWMyYWQzZmE3YjZkYTE2YjE2YzcyYWIuLjBiNGQ4ZDQ4M2Y5MTc5ZWQ0 NTkxNWZmZGM3NDI0YmI4ZTk1NDY3OTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVk aWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQKQEAgLTMzLDEyICsz Myw2IEBAIFBBU1MgY2FuZGlkYXRlLnNkcE1MaW5lSW5kZXggaXMgNgogCiBEaWN0aW9uYXJ5IGFy Z3VtZW50IGlzIG1hbmRhdG9yeS4KIFBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSgpOyB0aHJldyBl eGNlcHRpb24gVHlwZUVycm9yOiBOb3QgZW5vdWdoIGFyZ3VtZW50cy4KLURpY3Rpb25hcnkgbWVt YmVyICdjYW5kaWRhdGUnIGlzIHJlcXVpcmVkLgotUEFTUyBuZXcgUlRDSWNlQ2FuZGlkYXRlKHt9 KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogTWVtYmVyIFJUQ0ljZUNhbmRpZGF0ZUluaXQu Y2FuZGlkYXRlIGlzIHJlcXVpcmVkIGFuZCBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIERPTVN0cmlu Zy4KLVBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTWlkOiJiYXIiLCBzZHBNTGluZUluZGV4 OjZ9KTsgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogTWVtYmVyIFJUQ0ljZUNhbmRpZGF0ZUlu aXQuY2FuZGlkYXRlIGlzIHJlcXVpcmVkIGFuZCBtdXN0IGJlIGFuIGluc3RhbmNlIG9mIERPTVN0 cmluZy4KLVBBU1MgbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTWlkOiJiYXIifSk7IHRocmV3IGV4 Y2VwdGlvbiBUeXBlRXJyb3I6IE1lbWJlciBSVENJY2VDYW5kaWRhdGVJbml0LmNhbmRpZGF0ZSBp cyByZXF1aXJlZCBhbmQgbXVzdCBiZSBhbiBpbnN0YW5jZSBvZiBET01TdHJpbmcuCi1QQVNTIG5l dyBSVENJY2VDYW5kaWRhdGUoe3NkcE1MaW5lSW5kZXg6Nn0pOyB0aHJldyBleGNlcHRpb24gVHlw ZUVycm9yOiBNZW1iZXIgUlRDSWNlQ2FuZGlkYXRlSW5pdC5jYW5kaWRhdGUgaXMgcmVxdWlyZWQg YW5kIG11c3QgYmUgYW4gaW5zdGFuY2Ugb2YgRE9NU3RyaW5nLgotCiBPbmUgb2YgdGhlICdzZHBN aWQnIG9yICdzZHBNTGluZUluZGV4JyBtZW1iZXJzIG11c3QgYmUgcHJlc2VudCAoYW5kIG5vdCBu dWxsIG9yIHVuZGVmaW5lZCkuCiBQQVNTIG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZToi Zm9vIn0pOyB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgogUEFTUyBuZXcg UlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ImZvbyIsIHNkcE1pZDogbnVsbH0pOyB0aHJldyBl eGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VDYW5kaWRhdGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv bWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmh0bWwKaW5kZXggM2JiOWU0ZWVmNmQ0NDYxOTFi ODNiMDBjNjI4Y2NmOTUyMjM3MDZjYi4uMGMxNWRjNDJjYjRmYzY0Y2Q5NTViNTkxNWI3NWY0MWI0 ODUxNjRhZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENJY2VD YW5kaWRhdGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ0ljZUNh bmRpZGF0ZS5odG1sCkBAIC01NCwxMyArNTQsNiBAQAogICAgICAgICAgICAgZGVidWcoIkRpY3Rp b25hcnkgYXJndW1lbnQgaXMgbWFuZGF0b3J5LiIpOwogICAgICAgICAgICAgc2hvdWxkVGhyb3co J25ldyBSVENJY2VDYW5kaWRhdGUoKTsnKTsKIAotICAgICAgICAgICAgZGVidWcoIkRpY3Rpb25h cnkgbWVtYmVyICdjYW5kaWRhdGUnIGlzIHJlcXVpcmVkLiIpOwotICAgICAgICAgICAgc2hvdWxk VGhyb3coJ25ldyBSVENJY2VDYW5kaWRhdGUoe30pOycpOwotICAgICAgICAgICAgc2hvdWxkVGhy b3coJ25ldyBSVENJY2VDYW5kaWRhdGUoe3NkcE1pZDoiYmFyIiwgc2RwTUxpbmVJbmRleDo2fSk7 Jyk7Ci0gICAgICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7c2RwTWlk OiJiYXIifSk7Jyk7Ci0gICAgICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0 ZSh7c2RwTUxpbmVJbmRleDo2fSk7Jyk7Ci0gICAgICAgICAgICBkZWJ1ZygiIik7Ci0KICAgICAg ICAgICAgIGRlYnVnKCJPbmUgb2YgdGhlICdzZHBNaWQnIG9yICdzZHBNTGluZUluZGV4JyBtZW1i ZXJzIG11c3QgYmUgcHJlc2VudCAoYW5kIG5vdCBudWxsIG9yIHVuZGVmaW5lZCkuIik7CiAgICAg ICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiJmb28i fSk7Jyk7CiAgICAgICAgICAgICBzaG91bGRUaHJvdygnbmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2Fu ZGlkYXRlOiJmb28iLCBzZHBNaWQ6IG51bGx9KTsnKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkSWNlQ2FuZGlkYXRlLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24t YWRkSWNlQ2FuZGlkYXRlLWV4cGVjdGVkLnR4dAppbmRleCBhNzI5MmVhNDlhMWFiYzNlMjI2ZDM5 MWNlYWZjMGUwMDNiMjllZjI3Li5kZjZjNDFhMTY5NWJlMDk5ZTg1NWJiOTY0YjRhNjBhNTExOGE5 NzE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25u ZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJY2VDYW5kaWRhdGUtZXhwZWN0ZWQu dHh0CkBAIC0xOCwxMiArMTgsMTcgQEAgRkFJTCBwcm9taXNlIHBjLmFkZEljZUNhbmRpZGF0ZShu ZXcgUlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6IHZhbGlkQ2FuZGlkYXRlLAogKioqIEEgKGJh ZCkgc2RwTWlkIHRha2VzIHByZWNlZGVzY2Ugb3ZlciB2YWxpZCBzZHBNTGluZUluZGV4CiBGQUlM IHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0 ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1pZDogYmFkU2RwTWlkLCBzZHBNTGluZUluZGV4OiBzZHBN TGluZUluZGV4fSkpIGZ1bGZpbGxlZCB1bmV4cGVjdGVkbHkuCiAqKiogVGVzdCBiYWQgY2FuZGlk YXRlIGNvbnRlbnQgd2l0aCB2YWxpZCBzZHBNaWQKLUZBSUwgZXZhbHVhdGluZyBwYy5hZGRJY2VD YW5kaWRhdGUobmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiAnYmFkIGNvbnRlbnQnLCBz ZHBNaWQ6IHNkcE1pZH0pKSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yCitQ QVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRp ZGF0ZTogJ2JhZCBjb250ZW50Jywgc2RwTWlkOiBzZHBNaWR9KSkgcmVqZWN0ZWQgd2l0aCBPcGVy YXRpb25FcnJvciAoRE9NIEV4Y2VwdGlvbiAzNCk6IEV4cGVjdCBsaW5lOiBjYW5kaWRhdGU6PGNh bmRpZGF0ZS1zdHI+CiAqKiogVGVzdCBiYWQgY2FuZGlkYXRlIGNvbnRlbnQgd2l0aCB2YWxpZCBz ZHBNTGluZUluZGV4CiBQQVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VD YW5kaWRhdGUoe2NhbmRpZGF0ZTogJ2JhZCBjb250ZW50Jywgc2RwTUxpbmVJbmRleDogc2RwTUxp bmVJbmRleH0pKSByZWplY3RlZCB3aXRoIE9wZXJhdGlvbkVycm9yIChET00gRXhjZXB0aW9uIDM0 KTogRXhwZWN0IGxpbmU6IGNhbmRpZGF0ZTo8Y2FuZGlkYXRlLXN0cj4KKyoqKiBUZXN0IHZhbGlk IGNhbmRpZGF0ZSB3aXRoIG5vIG1pZCBhbmQgbWxpbmVpbmRleAorUEFTUyBwcm9taXNlIHBjLmFk ZEljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiB2YWxpZENhbmRpZGF0ZX0pIHJlamVjdGVkIHdpdGgg VHlwZUVycm9yOiBBcmd1bWVudCAxICgnY2FuZGlkYXRlJykgdG8gUlRDUGVlckNvbm5lY3Rpb24u YWRkSWNlQ2FuZGlkYXRlIG11c3QgYmUgYW4gaW5zdGFuY2Ugb2YgUlRDSWNlQ2FuZGlkYXRlCiAK ICoqKiBUZXN0IHNvbWUgT0sgaW5wdXQKLUZBSUwgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUo e2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1pZDogc2RwTWlkfSkgcmVqZWN0ZWQgdW5l eHBlY3RlZGx5LgorUEFTUyBwcm9taXNlIHBjLmFkZEljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRlOiB2 YWxpZENhbmRpZGF0ZSwgc2RwTWlkOiBzZHBNaWR9KSBmdWxmaWxsZWQgd2l0aCB1bmRlZmluZWQK K1BBU1MgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRh dGUsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5kZXh9KSBmdWxmaWxsZWQgd2l0aCB1bmRlZmlu ZWQKK1BBU1MgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUodW5kZWZpbmVkKSBmdWxmaWxsZWQg d2l0aCB1bmRlZmluZWQKK1BBU1MgcHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUobnVsbCkgZnVs ZmlsbGVkIHdpdGggdW5kZWZpbmVkCiBQQVNTIHByb21pc2UgcGMuYWRkSWNlQ2FuZGlkYXRlKG5l dyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1MaW5lSW5k ZXg6IHNkcE1MaW5lSW5kZXh9KSkgZnVsZmlsbGVkIHdpdGggdW5kZWZpbmVkCiAqKiogQSB2YWxp ZCBzZHBNaWQgdGFrZXMgcHJlY2VkZXNjZSBvdmVyIGEgYmFkIHNkcE1MaW5lSW5kZXgKIFBBU1Mg cHJvbWlzZSBwYy5hZGRJY2VDYW5kaWRhdGUobmV3IFJUQ0ljZUNhbmRpZGF0ZSh7Y2FuZGlkYXRl OiB2YWxpZENhbmRpZGF0ZSwgc2RwTWlkOiBzZHBNaWQsIHNkcE1MaW5lSW5kZXg6IGJhZFNkcE1M aW5lSW5kZXh9KSkgZnVsZmlsbGVkIHdpdGggdW5kZWZpbmVkCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZEljZUNhbmRpZGF0ZS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRJ Y2VDYW5kaWRhdGUuaHRtbAppbmRleCA5Y2RlYWU5YjQ2OGY0YzAxYjk0YjI1Y2UxYjZmNzEwYjk1 NjhiMWFiLi4zODg3OWNmM2ZhMGNmOWNmYmQ5OGYzMzk4MmFmOTIzOTU1M2ZmMDU1IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZElj ZUNhbmRpZGF0ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb24tYWRkSWNlQ2FuZGlkYXRlLmh0bWwKQEAgLTU1LDYgKzU1LDggQEAKICAgICAg ICAgICAgICAgICBiYWRTZHBNaWQgPSBzZHBNaWQgKyAiX2ZvbyI7CiAgICAgICAgICAgICAgICAg c2hvdWxkTm90QmUoInNkcE1pZCIsICJiYWRTZHBNaWQiKTsKIAorICAgICAgICAgICAgICAgIHNk cE1pZCA9IDE7CisKICAgICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJlamVjdCgi cGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRD YW5kaWRhdGUsIHNkcE1pZDogYmFkU2RwTWlkfSkpIik7CiAgICAgICAgICAgICB9KQogICAgICAg ICAgICAgLnRoZW4oZnVuY3Rpb24gKCkgewpAQCAtNzMsMTEgKzc1LDI0IEBACiAgICAgICAgICAg ICAgICAgcmV0dXJuIHByb21pc2VTaG91bGRSZWplY3QoInBjLmFkZEljZUNhbmRpZGF0ZShuZXcg UlRDSWNlQ2FuZGlkYXRlKHtjYW5kaWRhdGU6ICdiYWQgY29udGVudCcsIHNkcE1MaW5lSW5kZXg6 IHNkcE1MaW5lSW5kZXh9KSkiKTsKICAgICAgICAgICAgIH0pCiAgICAgICAgICAgICAudGhlbihm dW5jdGlvbiAoKSB7CisgICAgICAgICAgICAgICAgZGVidWcoIioqKiBUZXN0IHZhbGlkIGNhbmRp ZGF0ZSB3aXRoIG5vIG1pZCBhbmQgbWxpbmVpbmRleCIpOworICAgICAgICAgICAgICAgIHJldHVy biBwcm9taXNlU2hvdWxkUmVqZWN0KCJwYy5hZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFs aWRDYW5kaWRhdGV9KSIpOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKGZ1bmN0 aW9uICgpIHsKICAgICAgICAgICAgICAgICBkZWJ1ZygiPGJyPioqKiBUZXN0IHNvbWUgT0sgaW5w dXQiKTsKICAgICAgICAgICAgICAgICAvLyBUZXN0aW5nIHBhc3NpbmcgYSBSVENJY2VDYW5kaWRh dGVJbml0CiAgICAgICAgICAgICAgICAgcmV0dXJuIHByb21pc2VTaG91bGRSZXNvbHZlKCJwYy5h ZGRJY2VDYW5kaWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1pZDogc2RwTWlk fSkiKTsKICAgICAgICAgICAgIH0pCiAgICAgICAgICAgICAudGhlbihmdW5jdGlvbiAoKSB7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIHByb21pc2VTaG91bGRSZXNvbHZlKCJwYy5hZGRJY2VDYW5k aWRhdGUoe2NhbmRpZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5l SW5kZXh9KSIpOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uICgp IHsKKyAgICAgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVNob3VsZFJlc29sdmUoInBjLmFkZElj ZUNhbmRpZGF0ZSh1bmRlZmluZWQpIik7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRo ZW4oZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIHJldHVybiBwcm9taXNlU2hvdWxkUmVz b2x2ZSgicGMuYWRkSWNlQ2FuZGlkYXRlKG51bGwpIik7CisgICAgICAgICAgICB9KQorICAgICAg ICAgICAgLnRoZW4oZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgICAgIC8vIFRlc3RpbmcgcGFz c2luZyBhIFJUQ0ljZUNhbmRpZGF0ZQogICAgICAgICAgICAgICAgIHJldHVybiBwcm9taXNlU2hv dWxkUmVzb2x2ZSgicGMuYWRkSWNlQ2FuZGlkYXRlKG5ldyBSVENJY2VDYW5kaWRhdGUoe2NhbmRp ZGF0ZTogdmFsaWRDYW5kaWRhdGUsIHNkcE1MaW5lSW5kZXg6IHNkcE1MaW5lSW5kZXh9KSkiKTsK ICAgICAgICAgICAgIH0pCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFt L3Jlc291cmNlcy9wcm9taXNlLXV0aWxzLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVh bS9yZXNvdXJjZXMvcHJvbWlzZS11dGlscy5qcwppbmRleCBmZDBjMzk2NmVhYjEyYTVhODdmMDM0 YWYwOWI5Njc2N2JhNGNjZWQxLi5kMzcxYzQzZTM3ODI0YjQ0YTIzOWU4MTgwZDFmMzZjODkyYWJl YmYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL3Jlc291cmNlcy9w cm9taXNlLXV0aWxzLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vcmVzb3Vy Y2VzL3Byb21pc2UtdXRpbHMuanMKQEAgLTI4LDcgKzI4LDcgQEAgZnVuY3Rpb24gcHJvbWlzZVNo b3VsZFJlc29sdmUoZXhwcikgewogICAgICAgICAgICAgZG9uZSgpOwogICAgICAgICB9KQogICAg ICAgICAuY2F0Y2goZnVuY3Rpb24gKHJlYXNvbikgewotICAgICAgICAgICAgdGVzdEZhaWxlZCgi cHJvbWlzZSAiICsgZXhwciArICIgcmVqZWN0ZWQgdW5leHBlY3RlZGx5LiIpOworICAgICAgICAg ICAgdGVzdEZhaWxlZCgicHJvbWlzZSAiICsgZXhwciArICIgcmVqZWN0ZWQgdW5leHBlY3RlZGx5 OiIgKyByZWFzb24pOwogICAgICAgICAgICAgZG9uZSgpOwogICAgICAgICB9KTsKICAgICB9KTsK