127113 2014-01-16 09:08:16 -0800 Allow MediaSessionManager to restrict inline <video> playback 2014-01-16 15:03:37 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson commit-queue esprehn+autocc glenn gyuyoung.kim jer.noble oldest_to_newest 968782 0 eric.carlson 2014-01-16 09:08:16 -0800 Some platforms do not allow a <video> element to play inline. Have MediaSessionManager handle this. 968783 1 221382 eric.carlson 2014-01-16 09:20:49 -0800 Created attachment 221382 Proposed patch 968785 2 commit-queue 2014-01-16 09:23:14 -0800 Attachment 221382 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/media/video-fullscreeen-only-playback-expected.txt', u'LayoutTests/media/video-fullscreeen-only-playback.html', u'Source/WebCore/ChangeLog', u'Source/WebCore/html/HTMLMediaElement.cpp', u'Source/WebCore/html/HTMLMediaSession.cpp', u'Source/WebCore/html/HTMLMediaSession.h', u'Source/WebCore/platform/audio/MediaSession.h', u'Source/WebCore/platform/audio/MediaSessionManager.cpp', u'Source/WebCore/platform/audio/MediaSessionManager.h', u'Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm', u'Source/WebCore/testing/Internals.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/html/HTMLMediaSession.cpp:130: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 968801 3 221387 eric.carlson 2014-01-16 10:06:05 -0800 Created attachment 221387 Updated patch, now with one less space. 968887 4 221387 jer.noble 2014-01-16 12:54:49 -0800 Comment on attachment 221387 Updated patch, now with one less space. r=me. 968892 5 221387 commit-queue 2014-01-16 13:03:27 -0800 Comment on attachment 221387 Updated patch, now with one less space. Rejecting attachment 221387 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 221387, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: r.h patching file Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm patching file Source/WebCore/testing/Internals.cpp patching file LayoutTests/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file LayoutTests/media/video-fullscreeen-only-playback-expected.txt patching file LayoutTests/media/video-fullscreeen-only-playback.html Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Jer Noble']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5912825708937216 968899 6 eric.carlson 2014-01-16 13:23:16 -0800 Committed r162145: https://trac.webkit.org/r162145 968936 7 ap 2014-01-16 14:12:11 -0800 Looks like media/video-controls-visible-audio-only.html has started to fail after this change (it was flaky before, but now it's failing all the time. Eric, Jer, will you be available to look into this? http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=media%2Fvideo-controls-visible-audio-only.html 968960 8 ap 2014-01-16 15:03:37 -0800 Filed bug 127147 about that. 221382 2014-01-16 09:20:49 -0800 2014-01-16 10:06:05 -0800 Proposed patch inline_patch_5.txt text/plain 14051 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjEzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDE0LTAxLTE2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IE1lZGlhU2Vz c2lvbk1hbmFnZXIgdG8gcmVzdHJpY3QgaW5saW5lIDx2aWRlbz4gcGxheWJhY2sKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzExMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVv LWZ1bGxzY3JlZWVuLW9ubHktcGxheWJhY2suaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0 ZVBsYXlTdGF0ZSk6IERyaXZlLWJ5IGNoYW5nZSB0byBub3QgdGVsbCB0aGUgbWVkaWEgc2Vzc2lv biB0aGF0CisgICAgICAgICAgICBwbGF5YmFjayBpcyBzdGFydGluZyBpZiB0aGUgbWVkaWEgcGxh eWVyIGlzIGFscmVhZHkgcGxheWluZy4gRW50ZXIgZnVsbHNjcmVlbiBpZiB0aGUgbWVkaWEKKyAg ICAgICAgICAgIHNlc3Npb24gc2F5cyBpdCBpcyByZXF1aXJlZC4KKworICAgICAgICAqIGh0bWwv SFRNTE1lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFTZXNzaW9u OjpjbGllbnRXaWxsQmVnaW5QbGF5YmFjayk6IE1ha2UgaXQgY29uc3QuCisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFTZXNzaW9uOjpyZXF1aXJlc0Z1bGxzY3JlZW5Gb3JWaWRlb1BsYXliYWNr KTogTmV3LCBzZWUgaWYgdGhlIHNwZWNpZmllZAorICAgICAgICAgICAgbWVkaWEgZWxlbWVudCBt dXN0IGJlIHBsYXllZCBpbiBmdWxsc2NyZWVuIGJhc2VkIG9uIHRoZSBtZWRpYSBzZXNzaW9uIHNl dHRpbmdzLCBkb2N1bWVudAorICAgICAgICAgICAgc2V0dGluZ3MsIGFuZCBhdHRyaWJ1dGVzLgor ICAgICAgICAqIGh0bWwvSFRNTE1lZGlhU2Vzc2lvbi5oOgorCisgICAgICAgICogcGxhdGZvcm0v YXVkaW8vTWVkaWFTZXNzaW9uLmg6IHBhdXNlU2Vzc2lvbiBzaG91bGRuJ3QgYmUgdmlydHVhbC4K KworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcjo6c2Vzc2lvbldpbGxCZWdpblBsYXli YWNrKTogUmV0dXJuIGltbWVkaWF0ZWx5IGlmIENvbmN1cnJlbnRQbGF5YmFja05vdFBlcm1pdHRl ZAorICAgICAgICAgICAgaXMgbm90IHNldC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lv bk1hbmFnZXI6OnNlc3Npb25SZXN0cmljdHNJbmxpbmVWaWRlb1BsYXliYWNrKTogTmV3LgorICAg ICAgICAqIHBsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuaDoKKworICAgICAgICAq IHBsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLm1tOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6TWVkaWFTZXNzaW9uTWFuYWdlcmlPUyk6 IFNldCBJbmxpbmVWaWRlb1BsYXliYWNrUmVzdHJpY3RlZCBpZgorICAgICAgICAgICAgcnVubmlu ZyBvbiBhbiBpUGhvbmUgb3IgaVBvZCBjbGFzcyBkZXZpY2UuCisKKyAgICAgICAgKiB0ZXN0aW5n L0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNldE1lZGlhU2Vz c2lvblJlc3RyaWN0aW9ucyk6IFN1cHBvcnQgSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0ZWQu CisKIDIwMTQtMDEtMTYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAog ICAgICAgICBBWDogV2ViS2l0IGlzIG5vdCBmaXJpbmcgQVhNZW51SXRlbVNlbGVjdGVkTm90aWZp Y2F0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJl dmlzaW9uIDE2MjEzMSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQyNTUsMTAgKzQyNTUsMTAgQEAgdm9pZCBIVE1MTWVkaWFF bGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoKQogICAgICAgICBzZXREaXNwbGF5TW9kZShWaWRlbyk7 CiAgICAgICAgIGludmFsaWRhdGVDYWNoZWRUaW1lKCk7CiAKLSAgICAgICAgbV9tZWRpYVNlc3Np b24tPmNsaWVudFdpbGxCZWdpblBsYXliYWNrKCk7Ci0KICAgICAgICAgaWYgKHBsYXllclBhdXNl ZCkgewotICAgICAgICAgICAgaWYgKCFtX2lzRnVsbHNjcmVlbiAmJiBpc1ZpZGVvKCkgJiYgZG9j dW1lbnQoKS5wYWdlKCkgJiYgZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLnJlcXVpcmVzRnVs bHNjcmVlbkZvclZpZGVvUGxheWJhY2soKSkKKyAgICAgICAgICAgIG1fbWVkaWFTZXNzaW9uLT5j bGllbnRXaWxsQmVnaW5QbGF5YmFjaygpOworCisgICAgICAgICAgICBpZiAobV9tZWRpYVNlc3Np b24tPnJlcXVpcmVzRnVsbHNjcmVlbkZvclZpZGVvUGxheWJhY2soKnRoaXMpKQogICAgICAgICAg ICAgICAgIGVudGVyRnVsbHNjcmVlbigpOwogCiAgICAgICAgICAgICAvLyBTZXQgcmF0ZSwgbXV0 ZWQgYmVmb3JlIGNhbGxpbmcgcGxheSBpbiBjYXNlIHRoZXkgd2VyZSBzZXQgYmVmb3JlIHRoZSBt ZWRpYSBlbmdpbmUgd2FzIHNldHVwLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFTZXNzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YVNlc3Npb24uY3BwCShyZXZpc2lvbiAxNjIxMzEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYVNlc3Npb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiwxMCBAQAogI2lu Y2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTY3JpcHRDb250cm9sbGVyLmgiCiAKKyNpZiBQTEFU Rk9STShJT1MpCisjaW5jbHVkZSAiUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9TLmgiCisjZW5k aWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGQ6OnVuaXF1ZV9wdHI8SFRNTE1lZGlhU2Vz c2lvbj4gSFRNTE1lZGlhU2Vzc2lvbjo6Y3JlYXRlKE1lZGlhU2Vzc2lvbkNsaWVudCYgY2xpZW50 KQpAQCAtMTE5LDE0ICsxMjMsMjkgQEAgYm9vbCBIVE1MTWVkaWFTZXNzaW9uOjpzaG93aW5nUGxh eWJhY2tUYQogfQogI2VuZGlmCiAKLXZvaWQgSFRNTE1lZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJl Z2luUGxheWJhY2soKQordm9pZCBIVE1MTWVkaWFTZXNzaW9uOjpjbGllbnRXaWxsQmVnaW5QbGF5 YmFjaygpIGNvbnN0CiB7CiAgICAgTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigp LnNlc3Npb25XaWxsQmVnaW5QbGF5YmFjaygqdGhpcyk7CiB9Ci0KLXZvaWQgSFRNTE1lZGlhU2Vz c2lvbjo6cGF1c2VTZXNzaW9uKCkKKyAKK2Jvb2wgSFRNTE1lZGlhU2Vzc2lvbjo6cmVxdWlyZXNG dWxsc2NyZWVuRm9yVmlkZW9QbGF5YmFjayhjb25zdCBIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50 KSBjb25zdAogewotICAgIGNsaWVudCgpLnBhdXNlUGxheWJhY2soKTsKKyAgICBpZiAoIU1lZGlh U2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5zZXNzaW9uUmVzdHJpY3RzSW5saW5lVmlk ZW9QbGF5YmFjaygqdGhpcykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFNldHRpbmdz KiBzZXR0aW5ncyA9IGVsZW1lbnQuZG9jdW1lbnQoKS5zZXR0aW5ncygpOworICAgIGlmICghc2V0 dGluZ3MgfHwgIXNldHRpbmdzLT5tZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKCkpCisgICAgICAg IHJldHVybiB0cnVlOworCisgICAgaWYgKGVsZW1lbnQuZmFzdEhhc0F0dHJpYnV0ZShIVE1MTmFt ZXM6OndlYmtpdF9wbGF5c2lubGluZUF0dHIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyNp ZiBQTEFURk9STShJT1MpCisgICAgaWYgKGFwcGxpY2F0aW9uSXNEdW1wUmVuZGVyVHJlZSgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKworICAgIHJldHVybiB0cnVlOwogfQotIAor CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYVNlc3Npb24uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYVNlc3Npb24uaAkocmV2aXNpb24g MTYyMTMxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFTZXNzaW9uLmgJKHdvcmtp bmcgY29weSkKQEAgLTM5LDkgKzM5LDcgQEAgcHVibGljOgogICAgIEhUTUxNZWRpYVNlc3Npb24o TWVkaWFTZXNzaW9uQ2xpZW50Jik7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhU2Vzc2lvbigpIHsg fQogCi0gICAgdm9pZCBjbGllbnRXaWxsQmVnaW5QbGF5YmFjaygpOwotCi0gICAgdmlydHVhbCB2 b2lkIHBhdXNlU2Vzc2lvbigpIE9WRVJSSURFOworICAgIHZvaWQgY2xpZW50V2lsbEJlZ2luUGxh eWJhY2soKSBjb25zdDsKIAogICAgIGJvb2wgcGxheWJhY2tQZXJtaXR0ZWQoY29uc3QgSFRNTE1l ZGlhRWxlbWVudCYpIGNvbnN0OwogICAgIGJvb2wgZGF0YUxvYWRpbmdQZXJtaXR0ZWQoY29uc3Qg SFRNTE1lZGlhRWxlbWVudCYpIGNvbnN0OwpAQCAtNTEsNiArNDksNyBAQCBwdWJsaWM6CiAjaWYg RU5BQkxFKElPU19BSVJQTEFZKQogICAgIGJvb2wgc2hvd2luZ1BsYXliYWNrVGFyZ2V0UGlja2Vy UGVybWl0dGVkKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKICNlbmRpZgorICAgIGJv b2wgcmVxdWlyZXNGdWxsc2NyZWVuRm9yVmlkZW9QbGF5YmFjayhjb25zdCBIVE1MTWVkaWFFbGVt ZW50JikgY29uc3Q7CiAKICAgICAvLyBSZXN0cmljdGlvbnMgdG8gbW9kaWZ5IGRlZmF1bHQgYmVo YXZpb3JzLgogICAgIGVudW0gQmVoYXZpb3JSZXN0cmljdGlvbkZsYWdzIHsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oCShyZXZpc2lvbiAxNjIx MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uaAkod29y a2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBiZWdpbkludGVy cnVwdGlvbigpOwogICAgIHZvaWQgZW5kSW50ZXJydXB0aW9uKEVuZEludGVycnVwdGlvbkZsYWdz KTsKIAotICAgIHZpcnR1YWwgdm9pZCBwYXVzZVNlc3Npb24oKTsKKyAgICB2b2lkIHBhdXNlU2Vz c2lvbigpOwogCiBwcm90ZWN0ZWQ6CiAgICAgTWVkaWFTZXNzaW9uQ2xpZW50JiBjbGllbnQoKSBj b25zdCB7IHJldHVybiBtX2NsaWVudDsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJKHJldmlzaW9uIDE2MjEz MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjYsMTEgKzEyNiwxMSBAQCBNZWRpYVNlc3Npb25NYW5h Z2VyOjpTZXNzaW9uUmVzdHJpY3Rpb25zCiAgICAgcmV0dXJuIG1fcmVzdHJpY3Rpb25zW3R5cGVd OwogfQogCi12b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNlc3Npb25XaWxsQmVnaW5QbGF5YmFj ayhNZWRpYVNlc3Npb24mIHNlc3Npb24pCit2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNlc3Np b25XaWxsQmVnaW5QbGF5YmFjayhjb25zdCBNZWRpYVNlc3Npb24mIHNlc3Npb24pIGNvbnN0CiB7 CiAgICAgTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGUgc2Vzc2lvblR5cGUgPSBzZXNzaW9uLm1lZGlh VHlwZSgpOwogICAgIFNlc3Npb25SZXN0cmljdGlvbnMgcmVzdHJpY3Rpb25zID0gbV9yZXN0cmlj dGlvbnNbc2Vzc2lvblR5cGVdOwotICAgIGlmIChyZXN0cmljdGlvbnMgPT0gTm9SZXN0cmljdGlv bnMpCisgICAgaWYgKCFyZXN0cmljdGlvbnMgJiBDb25jdXJyZW50UGxheWJhY2tOb3RQZXJtaXR0 ZWQpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZvciAoYXV0byogb25lU2Vzc2lvbiA6IG1fc2Vz c2lvbnMpIHsKQEAgLTE0Myw2ICsxNDMsMTUgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyOjpz ZXNzaW9uV2lsbEJlZwogICAgIH0KIH0KIAorYm9vbCBNZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXNz aW9uUmVzdHJpY3RzSW5saW5lVmlkZW9QbGF5YmFjayhjb25zdCBNZWRpYVNlc3Npb24mIHNlc3Np b24pIGNvbnN0Cit7CisgICAgTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGUgc2Vzc2lvblR5cGUgPSBz ZXNzaW9uLm1lZGlhVHlwZSgpOworICAgIGlmIChzZXNzaW9uVHlwZSAhPSBNZWRpYVNlc3Npb246 OlZpZGVvKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gbV9yZXN0cmljdGlv bnNbc2Vzc2lvblR5cGVdICYgSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0ZWQ7Cit9CisKICNp ZiAhUExBVEZPUk0oTUFDKQogdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyOjp1cGRhdGVTZXNzaW9u U3RhdGUoKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNz aW9uTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L01lZGlhU2Vzc2lvbk1hbmFnZXIuaAkocmV2aXNpb24gMTYyMTMxKQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBA IC00OSw2ICs0OSw3IEBAIHB1YmxpYzoKICAgICBlbnVtIFNlc3Npb25SZXN0cmljdGlvbkZsYWdz IHsKICAgICAgICAgTm9SZXN0cmljdGlvbnMgPSAwLAogICAgICAgICBDb25jdXJyZW50UGxheWJh Y2tOb3RQZXJtaXR0ZWQgPSAxIDw8IDAsCisgICAgICAgIElubGluZVZpZGVvUGxheWJhY2tSZXN0 cmljdGVkID0gMSA8PCAwLAogICAgIH07CiAgICAgdHlwZWRlZiB1bnNpZ25lZCBTZXNzaW9uUmVz dHJpY3Rpb25zOwogICAgIApAQCAtNTYsNyArNTcsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1v dmVSZXN0cmljdGlvbihNZWRpYVNlc3Npb246Ok1lZGlhVHlwZSwgU2Vzc2lvblJlc3RyaWN0aW9u cyk7CiAgICAgU2Vzc2lvblJlc3RyaWN0aW9ucyByZXN0cmljdGlvbnMoTWVkaWFTZXNzaW9uOjpN ZWRpYVR5cGUpOwogCi0gICAgdm9pZCBzZXNzaW9uV2lsbEJlZ2luUGxheWJhY2soTWVkaWFTZXNz aW9uJik7CisgICAgdm9pZCBzZXNzaW9uV2lsbEJlZ2luUGxheWJhY2soY29uc3QgTWVkaWFTZXNz aW9uJikgY29uc3Q7CisgICAgYm9vbCBzZXNzaW9uUmVzdHJpY3RzSW5saW5lVmlkZW9QbGF5YmFj ayhjb25zdCBNZWRpYVNlc3Npb24mKSBjb25zdDsKIAogcHJvdGVjdGVkOgogICAgIGZyaWVuZCBj bGFzcyBNZWRpYVNlc3Npb247CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9p b3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQkocmV2aXNpb24g MTYyMTMxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lv bk1hbmFnZXJJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAKICNpbXBvcnQg Ik1lZGlhU2Vzc2lvbi5oIgogI2ltcG9ydCAiU29mdExpbmtpbmcuaCIKICNpbXBvcnQgIldlYkNv cmVUaHJlYWRSdW4uaCIKKyNpbXBvcnQgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKICNpbXBv cnQgPEFWRm91bmRhdGlvbi9BVkF1ZGlvU2Vzc2lvbi5oPgogI2ltcG9ydCA8b2JqYy9ydW50aW1l Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC03Miw2ICs3MywxMSBAQCBNZWRpYVNl c3Npb25NYW5hZ2VyaU9TOjpNZWRpYVNlc3Npb25NYW5hCiAgICAgOk1lZGlhU2Vzc2lvbk1hbmFn ZXIoKQogICAgICwgbV9vYmpjT2JzZXJ2ZXIoYWRvcHROUyhbW1dlYk1lZGlhU2Vzc2lvbkhlbHBl ciBhbGxvY10gaW5pdFdpdGhDYWxsYmFjazp0aGlzXSkpCiB7CisgICAgREVGSU5FX1NUQVRJQ19M T0NBTCh3a0RldmljZUNsYXNzLCBkZXZpY2VDbGFzcywgaW9zRGV2aWNlQ2xhc3MoKSk7CisKKyAg ICBpZiAoZGV2aWNlQ2xhc3MgPT0gd2tEZXZpY2VDbGFzc2lQaG9uZSB8fCBkZXZpY2VDbGFzcyA9 PSB3a0RldmljZUNsYXNzaVBvZCkKKyAgICAgICAgYWRkUmVzdHJpY3Rpb24oTWVkaWFTZXNzaW9u OjpWaWRlbywgSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0ZWQpOworCiAgICAgYWRkUmVzdHJp Y3Rpb24oTWVkaWFTZXNzaW9uOjpWaWRlbywgQ29uY3VycmVudFBsYXliYWNrTm90UGVybWl0dGVk KTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAkocmV2aXNpb24g MTYyMTMxKQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMzEyLDYgKzIzMTIsOCBAQCB2b2lkIEludGVybmFsczo6c2V0TWVkaWFTZXNz aW9uUmVzdHJpY3RpCiAgICAgCiAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHJlc3RyaWN0aW9u c1N0cmluZywgIkNvbmN1cnJlbnRQbGF5YmFja05vdFBlcm1pdHRlZCIpKQogICAgICAgICByZXN0 cmljdGlvbnMgPSBNZWRpYVNlc3Npb25NYW5hZ2VyOjpDb25jdXJyZW50UGxheWJhY2tOb3RQZXJt aXR0ZWQ7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHJlc3RyaWN0aW9uc1N0cmluZywgIklu bGluZVZpZGVvUGxheWJhY2tSZXN0cmljdGVkIikpCisgICAgICAgIHJlc3RyaWN0aW9ucyArPSBN ZWRpYVNlc3Npb25NYW5hZ2VyOjpJbmxpbmVWaWRlb1BsYXliYWNrUmVzdHJpY3RlZDsKICAgICAK ICAgICBNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkuYWRkUmVzdHJpY3Rpb24o bWVkaWFUeXBlLCByZXN0cmljdGlvbnMpOwogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTYyMTMxKQor KysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTQtMDEtMTYgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAg ICAgICAgQWxsb3cgTWVkaWFTZXNzaW9uTWFuYWdlciB0byByZXN0cmljdCBpbmxpbmUgPHZpZGVv PiBwbGF5YmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI3MTEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBtZWRpYS92aWRlby1mdWxsc2NyZWVlbi1vbmx5LXBsYXliYWNrLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay5o dG1sOiBBZGRlZC4KKwogMjAxNC0wMS0xNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIE1lcmdlZCBzb21lIG1vcmUgc3VicGl4ZWwgc2tpcHBlZCB0ZXN0cy4gVW5y ZXZpZXdlZC4KSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWZ1bGxzY3JlZWVuLW9ubHkt cGxheWJhY2stZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3Zp ZGVvLWZ1bGxzY3JlZWVuLW9ubHktcGxheWJhY2stZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay1leHBl Y3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxOSBAQAorCitUZXN0IHBsYXkoKSB3 aGVuIDx2aWRlbz4gcGxheWJhY2sgcmVxdWlyZXMgZnVsbHNjcmVlbi4KKworUlVOKGludGVybmFs cy5zZXRNZWRpYVNlc3Npb25SZXN0cmljdGlvbnMoJ3ZpZGVvJywgJ0lubGluZVZpZGVvUGxheWJh Y2tSZXN0cmljdGVkJykpCisKK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorRVhQRUNURUQgKHZpZGVv LndlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbiA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8u d2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gPT0gJ2ZhbHNlJykgT0sKKworKiogQ2xpY2tpbmcg J3BsYXknIGJ1dHRvbi4uLgorRVZFTlQocGxheWluZykKKworKiogRW50ZXJlZCBmdWxsc2NyZWVu CitFWFBFQ1RFRCAodmlkZW8ud2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gPT0gJ3RydWUnKSBP SworUlVOKHZpZGVvLndlYmtpdEV4aXRGdWxsU2NyZWVuKCkpCisKKyoqIEV4aXRlZCBmdWxsc2Ny ZWVuCitFTkQgT0YgVEVTVAorCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1mdWxsc2Ny ZWVlbi1vbmx5LXBsYXliYWNrLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEv dmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvbWVkaWEvdmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay5odG1sCSh3b3Jr aW5nIGNvcHkpCkBAIC0wLDAgKzEsNzcgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8 c2NyaXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12 aWRlby10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz1tZWRpYS1jb250cm9s cy5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICAgICAgZnVuY3Rpb24g ZnVsbHNjcmVlbmNoYW5nZSgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKGRv Y3VtZW50LndlYmtpdElzRnVsbFNjcmVlbikKKyAgICAgICAgICAgICAgICAgICAgYmVnaW5mdWxs c2NyZWVuKCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBlbmRm dWxsc2NyZWVuKCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGJlZ2lu ZnVsbHNjcmVlbigpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCI8YnI+KiogRW50ZXJlZCBmdWxsc2NyZWVuIik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCJ2aWRlby53ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbiIsIHRydWUpOworICAgICAgICAg ICAgICAgIHJ1bigidmlkZW8ud2Via2l0RXhpdEZ1bGxTY3JlZW4oKSIpOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICBmdW5jdGlvbiBlbmRmdWxsc2NyZWVuKCkKKyAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj4qKiBFeGl0ZWQgZnVsbHNjcmVlbiIp OworICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgZnVuY3Rpb24gY2FucGxheXRocm91Z2goKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIHRlc3RFeHBlY3RlZCgidmlkZW8ud2Via2l0U3VwcG9ydHNGdWxsc2NyZWVuIiwgdHJ1ZSk7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby53ZWJraXREaXNwbGF5aW5nRnVs bHNjcmVlbiIsIGZhbHNlKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioq IENsaWNraW5nIFwncGxheVwnIGJ1dHRvbi4uLiIpOworCisgICAgICAgICAgICAgICAgdmFyIHBs YXlDb29yZHM7CisgICAgICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICAgICAgcGxh eUNvb3JkcyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyh2aWRlbywgInBsYXktYnV0 dG9uIik7CisgICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CisgICAgICAgICAg ICAgICAgICAgIGZhaWxUZXN0KGV4Y2VwdGlvbi5kZXNjcmlwdGlvbik7CisgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbyhwbGF5Q29vcmRzWzBdLCBwbGF5Q29vcmRzWzFdKTsKKyAgICAg ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICAgICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZVVwKCk7CisgICAgICAgICAgICB9CisKKworICAgICAgICAgICAgZnVuY3Rp b24gc3RhcnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGlmICghd2luZG93Lmlu dGVybmFscykgeworICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgnVGhpcyB0ZXN0IHJlcXVp cmVzIHdpbmRvdy5pbnRlcm5hbHMuJyk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICB2aWRlbyA9IGRvY3VtZW50LmdldEVs ZW1lbnRzQnlUYWdOYW1lKCd2aWRlbycpWzBdOworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVu dCgiY2FucGxheXRocm91Z2giLCBjYW5wbGF5dGhyb3VnaCk7CisgICAgICAgICAgICAgICAgd2Fp dEZvckV2ZW50KCdwbGF5aW5nJyk7CisKKyAgICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExp c3RlbmVyKCd3ZWJraXRiZWdpbmZ1bGxzY3JlZW4nLCBiZWdpbmZ1bGxzY3JlZW4sIHRydWUpOwor ICAgICAgICAgICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIoJ3dlYmtpdGVuZGZ1bGxzY3Jl ZW4nLCBlbmRmdWxsc2NyZWVuLCB0cnVlKTsKKyAgICAgICAgICAgICAgICB2aWRlby5hZGRFdmVu dExpc3RlbmVyKCd3ZWJraXRmdWxsc2NyZWVuY2hhbmdlJywgZnVsbHNjcmVlbmNoYW5nZSwgdHJ1 ZSk7CisKKyAgICAgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIs ICJjb250ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgICAgIHJ1bigiaW50ZXJuYWxzLnNldE1l ZGlhU2Vzc2lvblJlc3RyaWN0aW9ucygndmlkZW8nLCAnSW5saW5lVmlkZW9QbGF5YmFja1Jlc3Ry aWN0ZWQnKSIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAg ICB9CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKworICAgIDxib2R5IG9ubG9hZD0i c3RhcnQoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scz48L3ZpZGVvPgorICAgICAgICA8cD5U ZXN0IHBsYXkoKSB3aGVuICZsdDt2aWRlbyZndDsgcGxheWJhY2sgcmVxdWlyZXMgZnVsbHNjcmVl bi48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 221387 2014-01-16 10:06:05 -0800 2014-01-16 13:23:26 -0800 Updated patch, now with one less space. inline_patch_6.txt text/plain 14048 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjEzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDE0LTAxLTE2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IE1lZGlhU2Vz c2lvbk1hbmFnZXIgdG8gcmVzdHJpY3QgaW5saW5lIDx2aWRlbz4gcGxheWJhY2sKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzExMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVv LWZ1bGxzY3JlZWVuLW9ubHktcGxheWJhY2suaHRtbAorCisgICAgICAgICogaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0 ZVBsYXlTdGF0ZSk6IERyaXZlLWJ5IGNoYW5nZSB0byBub3QgdGVsbCB0aGUgbWVkaWEgc2Vzc2lv biB0aGF0CisgICAgICAgICAgICBwbGF5YmFjayBpcyBzdGFydGluZyBpZiB0aGUgbWVkaWEgcGxh eWVyIGlzIGFscmVhZHkgcGxheWluZy4gRW50ZXIgZnVsbHNjcmVlbiBpZiB0aGUgbWVkaWEKKyAg ICAgICAgICAgIHNlc3Npb24gc2F5cyBpdCBpcyByZXF1aXJlZC4KKworICAgICAgICAqIGh0bWwv SFRNTE1lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFTZXNzaW9u OjpjbGllbnRXaWxsQmVnaW5QbGF5YmFjayk6IE1ha2UgaXQgY29uc3QuCisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFTZXNzaW9uOjpyZXF1aXJlc0Z1bGxzY3JlZW5Gb3JWaWRlb1BsYXliYWNr KTogTmV3LCBzZWUgaWYgdGhlIHNwZWNpZmllZAorICAgICAgICAgICAgbWVkaWEgZWxlbWVudCBt dXN0IGJlIHBsYXllZCBpbiBmdWxsc2NyZWVuIGJhc2VkIG9uIHRoZSBtZWRpYSBzZXNzaW9uIHNl dHRpbmdzLCBkb2N1bWVudAorICAgICAgICAgICAgc2V0dGluZ3MsIGFuZCBhdHRyaWJ1dGVzLgor ICAgICAgICAqIGh0bWwvSFRNTE1lZGlhU2Vzc2lvbi5oOgorCisgICAgICAgICogcGxhdGZvcm0v YXVkaW8vTWVkaWFTZXNzaW9uLmg6IHBhdXNlU2Vzc2lvbiBzaG91bGRuJ3QgYmUgdmlydHVhbC4K KworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcjo6c2Vzc2lvbldpbGxCZWdpblBsYXli YWNrKTogUmV0dXJuIGltbWVkaWF0ZWx5IGlmIENvbmN1cnJlbnRQbGF5YmFja05vdFBlcm1pdHRl ZAorICAgICAgICAgICAgaXMgbm90IHNldC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lv bk1hbmFnZXI6OnNlc3Npb25SZXN0cmljdHNJbmxpbmVWaWRlb1BsYXliYWNrKTogTmV3LgorICAg ICAgICAqIHBsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuaDoKKworICAgICAgICAq IHBsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLm1tOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6TWVkaWFTZXNzaW9uTWFuYWdlcmlPUyk6 IFNldCBJbmxpbmVWaWRlb1BsYXliYWNrUmVzdHJpY3RlZCBpZgorICAgICAgICAgICAgcnVubmlu ZyBvbiBhbiBpUGhvbmUgb3IgaVBvZCBjbGFzcyBkZXZpY2UuCisKKyAgICAgICAgKiB0ZXN0aW5n L0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNldE1lZGlhU2Vz c2lvblJlc3RyaWN0aW9ucyk6IFN1cHBvcnQgSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0ZWQu CisKIDIwMTQtMDEtMTYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAog ICAgICAgICBBWDogV2ViS2l0IGlzIG5vdCBmaXJpbmcgQVhNZW51SXRlbVNlbGVjdGVkTm90aWZp Y2F0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJl dmlzaW9uIDE2MjEzMSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQyNTUsMTAgKzQyNTUsMTAgQEAgdm9pZCBIVE1MTWVkaWFF bGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoKQogICAgICAgICBzZXREaXNwbGF5TW9kZShWaWRlbyk7 CiAgICAgICAgIGludmFsaWRhdGVDYWNoZWRUaW1lKCk7CiAKLSAgICAgICAgbV9tZWRpYVNlc3Np b24tPmNsaWVudFdpbGxCZWdpblBsYXliYWNrKCk7Ci0KICAgICAgICAgaWYgKHBsYXllclBhdXNl ZCkgewotICAgICAgICAgICAgaWYgKCFtX2lzRnVsbHNjcmVlbiAmJiBpc1ZpZGVvKCkgJiYgZG9j dW1lbnQoKS5wYWdlKCkgJiYgZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLnJlcXVpcmVzRnVs bHNjcmVlbkZvclZpZGVvUGxheWJhY2soKSkKKyAgICAgICAgICAgIG1fbWVkaWFTZXNzaW9uLT5j bGllbnRXaWxsQmVnaW5QbGF5YmFjaygpOworCisgICAgICAgICAgICBpZiAobV9tZWRpYVNlc3Np b24tPnJlcXVpcmVzRnVsbHNjcmVlbkZvclZpZGVvUGxheWJhY2soKnRoaXMpKQogICAgICAgICAg ICAgICAgIGVudGVyRnVsbHNjcmVlbigpOwogCiAgICAgICAgICAgICAvLyBTZXQgcmF0ZSwgbXV0 ZWQgYmVmb3JlIGNhbGxpbmcgcGxheSBpbiBjYXNlIHRoZXkgd2VyZSBzZXQgYmVmb3JlIHRoZSBt ZWRpYSBlbmdpbmUgd2FzIHNldHVwLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFTZXNzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YVNlc3Npb24uY3BwCShyZXZpc2lvbiAxNjIxMzEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYVNlc3Npb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiwxMCBAQAogI2lu Y2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTY3JpcHRDb250cm9sbGVyLmgiCiAKKyNpZiBQTEFU Rk9STShJT1MpCisjaW5jbHVkZSAiUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzSU9TLmgiCisjZW5k aWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGQ6OnVuaXF1ZV9wdHI8SFRNTE1lZGlhU2Vz c2lvbj4gSFRNTE1lZGlhU2Vzc2lvbjo6Y3JlYXRlKE1lZGlhU2Vzc2lvbkNsaWVudCYgY2xpZW50 KQpAQCAtMTE5LDE0ICsxMjMsMjkgQEAgYm9vbCBIVE1MTWVkaWFTZXNzaW9uOjpzaG93aW5nUGxh eWJhY2tUYQogfQogI2VuZGlmCiAKLXZvaWQgSFRNTE1lZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJl Z2luUGxheWJhY2soKQordm9pZCBIVE1MTWVkaWFTZXNzaW9uOjpjbGllbnRXaWxsQmVnaW5QbGF5 YmFjaygpIGNvbnN0CiB7CiAgICAgTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigp LnNlc3Npb25XaWxsQmVnaW5QbGF5YmFjaygqdGhpcyk7CiB9CiAKLXZvaWQgSFRNTE1lZGlhU2Vz c2lvbjo6cGF1c2VTZXNzaW9uKCkKK2Jvb2wgSFRNTE1lZGlhU2Vzc2lvbjo6cmVxdWlyZXNGdWxs c2NyZWVuRm9yVmlkZW9QbGF5YmFjayhjb25zdCBIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50KSBj b25zdAogewotICAgIGNsaWVudCgpLnBhdXNlUGxheWJhY2soKTsKKyAgICBpZiAoIU1lZGlhU2Vz c2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5zZXNzaW9uUmVzdHJpY3RzSW5saW5lVmlkZW9Q bGF5YmFjaygqdGhpcykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFNldHRpbmdzKiBz ZXR0aW5ncyA9IGVsZW1lbnQuZG9jdW1lbnQoKS5zZXR0aW5ncygpOworICAgIGlmICghc2V0dGlu Z3MgfHwgIXNldHRpbmdzLT5tZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKCkpCisgICAgICAgIHJl dHVybiB0cnVlOworCisgICAgaWYgKGVsZW1lbnQuZmFzdEhhc0F0dHJpYnV0ZShIVE1MTmFtZXM6 OndlYmtpdF9wbGF5c2lubGluZUF0dHIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyNpZiBQ TEFURk9STShJT1MpCisgICAgaWYgKGFwcGxpY2F0aW9uSXNEdW1wUmVuZGVyVHJlZSgpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKworICAgIHJldHVybiB0cnVlOwogfQotIAorCiB9 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYVNlc3Npb24uaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYVNlc3Npb24uaAkocmV2aXNpb24gMTYy MTMxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFTZXNzaW9uLmgJKHdvcmtpbmcg Y29weSkKQEAgLTM5LDkgKzM5LDcgQEAgcHVibGljOgogICAgIEhUTUxNZWRpYVNlc3Npb24oTWVk aWFTZXNzaW9uQ2xpZW50Jik7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhU2Vzc2lvbigpIHsgfQog Ci0gICAgdm9pZCBjbGllbnRXaWxsQmVnaW5QbGF5YmFjaygpOwotCi0gICAgdmlydHVhbCB2b2lk IHBhdXNlU2Vzc2lvbigpIE9WRVJSSURFOworICAgIHZvaWQgY2xpZW50V2lsbEJlZ2luUGxheWJh Y2soKSBjb25zdDsKIAogICAgIGJvb2wgcGxheWJhY2tQZXJtaXR0ZWQoY29uc3QgSFRNTE1lZGlh RWxlbWVudCYpIGNvbnN0OwogICAgIGJvb2wgZGF0YUxvYWRpbmdQZXJtaXR0ZWQoY29uc3QgSFRN TE1lZGlhRWxlbWVudCYpIGNvbnN0OwpAQCAtNTEsNiArNDksNyBAQCBwdWJsaWM6CiAjaWYgRU5B QkxFKElPU19BSVJQTEFZKQogICAgIGJvb2wgc2hvd2luZ1BsYXliYWNrVGFyZ2V0UGlja2VyUGVy bWl0dGVkKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKICNlbmRpZgorICAgIGJvb2wg cmVxdWlyZXNGdWxsc2NyZWVuRm9yVmlkZW9QbGF5YmFjayhjb25zdCBIVE1MTWVkaWFFbGVtZW50 JikgY29uc3Q7CiAKICAgICAvLyBSZXN0cmljdGlvbnMgdG8gbW9kaWZ5IGRlZmF1bHQgYmVoYXZp b3JzLgogICAgIGVudW0gQmVoYXZpb3JSZXN0cmljdGlvbkZsYWdzIHsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oCShyZXZpc2lvbiAxNjIxMzEp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uaAkod29ya2lu ZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBiZWdpbkludGVycnVw dGlvbigpOwogICAgIHZvaWQgZW5kSW50ZXJydXB0aW9uKEVuZEludGVycnVwdGlvbkZsYWdzKTsK IAotICAgIHZpcnR1YWwgdm9pZCBwYXVzZVNlc3Npb24oKTsKKyAgICB2b2lkIHBhdXNlU2Vzc2lv bigpOwogCiBwcm90ZWN0ZWQ6CiAgICAgTWVkaWFTZXNzaW9uQ2xpZW50JiBjbGllbnQoKSBjb25z dCB7IHJldHVybiBtX2NsaWVudDsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJKHJldmlzaW9uIDE2MjEzMSkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMjYsMTEgKzEyNiwxMSBAQCBNZWRpYVNlc3Npb25NYW5hZ2Vy OjpTZXNzaW9uUmVzdHJpY3Rpb25zCiAgICAgcmV0dXJuIG1fcmVzdHJpY3Rpb25zW3R5cGVdOwog fQogCi12b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNlc3Npb25XaWxsQmVnaW5QbGF5YmFjayhN ZWRpYVNlc3Npb24mIHNlc3Npb24pCit2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNlc3Npb25X aWxsQmVnaW5QbGF5YmFjayhjb25zdCBNZWRpYVNlc3Npb24mIHNlc3Npb24pIGNvbnN0CiB7CiAg ICAgTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGUgc2Vzc2lvblR5cGUgPSBzZXNzaW9uLm1lZGlhVHlw ZSgpOwogICAgIFNlc3Npb25SZXN0cmljdGlvbnMgcmVzdHJpY3Rpb25zID0gbV9yZXN0cmljdGlv bnNbc2Vzc2lvblR5cGVdOwotICAgIGlmIChyZXN0cmljdGlvbnMgPT0gTm9SZXN0cmljdGlvbnMp CisgICAgaWYgKCFyZXN0cmljdGlvbnMgJiBDb25jdXJyZW50UGxheWJhY2tOb3RQZXJtaXR0ZWQp CiAgICAgICAgIHJldHVybjsKIAogICAgIGZvciAoYXV0byogb25lU2Vzc2lvbiA6IG1fc2Vzc2lv bnMpIHsKQEAgLTE0Myw2ICsxNDMsMTUgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXNz aW9uV2lsbEJlZwogICAgIH0KIH0KIAorYm9vbCBNZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXNzaW9u UmVzdHJpY3RzSW5saW5lVmlkZW9QbGF5YmFjayhjb25zdCBNZWRpYVNlc3Npb24mIHNlc3Npb24p IGNvbnN0Cit7CisgICAgTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGUgc2Vzc2lvblR5cGUgPSBzZXNz aW9uLm1lZGlhVHlwZSgpOworICAgIGlmIChzZXNzaW9uVHlwZSAhPSBNZWRpYVNlc3Npb246OlZp ZGVvKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gbV9yZXN0cmljdGlvbnNb c2Vzc2lvblR5cGVdICYgSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0ZWQ7Cit9CisKICNpZiAh UExBVEZPUk0oTUFDKQogdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyOjp1cGRhdGVTZXNzaW9uU3Rh dGUoKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9u TWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01l ZGlhU2Vzc2lvbk1hbmFnZXIuaAkocmV2aXNpb24gMTYyMTMxKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00 OSw2ICs0OSw3IEBAIHB1YmxpYzoKICAgICBlbnVtIFNlc3Npb25SZXN0cmljdGlvbkZsYWdzIHsK ICAgICAgICAgTm9SZXN0cmljdGlvbnMgPSAwLAogICAgICAgICBDb25jdXJyZW50UGxheWJhY2tO b3RQZXJtaXR0ZWQgPSAxIDw8IDAsCisgICAgICAgIElubGluZVZpZGVvUGxheWJhY2tSZXN0cmlj dGVkID0gMSA8PCAwLAogICAgIH07CiAgICAgdHlwZWRlZiB1bnNpZ25lZCBTZXNzaW9uUmVzdHJp Y3Rpb25zOwogICAgIApAQCAtNTYsNyArNTcsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVS ZXN0cmljdGlvbihNZWRpYVNlc3Npb246Ok1lZGlhVHlwZSwgU2Vzc2lvblJlc3RyaWN0aW9ucyk7 CiAgICAgU2Vzc2lvblJlc3RyaWN0aW9ucyByZXN0cmljdGlvbnMoTWVkaWFTZXNzaW9uOjpNZWRp YVR5cGUpOwogCi0gICAgdm9pZCBzZXNzaW9uV2lsbEJlZ2luUGxheWJhY2soTWVkaWFTZXNzaW9u Jik7CisgICAgdm9pZCBzZXNzaW9uV2lsbEJlZ2luUGxheWJhY2soY29uc3QgTWVkaWFTZXNzaW9u JikgY29uc3Q7CisgICAgYm9vbCBzZXNzaW9uUmVzdHJpY3RzSW5saW5lVmlkZW9QbGF5YmFjayhj b25zdCBNZWRpYVNlc3Npb24mKSBjb25zdDsKIAogcHJvdGVjdGVkOgogICAgIGZyaWVuZCBjbGFz cyBNZWRpYVNlc3Npb247CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3Mv TWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQkocmV2aXNpb24gMTYy MTMxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbk1h bmFnZXJJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAKICNpbXBvcnQgIk1l ZGlhU2Vzc2lvbi5oIgogI2ltcG9ydCAiU29mdExpbmtpbmcuaCIKICNpbXBvcnQgIldlYkNvcmVU aHJlYWRSdW4uaCIKKyNpbXBvcnQgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQg PEFWRm91bmRhdGlvbi9BVkF1ZGlvU2Vzc2lvbi5oPgogI2ltcG9ydCA8b2JqYy9ydW50aW1lLmg+ CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC03Miw2ICs3MywxMSBAQCBNZWRpYVNlc3Np b25NYW5hZ2VyaU9TOjpNZWRpYVNlc3Npb25NYW5hCiAgICAgOk1lZGlhU2Vzc2lvbk1hbmFnZXIo KQogICAgICwgbV9vYmpjT2JzZXJ2ZXIoYWRvcHROUyhbW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBh bGxvY10gaW5pdFdpdGhDYWxsYmFjazp0aGlzXSkpCiB7CisgICAgREVGSU5FX1NUQVRJQ19MT0NB TCh3a0RldmljZUNsYXNzLCBkZXZpY2VDbGFzcywgaW9zRGV2aWNlQ2xhc3MoKSk7CisKKyAgICBp ZiAoZGV2aWNlQ2xhc3MgPT0gd2tEZXZpY2VDbGFzc2lQaG9uZSB8fCBkZXZpY2VDbGFzcyA9PSB3 a0RldmljZUNsYXNzaVBvZCkKKyAgICAgICAgYWRkUmVzdHJpY3Rpb24oTWVkaWFTZXNzaW9uOjpW aWRlbywgSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0ZWQpOworCiAgICAgYWRkUmVzdHJpY3Rp b24oTWVkaWFTZXNzaW9uOjpWaWRlbywgQ29uY3VycmVudFBsYXliYWNrTm90UGVybWl0dGVkKTsK IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAkocmV2aXNpb24gMTYy MTMxKQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMzEyLDYgKzIzMTIsOCBAQCB2b2lkIEludGVybmFsczo6c2V0TWVkaWFTZXNzaW9u UmVzdHJpY3RpCiAgICAgCiAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHJlc3RyaWN0aW9uc1N0 cmluZywgIkNvbmN1cnJlbnRQbGF5YmFja05vdFBlcm1pdHRlZCIpKQogICAgICAgICByZXN0cmlj dGlvbnMgPSBNZWRpYVNlc3Npb25NYW5hZ2VyOjpDb25jdXJyZW50UGxheWJhY2tOb3RQZXJtaXR0 ZWQ7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHJlc3RyaWN0aW9uc1N0cmluZywgIklubGlu ZVZpZGVvUGxheWJhY2tSZXN0cmljdGVkIikpCisgICAgICAgIHJlc3RyaWN0aW9ucyArPSBNZWRp YVNlc3Npb25NYW5hZ2VyOjpJbmxpbmVWaWRlb1BsYXliYWNrUmVzdHJpY3RlZDsKICAgICAKICAg ICBNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkuYWRkUmVzdHJpY3Rpb24obWVk aWFUeXBlLCByZXN0cmljdGlvbnMpOwogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTYyMTMxKQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTQtMDEtMTYgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWxsb3cgTWVkaWFTZXNzaW9uTWFuYWdlciB0byByZXN0cmljdCBpbmxpbmUgPHZpZGVvPiBw bGF5YmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI3MTEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBtZWRpYS92aWRlby1mdWxsc2NyZWVlbi1vbmx5LXBsYXliYWNrLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay5odG1s OiBBZGRlZC4KKwogMjAxNC0wMS0xNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIE1lcmdlZCBzb21lIG1vcmUgc3VicGl4ZWwgc2tpcHBlZCB0ZXN0cy4gVW5yZXZp ZXdlZC4KSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWZ1bGxzY3JlZWVuLW9ubHktcGxh eWJhY2stZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVv LWZ1bGxzY3JlZWVuLW9ubHktcGxheWJhY2stZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxOSBAQAorCitUZXN0IHBsYXkoKSB3aGVu IDx2aWRlbz4gcGxheWJhY2sgcmVxdWlyZXMgZnVsbHNjcmVlbi4KKworUlVOKGludGVybmFscy5z ZXRNZWRpYVNlc3Npb25SZXN0cmljdGlvbnMoJ3ZpZGVvJywgJ0lubGluZVZpZGVvUGxheWJhY2tS ZXN0cmljdGVkJykpCisKK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorRVhQRUNURUQgKHZpZGVvLndl YmtpdFN1cHBvcnRzRnVsbHNjcmVlbiA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8ud2Vi a2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gPT0gJ2ZhbHNlJykgT0sKKworKiogQ2xpY2tpbmcgJ3Bs YXknIGJ1dHRvbi4uLgorRVZFTlQocGxheWluZykKKworKiogRW50ZXJlZCBmdWxsc2NyZWVuCitF WFBFQ1RFRCAodmlkZW8ud2Via2l0RGlzcGxheWluZ0Z1bGxzY3JlZW4gPT0gJ3RydWUnKSBPSwor UlVOKHZpZGVvLndlYmtpdEV4aXRGdWxsU2NyZWVuKCkpCisKKyoqIEV4aXRlZCBmdWxsc2NyZWVu CitFTkQgT0YgVEVTVAorCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1mdWxsc2NyZWVl bi1vbmx5LXBsYXliYWNrLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvbWVkaWEvdmlkZW8tZnVsbHNjcmVlZW4tb25seS1wbGF5YmFjay5odG1sCSh3b3JraW5n IGNvcHkpCkBAIC0wLDAgKzEsNzcgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz1tZWRpYS1jb250cm9scy5q cz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICAgICAgZnVuY3Rpb24gZnVs bHNjcmVlbmNoYW5nZSgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKGRvY3Vt ZW50LndlYmtpdElzRnVsbFNjcmVlbikKKyAgICAgICAgICAgICAgICAgICAgYmVnaW5mdWxsc2Ny ZWVuKCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBlbmRmdWxs c2NyZWVuKCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGJlZ2luZnVs bHNjcmVlbigpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8 YnI+KiogRW50ZXJlZCBmdWxsc2NyZWVuIik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby53ZWJraXREaXNwbGF5aW5nRnVsbHNjcmVlbiIsIHRydWUpOworICAgICAgICAgICAg ICAgIHJ1bigidmlkZW8ud2Via2l0RXhpdEZ1bGxTY3JlZW4oKSIpOworICAgICAgICAgICAgfQor CisgICAgICAgICAgICBmdW5jdGlvbiBlbmRmdWxsc2NyZWVuKCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj4qKiBFeGl0ZWQgZnVsbHNjcmVlbiIpOwor ICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg ZnVuY3Rpb24gY2FucGxheXRocm91Z2goKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IHRlc3RFeHBlY3RlZCgidmlkZW8ud2Via2l0U3VwcG9ydHNGdWxsc2NyZWVuIiwgdHJ1ZSk7Cisg ICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby53ZWJraXREaXNwbGF5aW5nRnVsbHNj cmVlbiIsIGZhbHNlKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioqIENs aWNraW5nIFwncGxheVwnIGJ1dHRvbi4uLiIpOworCisgICAgICAgICAgICAgICAgdmFyIHBsYXlD b29yZHM7CisgICAgICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICAgICAgcGxheUNv b3JkcyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyh2aWRlbywgInBsYXktYnV0dG9u Iik7CisgICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CisgICAgICAgICAgICAg ICAgICAgIGZhaWxUZXN0KGV4Y2VwdGlvbi5kZXNjcmlwdGlvbik7CisgICAgICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBldmVudFNl bmRlci5tb3VzZU1vdmVUbyhwbGF5Q29vcmRzWzBdLCBwbGF5Q29vcmRzWzFdKTsKKyAgICAgICAg ICAgICAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICAgICAgICAgICAgICBldmVudFNl bmRlci5tb3VzZVVwKCk7CisgICAgICAgICAgICB9CisKKworICAgICAgICAgICAgZnVuY3Rpb24g c3RhcnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGlmICghd2luZG93LmludGVy bmFscykgeworICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgnVGhpcyB0ZXN0IHJlcXVpcmVz IHdpbmRvdy5pbnRlcm5hbHMuJyk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICB2aWRlbyA9IGRvY3VtZW50LmdldEVsZW1l bnRzQnlUYWdOYW1lKCd2aWRlbycpWzBdOworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgi Y2FucGxheXRocm91Z2giLCBjYW5wbGF5dGhyb3VnaCk7CisgICAgICAgICAgICAgICAgd2FpdEZv ckV2ZW50KCdwbGF5aW5nJyk7CisKKyAgICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExpc3Rl bmVyKCd3ZWJraXRiZWdpbmZ1bGxzY3JlZW4nLCBiZWdpbmZ1bGxzY3JlZW4sIHRydWUpOworICAg ICAgICAgICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIoJ3dlYmtpdGVuZGZ1bGxzY3JlZW4n LCBlbmRmdWxsc2NyZWVuLCB0cnVlKTsKKyAgICAgICAgICAgICAgICB2aWRlby5hZGRFdmVudExp c3RlbmVyKCd3ZWJraXRmdWxsc2NyZWVuY2hhbmdlJywgZnVsbHNjcmVlbmNoYW5nZSwgdHJ1ZSk7 CisKKyAgICAgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJj b250ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgICAgIHJ1bigiaW50ZXJuYWxzLnNldE1lZGlh U2Vzc2lvblJlc3RyaWN0aW9ucygndmlkZW8nLCAnSW5saW5lVmlkZW9QbGF5YmFja1Jlc3RyaWN0 ZWQnKSIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICB9 CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKworICAgIDxib2R5IG9ubG9hZD0ic3Rh cnQoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scz48L3ZpZGVvPgorICAgICAgICA8cD5UZXN0 IHBsYXkoKSB3aGVuICZsdDt2aWRlbyZndDsgcGxheWJhY2sgcmVxdWlyZXMgZnVsbHNjcmVlbi48 L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo=