154084 2016-02-10 13:34:10 -0800 Update "manual" caption track logic 2016-02-10 16:11:34 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson webkit-bug-importer oldest_to_newest 1163589 0 eric.carlson 2016-02-10 13:34:10 -0800 When manual selection mode is enabled: + don't change 'forced' track kind to 'caption' + forced tracks should include “forced” in their caption menu title + no tracks should be enabled by default 1163590 1 eric.carlson 2016-02-10 13:34:41 -0800 <rdar://problem/24530516> 1163592 2 webkit-bug-importer 2016-02-10 13:41:14 -0800 <rdar://problem/24594371> 1163613 3 271027 eric.carlson 2016-02-10 14:23:59 -0800 Created attachment 271027 Proposed patch. 1163635 4 271027 dino 2016-02-10 15:01:40 -0800 Comment on attachment 271027 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=271027&action=review > Source/WebCore/html/HTMLMediaElement.cpp:3872 > + if (trackToEnable) > + m_subtitleTrackLanguage = trackToEnable->language(); > + else > + m_subtitleTrackLanguage = emptyString(); I never know which we prefer: m_subtitleTrackLanguage = trackToEnable ? trackToEnable->language() : emptyString(); 1163653 5 eric.carlson 2016-02-10 16:11:34 -0800 Committed r196401: https://trac.webkit.org/r196401 271027 2016-02-10 14:23:59 -0800 2016-02-10 15:01:40 -0800 Proposed patch. label_forced_tracks_patch_1.txt text/plain 18217 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjM5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDE2LTAyLTEwICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSAibWFudWFs IiBjYXB0aW9uIHRyYWNrIGxvZ2ljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTQwODQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0NTMwNTE2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgbWVkaWEvdHJhY2svdHJhY2stbWFudWFsLW1vZGUuaHRtbCB3YXMgdXBkYXRlZC4KKwor ICAgICAgICAqIEVuZ2xpc2gubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczogQWRkIG5ldyBzdHJp bmcuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6YWRkVGV4dFRyYWNrKTogdHJhY2suc2V0TWFudWFsU2Vs ZWN0aW9uTW9kZSBpcyBubyBtb3JlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dDo6Y29uZmlndXJlVGV4dFRyYWNrR3JvdXApOiBOZXZlciBlbmFibGUgYSB0cmFjayBhdXRvbWF0 aWNhbGx5IHdoZW4KKyAgICAgICAgICBpbiBtYW51YWwgc2VsZWN0aW9uIG1vZGUuCisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkKTog IHRyYWNrLnNldE1hbnVhbFNlbGVjdGlvbk1vZGUgaXMgbm8gbW9yZS4KKworICAgICAgICAqIGh0 bWwvdHJhY2svVGV4dFRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFjazo6Y29u dGFpbnNPbmx5Rm9yY2VkU3VidGl0bGVzKTogUmV0dXJuIHRydWUgZm9yIGZvcmNlZCB0cmFja3Mu CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2s6OmtpbmQpOiBEZWxldGVkLgorICAgICAgICAq IGh0bWwvdHJhY2svVGV4dFRyYWNrLmg6CisKKyAgICAgICAgKiBodG1sL3RyYWNrL1RyYWNrQmFz ZS5oOgorICAgICAgICAoV2ViQ29yZTo6VHJhY2tCYXNlOjpraW5kKTogRGUtdmlydHVhbGl6ZSwg bm9ib2R5IG92ZXJyaWRlcyBpdC4KKworICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJl bmNlc01lZGlhQUYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJhY2tEaXNwbGF5TmFtZSk6IElu Y2x1ZGUgImZvcmNlZCIgaW4gdGhlIG5hbWUgb2YgZm9yY2VkIHRyYWNrcy4KKworICAgICAgICAq IHBsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9yY2Vk VHJhY2tNZW51SXRlbVRleHQpOiBOZXcuCisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3Ry aW5ncy5oOgorCiAyMDE2LTAyLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYiBJRExdIGludGVyZmFjZSBvYmplY3RzIHNob3VsZCBiZSBGdW5jdGlvbiBv YmplY3RzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0 cmluZ3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6 YWJsZS5zdHJpbmdzCShyZXZpc2lvbiAxOTYzMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9FbmdsaXNo Lmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDkg QEAKIC8qIFRleHQgdHJhY2sgY29udGFpbnMgc2ltcGxpZmllZCAoM3JkIGdyYWRlIGxldmVsKSBz dWJ0aXRsZXMgKi8KICIlQCBFYXN5IFJlYWRlciIgPSAiJUAgRWFzeSBSZWFkZXIiOwogCisvKiBU ZXh0IHRyYWNrIGNvbnRhaW5zIGZvcmNlZCBzdWJ0aXRsZXMgKi8KKyIlQCBGb3JjZWQiID0gIiVA IEZvcmNlZCI7CisKIC8qIHZpc2libGUgbmFtZSBvZiB0aGUgbmV0d29yayBwcm9jZXNzLiBUaGUg YXJndW1lbnQgaXMgdGhlIGFwcGxpY2F0aW9uIG5hbWUuICovCiAiJUAgTmV0d29ya2luZyIgPSAi JUAgTmV0d29ya2luZyI7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcAkocmV2aXNpb24gMTk2MzI5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzU4NCw3ICszNTg0LDYgQEAgdm9pZCBI VE1MTWVkaWFFbGVtZW50OjphZGRUZXh0VHJhY2soUGFzcwogICAgICAgICAgICAgbV9jYXB0aW9u RGlzcGxheU1vZGUgPSBwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25E aXNwbGF5TW9kZSgpOwogICAgIH0KIAotICAgIHRyYWNrLT5zZXRNYW51YWxTZWxlY3Rpb25Nb2Rl KG1fY2FwdGlvbkRpc3BsYXlNb2RlID09IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6Ok1hbnVhbCk7 CiAgICAgdGV4dFRyYWNrcygpLT5hcHBlbmQodHJhY2spOwogCiAgICAgY2xvc2VDYXB0aW9uVHJh Y2tzQ2hhbmdlZCgpOwpAQCAtMzg0NywzMCArMzg0NiwzMiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1l bnQ6OmNvbmZpZ3VyZVRleHRUcmFjCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoIXRyYWNr VG9FbmFibGUgJiYgZGVmYXVsdFRyYWNrKQotICAgICAgICB0cmFja1RvRW5hYmxlID0gZGVmYXVs dFRyYWNrOwotICAgIAotICAgIC8vIElmIG5vIHRyYWNrIG1hdGNoZXMgdGhlIHVzZXIncyBwcmVm ZXJyZWQgbGFuZ3VhZ2UsIG5vbmUgd2FzIG1hcmtlZCBhcyAnZGVmYXVsdCcsIGFuZCB0aGVyZSBp cyBhIGZvcmNlZCBzdWJ0aXRsZSB0cmFjawotICAgIC8vIGluIHRoZSBzYW1lIGxhbmd1YWdlIGFz IHRoZSBsYW5ndWFnZSBvZiB0aGUgcHJpbWFyeSBhdWRpbyB0cmFjaywgZW5hYmxlIGl0LgotICAg IGlmICghdHJhY2tUb0VuYWJsZSAmJiBmb3JjZWRTdWJpdGxlVHJhY2spCi0gICAgICAgIHRyYWNr VG9FbmFibGUgPSBmb3JjZWRTdWJpdGxlVHJhY2s7Ci0KLSAgICAvLyBJZiBubyB0cmFjayBtYXRj aGVzLCBkb24ndCBkaXNhYmxlIGFuIGFscmVhZHkgdmlzaWJsZSB0cmFjayB1bmxlc3MgcHJlZmVy ZW5jZXMgc2F5IHRoZXkgYWxsIHNob3VsZCBiZSBvZmYuCi0gICAgaWYgKGdyb3VwLmtpbmQgIT0g VHJhY2tHcm91cDo6Q2FwdGlvbnNBbmRTdWJ0aXRsZXMgfHwgZGlzcGxheU1vZGUgIT0gQ2FwdGlv blVzZXJQcmVmZXJlbmNlczo6Rm9yY2VkT25seSkgewotICAgICAgICBpZiAoIXRyYWNrVG9FbmFi bGUgJiYgIWRlZmF1bHRUcmFjayAmJiBncm91cC52aXNpYmxlVHJhY2spCi0gICAgICAgICAgICB0 cmFja1RvRW5hYmxlID0gZ3JvdXAudmlzaWJsZVRyYWNrOwotICAgIH0KLSAgICAKLSAgICAvLyBJ ZiBubyB0cmFjayBtYXRjaGVzIHRoZSB1c2VyJ3MgcHJlZmVycmVkIGxhbmd1YWdlIGFuZCBub24g d2FzIG1hcmtlZCAnZGVmYXVsdCcsIGVuYWJsZSB0aGUgZmlyc3QgdHJhY2sKLSAgICAvLyBiZWNh dXNlIHRoZSB1c2VyIGhhcyBleHBsaWNpdGx5IHN0YXRlZCBhIHByZWZlcmVuY2UgZm9yIHRoaXMg a2luZCBvZiB0cmFjay4KLSAgICBpZiAoIXRyYWNrVG9FbmFibGUgJiYgZmFsbGJhY2tUcmFjaykK LSAgICAgICAgdHJhY2tUb0VuYWJsZSA9IGZhbGxiYWNrVHJhY2s7CisgICAgaWYgKGRpc3BsYXlN b2RlICE9IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6Ok1hbnVhbCkgeworICAgICAgICBpZiAoIXRy YWNrVG9FbmFibGUgJiYgZGVmYXVsdFRyYWNrKQorICAgICAgICAgICAgdHJhY2tUb0VuYWJsZSA9 IGRlZmF1bHRUcmFjazsKKworICAgICAgICAvLyBJZiBubyB0cmFjayBtYXRjaGVzIHRoZSB1c2Vy J3MgcHJlZmVycmVkIGxhbmd1YWdlLCBub25lIHdhcyBtYXJrZWQgYXMgJ2RlZmF1bHQnLCBhbmQg dGhlcmUgaXMgYSBmb3JjZWQgc3VidGl0bGUgdHJhY2sKKyAgICAgICAgLy8gaW4gdGhlIHNhbWUg bGFuZ3VhZ2UgYXMgdGhlIGxhbmd1YWdlIG9mIHRoZSBwcmltYXJ5IGF1ZGlvIHRyYWNrLCBlbmFi bGUgaXQuCisgICAgICAgIGlmICghdHJhY2tUb0VuYWJsZSAmJiBmb3JjZWRTdWJpdGxlVHJhY2sp CisgICAgICAgICAgICB0cmFja1RvRW5hYmxlID0gZm9yY2VkU3ViaXRsZVRyYWNrOworCisgICAg ICAgIC8vIElmIG5vIHRyYWNrIG1hdGNoZXMsIGRvbid0IGRpc2FibGUgYW4gYWxyZWFkeSB2aXNp YmxlIHRyYWNrIHVubGVzcyBwcmVmZXJlbmNlcyBzYXkgdGhleSBhbGwgc2hvdWxkIGJlIG9mZi4K KyAgICAgICAgaWYgKGdyb3VwLmtpbmQgIT0gVHJhY2tHcm91cDo6Q2FwdGlvbnNBbmRTdWJ0aXRs ZXMgfHwgZGlzcGxheU1vZGUgIT0gQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6Rm9yY2VkT25seSkg eworICAgICAgICAgICAgaWYgKCF0cmFja1RvRW5hYmxlICYmICFkZWZhdWx0VHJhY2sgJiYgZ3Jv dXAudmlzaWJsZVRyYWNrKQorICAgICAgICAgICAgICAgIHRyYWNrVG9FbmFibGUgPSBncm91cC52 aXNpYmxlVHJhY2s7CisgICAgICAgIH0KKworICAgICAgICAvLyBJZiBubyB0cmFjayBtYXRjaGVz IHRoZSB1c2VyJ3MgcHJlZmVycmVkIGxhbmd1YWdlIGFuZCBub24gd2FzIG1hcmtlZCAnZGVmYXVs dCcsIGVuYWJsZSB0aGUgZmlyc3QgdHJhY2sKKyAgICAgICAgLy8gYmVjYXVzZSB0aGUgdXNlciBo YXMgZXhwbGljaXRseSBzdGF0ZWQgYSBwcmVmZXJlbmNlIGZvciB0aGlzIGtpbmQgb2YgdHJhY2su CisgICAgICAgIGlmICghdHJhY2tUb0VuYWJsZSAmJiBmYWxsYmFja1RyYWNrKQorICAgICAgICAg ICAgdHJhY2tUb0VuYWJsZSA9IGZhbGxiYWNrVHJhY2s7CisKKyAgICAgICAgaWYgKHRyYWNrVG9F bmFibGUpCisgICAgICAgICAgICBtX3N1YnRpdGxlVHJhY2tMYW5ndWFnZSA9IHRyYWNrVG9FbmFi bGUtPmxhbmd1YWdlKCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fc3VidGl0bGVUcmFj a0xhbmd1YWdlID0gZW1wdHlTdHJpbmcoKTsKKyAgICB9CiAKLSAgICBpZiAodHJhY2tUb0VuYWJs ZSkKLSAgICAgICAgbV9zdWJ0aXRsZVRyYWNrTGFuZ3VhZ2UgPSB0cmFja1RvRW5hYmxlLT5sYW5n dWFnZSgpOwotICAgIGVsc2UKLSAgICAgICAgbV9zdWJ0aXRsZVRyYWNrTGFuZ3VhZ2UgPSBlbXB0 eVN0cmluZygpOwotICAgIAogICAgIGlmIChjdXJyZW50bHlFbmFibGVkVHJhY2tzLnNpemUoKSkg ewogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGN1cnJlbnRseUVuYWJsZWRUcmFja3Mu c2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgIFJlZlB0cjxUZXh0VHJhY2s+IHRleHRUcmFjayA9 IGN1cnJlbnRseUVuYWJsZWRUcmFja3NbaV07CkBAIC01NzI5LDExICs1NzMwLDYgQEAgdm9pZCBI VE1MTWVkaWFFbGVtZW50OjpjYXB0aW9uUHJlZmVyZW5jZQogICAgIGlmIChtX2NhcHRpb25EaXNw bGF5TW9kZSA9PSBkaXNwbGF5TW9kZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fY2Fw dGlvbkRpc3BsYXlNb2RlID09IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6Ok1hbnVhbCB8fCBkaXNw bGF5TW9kZSA9PSBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpNYW51YWwpIHsKLSAgICAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fdGV4dFRyYWNrcy0+bGVuZ3RoKCk7ICsraSkKLSAgICAg ICAgICAgIG1fdGV4dFRyYWNrcy0+aXRlbShpKS0+c2V0TWFudWFsU2VsZWN0aW9uTW9kZShkaXNw bGF5TW9kZSA9PSBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpNYW51YWwpOwotICAgIH0KLQogICAg IG1fY2FwdGlvbkRpc3BsYXlNb2RlID0gZGlzcGxheU1vZGU7CiAgICAgc2V0V2Via2l0Q2xvc2Vk Q2FwdGlvbnNWaXNpYmxlKG1fY2FwdGlvbkRpc3BsYXlNb2RlID09IENhcHRpb25Vc2VyUHJlZmVy ZW5jZXM6OkFsd2F5c09uKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4 dFRyYWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRU cmFjay5jcHAJKHJldmlzaW9uIDE5NjMyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2sv VGV4dFRyYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTczLDE1ICsxNzMsNiBAQCBib29sIFRl eHRUcmFjazo6aXNWYWxpZEtpbmRLZXl3b3JkKGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQog Ci1BdG9taWNTdHJpbmcgVGV4dFRyYWNrOjpraW5kKCkgY29uc3QKLXsKLSAgICBBdG9taWNTdHJp bmcga2luZCA9IFRyYWNrQmFzZTo6a2luZCgpOwotICAgIGlmICghbV9tYW51YWxTZWxlY3Rpb25N b2RlIHx8IGtpbmQgIT0gZm9yY2VkS2V5d29yZCgpKQotICAgICAgICByZXR1cm4ga2luZDsKLQot ICAgIHJldHVybiBzdWJ0aXRsZXNLZXl3b3JkKCk7Ci19Ci0KIHZvaWQgVGV4dFRyYWNrOjpzZXRL aW5kKGNvbnN0IEF0b21pY1N0cmluZyYgbmV3S2luZCkKIHsKICAgICBTdHJpbmcgb2xkS2luZCA9 IGtpbmQoKTsKQEAgLTU1NCw2ICs1NDUsMTEgQEAgYm9vbCBUZXh0VHJhY2s6OmlzTWFpblByb2dy YW1Db250ZW50KCkgYwogICAgIHJldHVybiBraW5kKCkgPT0gY2FwdGlvbnNLZXl3b3JkKCk7CiB9 CiAKK2Jvb2wgVGV4dFRyYWNrOjpjb250YWluc09ubHlGb3JjZWRTdWJ0aXRsZXMoKSBjb25zdAor eworICAgIHJldHVybiBraW5kKCkgPT0gZm9yY2VkS2V5d29yZCgpOworfQorCiAjaWYgRU5BQkxF KE1FRElBX1NPVVJDRSkKIHZvaWQgVGV4dFRyYWNrOjpzZXRMYW5ndWFnZShjb25zdCBBdG9taWNT dHJpbmcmIGxhbmd1YWdlKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0 VHJhY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFj ay5oCShyZXZpc2lvbiAxOTYzMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRU cmFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw4ICs4Miw3IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgY29uc3QgQXRvbWljU3RyaW5nJiBoaWRkZW5LZXl3b3JkKCk7CiAgICAgc3RhdGljIGNvbnN0 IEF0b21pY1N0cmluZyYgc2hvd2luZ0tleXdvcmQoKTsKIAotICAgIHZvaWQgc2V0S2luZChjb25z dCBBdG9taWNTdHJpbmcmKSBvdmVycmlkZTsKLSAgICBBdG9taWNTdHJpbmcga2luZCgpIGNvbnN0 IG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBzZXRLaW5kKGNvbnN0IEF0b21pY1N0cmluZyYp IG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCBBdG9taWNTdHJpbmcgaW5CYW5kTWV0YWRhdGFUcmFj a0Rpc3BhdGNoVHlwZSgpIGNvbnN0IHsgcmV0dXJuIGVtcHR5U3RyaW5nKCk7IH0KIApAQCAtMTE3 LDcgKzExNiw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBpc0Nsb3NlZENhcHRpb25z KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTREgoKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBjb250YWluc09ubHlGb3JjZWRT dWJ0aXRsZXMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBjb250 YWluc09ubHlGb3JjZWRTdWJ0aXRsZXMoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNNYWlu UHJvZ3JhbUNvbnRlbnQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNFYXN5VG9SZWFkKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIApAQCAtMTQzLDggKzE0Miw2IEBAIHB1YmxpYzoKIAog ICAgIHZpcnR1YWwgTWVkaWFUaW1lIHN0YXJ0VGltZVZhcmlhbmNlKCkgY29uc3QgeyByZXR1cm4g TWVkaWFUaW1lOjp6ZXJvVGltZSgpOyB9CiAKLSAgICB2b2lkIHNldE1hbnVhbFNlbGVjdGlvbk1v ZGUoYm9vbCBtb2RlKSB7IG1fbWFudWFsU2VsZWN0aW9uTW9kZSA9IG1vZGU7IH0KLQogICAgIHVz aW5nIFJlZkNvdW50ZWQ8VHJhY2tCYXNlPjo6cmVmOwogICAgIHVzaW5nIFJlZkNvdW50ZWQ8VHJh Y2tCYXNlPjo6ZGVyZWY7CiAKQEAgLTE3NCw3ICsxNzEsNiBAQCBwcml2YXRlOgogICAgIGludCBt X3RyYWNrSW5kZXg7CiAgICAgaW50IG1fcmVuZGVyZWRUcmFja0luZGV4OwogICAgIGJvb2wgbV9o YXNCZWVuQ29uZmlndXJlZDsKLSAgICBib29sIG1fbWFudWFsU2VsZWN0aW9uTW9kZSB7IGZhbHNl IH07CiB9OwogCiBpbmxpbmUgVGV4dFRyYWNrKiB0b1RleHRUcmFjayhUcmFja0Jhc2UqIHRyYWNr KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UcmFja0Jhc2UuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RyYWNrQmFzZS5oCShyZXZpc2lvbiAxOTYz MjkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RyYWNrQmFzZS5oCSh3b3JraW5nIGNv cHkpCkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEF0b21pY1N0cmluZyBp ZCgpIGNvbnN0IHsgcmV0dXJuIG1faWQ7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0SWQoY29uc3Qg QXRvbWljU3RyaW5nJiBpZCkgeyBtX2lkID0gaWQ7IH0KIAotICAgIHZpcnR1YWwgQXRvbWljU3Ry aW5nIGtpbmQoKSBjb25zdCB7IHJldHVybiBtX2tpbmQ7IH0KKyAgICBBdG9taWNTdHJpbmcga2lu ZCgpIGNvbnN0IHsgcmV0dXJuIG1fa2luZDsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRLaW5kKGNv bnN0IEF0b21pY1N0cmluZyYpOwogCiAgICAgQXRvbWljU3RyaW5nIGxhYmVsKCkgY29uc3QgeyBy ZXR1cm4gbV9sYWJlbDsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclBy ZWZlcmVuY2VzTWVkaWFBRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9D YXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHJldmlzaW9uIDE5NjMyOSkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02NjcsMjIgKzY2NywzMiBAQCBzdGF0aWMgU3RyaW5nIHRyYWNrRGlzcGxh eU5hbWUoVGV4dFRyYWNrCiAgICAgaWYgKHRyYWNrID09IFRleHRUcmFjazo6Y2FwdGlvbk1lbnVB dXRvbWF0aWNJdGVtKCkpCiAgICAgICAgIHJldHVybiB0ZXh0VHJhY2tBdXRvbWF0aWNNZW51SXRl bVRleHQoKTsKIAotICAgIFN0cmluZ0J1aWxkZXIgZGlzcGxheU5hbWU7Ci0gICAgYnVpbGREaXNw bGF5U3RyaW5nRm9yVHJhY2tCYXNlKGRpc3BsYXlOYW1lLCAqdHJhY2spOworICAgIFN0cmluZ0J1 aWxkZXIgZGlzcGxheU5hbWVCdWlsZGVyOworICAgIGJ1aWxkRGlzcGxheVN0cmluZ0ZvclRyYWNr QmFzZShkaXNwbGF5TmFtZUJ1aWxkZXIsICp0cmFjayk7CiAKLSAgICBpZiAoZGlzcGxheU5hbWUu aXNFbXB0eSgpKQotICAgICAgICBkaXNwbGF5TmFtZS5hcHBlbmQodGV4dFRyYWNrTm9MYWJlbFRl eHQoKSk7Ci0gICAgCi0gICAgaWYgKHRyYWNrLT5pc0Vhc3lUb1JlYWQoKSkKLSAgICAgICAgcmV0 dXJuIGVhc3lSZWFkZXJUcmFja01lbnVJdGVtVGV4dChkaXNwbGF5TmFtZS50b1N0cmluZygpKTsK LSAgICAKLSAgICBpZiAodHJhY2stPmlzQ2xvc2VkQ2FwdGlvbnMoKSkKLSAgICAgICAgcmV0dXJu IGNsb3NlZENhcHRpb25UcmFja01lbnVJdGVtVGV4dChkaXNwbGF5TmFtZS50b1N0cmluZygpKTsK KyAgICBpZiAoZGlzcGxheU5hbWVCdWlsZGVyLmlzRW1wdHkoKSkKKyAgICAgICAgZGlzcGxheU5h bWVCdWlsZGVyLmFwcGVuZCh0ZXh0VHJhY2tOb0xhYmVsVGV4dCgpKTsKKworICAgIFN0cmluZyBk aXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lQnVpbGRlci50b1N0cmluZygpOworCisgICAgaWYgKHRy YWNrLT5pc0Nsb3NlZENhcHRpb25zKCkpIHsKKyAgICAgICAgZGlzcGxheU5hbWUgPSBjbG9zZWRD YXB0aW9uVHJhY2tNZW51SXRlbVRleHQoZGlzcGxheU5hbWUpOworICAgICAgICBpZiAodHJhY2st PmlzRWFzeVRvUmVhZCgpKQorICAgICAgICAgICAgZGlzcGxheU5hbWUgPSBlYXN5UmVhZGVyVHJh Y2tNZW51SXRlbVRleHQoZGlzcGxheU5hbWUpOworCisgICAgICAgIHJldHVybiBkaXNwbGF5TmFt ZTsKKyAgICB9CiAKICAgICBpZiAodHJhY2stPmlzU0RIKCkpCi0gICAgICAgIHJldHVybiBzZGhU cmFja01lbnVJdGVtVGV4dChkaXNwbGF5TmFtZS50b1N0cmluZygpKTsKKyAgICAgICAgZGlzcGxh eU5hbWUgPSBzZGhUcmFja01lbnVJdGVtVGV4dChkaXNwbGF5TmFtZSk7CisKKyAgICBpZiAodHJh Y2stPmNvbnRhaW5zT25seUZvcmNlZFN1YnRpdGxlcygpKQorICAgICAgICBkaXNwbGF5TmFtZSA9 IGZvcmNlZFRyYWNrTWVudUl0ZW1UZXh0KGRpc3BsYXlOYW1lKTsKKworICAgIGlmICh0cmFjay0+ aXNFYXN5VG9SZWFkKCkpCisgICAgICAgIGRpc3BsYXlOYW1lID0gZWFzeVJlYWRlclRyYWNrTWVu dUl0ZW1UZXh0KGRpc3BsYXlOYW1lKTsKIAotICAgIHJldHVybiBkaXNwbGF5TmFtZS50b1N0cmlu ZygpOworICAgIHJldHVybiBkaXNwbGF5TmFtZTsKIH0KIAogU3RyaW5nIENhcHRpb25Vc2VyUHJl ZmVyZW5jZXNNZWRpYUFGOjpkaXNwbGF5TmFtZUZvclRyYWNrKFRleHRUcmFjayogdHJhY2spIGNv bnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNw cAkocmV2aXNpb24gMTk2MzI5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVk U3RyaW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMTEsNiArMTExMSwxMSBAQCBTdHJpbmcg ZWFzeVJlYWRlclRyYWNrTWVudUl0ZW1UZXh0KGNvbnN0CiB7CiAgICAgcmV0dXJuIGZvcm1hdExv Y2FsaXplZFN0cmluZyhXRUJfVUlfU1RSSU5HKCIlQCBFYXN5IFJlYWRlciIsICJUZXh0IHRyYWNr IGNvbnRhaW5zIHNpbXBsaWZpZWQgKDNyZCBncmFkZSBsZXZlbCkgc3VidGl0bGVzIiksIHRpdGxl LmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCkpOwogfQorCitTdHJpbmcgZm9yY2VkVHJhY2tNZW51SXRl bVRleHQoY29uc3QgU3RyaW5nJiB0aXRsZSkKK3sKKyAgICByZXR1cm4gZm9ybWF0TG9jYWxpemVk U3RyaW5nKFdFQl9VSV9TVFJJTkcoIiVAIEZvcmNlZCIsICJUZXh0IHRyYWNrIGNvbnRhaW5zIGZv cmNlZCBzdWJ0aXRsZXMiKSwgdGl0bGUuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSk7Cit9CiAjZW5k aWYKIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJp bmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3Ry aW5ncy5oCShyZXZpc2lvbiAxOTYzMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2Nh bGl6ZWRTdHJpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1Nyw2ICsyNTcsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgU3RyaW5nIGNsb3NlZENhcHRpb25UcmFja01lbnVJdGVtVGV4dChj b25zdCBTdHJpbmcmKTsKICAgICBTdHJpbmcgc2RoVHJhY2tNZW51SXRlbVRleHQoY29uc3QgU3Ry aW5nJik7CiAgICAgU3RyaW5nIGVhc3lSZWFkZXJUcmFja01lbnVJdGVtVGV4dChjb25zdCBTdHJp bmcmKTsKKyAgICBTdHJpbmcgZm9yY2VkVHJhY2tNZW51SXRlbVRleHQoY29uc3QgU3RyaW5nJik7 CiAjZW5kaWYKICNlbmRpZgogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTYzMjkpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNi0wMi0x MCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRh dGUgIm1hbnVhbCIgY2FwdGlvbiB0cmFjayBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MDg0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8y NDUzMDUxNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIG1lZGlhL3RyYWNrL3RyYWNrLW1hbnVhbC1tb2RlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBtZWRpYS90cmFjay90cmFjay1tYW51YWwtbW9kZS5odG1sOgorCiAyMDE2LTAyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbl0gUmViYXNlbGluZSBh ZnRlciByMTk2MjQ0LgpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stbWFudWFs LW1vZGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3RyYWNr L3RyYWNrLW1hbnVhbC1tb2RlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTk2MzI5KQorKysgTGF5 b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stbWFudWFsLW1vZGUtZXhwZWN0ZWQudHh0CSh3b3Jr aW5nIGNvcHkpCkBAIC02LDE5ICs2LDMxIEBAIFJVTihpbnRlcm5hbHMuc2V0UHJpbWFyeUF1ZGlv VHJhY2tMYW5ndWEKIFJVTihpbnRlcm5hbHMuc2V0Q2FwdGlvbkRpc3BsYXlNb2RlKCdtYW51YWwn KSkKIEVWRU5UKGNhbnBsYXl0aHJvdWdoKQogCi0qKiBGb3JjZWQgdHJhY2tzIHNob3VsZCBiZSBp biAudGV4dFRyYWNrcyBhcyB3ZWxsIGFzIGluIHRoZSBtZW51LAotKiogYnV0IHNob3VsZCBiZSBs YWJlbGVkIGFzICdzdWJ0aXRsZXMnCi0KKyoqIEZvcmNlZCB0cmFja3Mgc2hvdWxkIGJlIGluIC50 ZXh0VHJhY2tzIGFzIHdlbGwgYXMgaW4gdGhlIG1lbnUKIEVYUEVDVEVEICh2aWRlby50ZXh0VHJh Y2tzLmxlbmd0aCA9PSAnOScpIE9LCiBFWFBFQ1RFRCAodHJhY2tNZW51SXRlbXMubGVuZ3RoID09 ICcxMScpIE9LCiAKKyoqICdmb3JjZWQnIHNob3VsZCBiZSBpbiB0aGUgdGl0bGUgb2YgYSBmb3Jj ZWQgdHJhY2sgbWVudSBpdGVtCitUcmFjayBtZW51OgorMDogIk9mZiIsIGNoZWNrZWQKKzE6ICJB dXRvIChSZWNvbW1lbmRlZCkiCisyOiAiRW5nbGlzaCBDbG9zZWQgQ2FwdGlvbnMgQ0MiCiszOiAi RW5nbGlzaCBTdWJ0aXRsZXMiCis0OiAiRW5nbGlzaCBTdWJ0aXRsZXMgRm9yY2VkIgorNTogIkZy ZW5jaCBTdWJ0aXRsZXMiCis2OiAiRnJlbmNoIFN1YnRpdGxlcyBGb3JjZWQiCis3OiAiR2VybWFu IFN1YnRpdGxlcyIKKzg6ICJHZXJtYW4gU3VidGl0bGVzIEZvcmNlZCIKKzk6ICJTcGFuaXNoIFN1 YnRpdGxlcyIKKzEwOiAiU3BhbmlzaCBTdWJ0aXRsZXMgRm9yY2VkIgorCiAqKiBObyB0cmFjayBz aG91bGQgYmUgZW5hYmxlZCBieSBkZWZhdWx0CiBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1sw XS5sYW5ndWFnZSA9PSAnZW4nKSBPSwogRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMF0ua2lu ZCA9PSAnc3VidGl0bGVzJykgT0sKIEVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzWzBdLm1vZGUg PT0gJ2Rpc2FibGVkJykgT0sKIAogRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMV0ubGFuZ3Vh Z2UgPT0gJ2VuJykgT0sKLUVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzWzFdLmtpbmQgPT0gJ3N1 YnRpdGxlcycpIE9LCitFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1sxXS5raW5kID09ICdmb3Jj ZWQnKSBPSwogRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbMV0ubW9kZSA9PSAnZGlzYWJsZWQn KSBPSwogCiBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1syXS5sYW5ndWFnZSA9PSAnZnInKSBP SwpAQCAtMjYsNyArMzgsNyBAQCBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1syXS5raW5kID09 ICdzCiBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1syXS5tb2RlID09ICdkaXNhYmxlZCcpIE9L CiAKIEVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzWzNdLmxhbmd1YWdlID09ICdmcicpIE9LCi1F WFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1szXS5raW5kID09ICdzdWJ0aXRsZXMnKSBPSworRVhQ RUNURUQgKHZpZGVvLnRleHRUcmFja3NbM10ua2luZCA9PSAnZm9yY2VkJykgT0sKIEVYUEVDVEVE ICh2aWRlby50ZXh0VHJhY2tzWzNdLm1vZGUgPT0gJ2Rpc2FibGVkJykgT0sKIAogRVhQRUNURUQg KHZpZGVvLnRleHRUcmFja3NbNF0ubGFuZ3VhZ2UgPT0gJ2VzJykgT0sKQEAgLTM0LDcgKzQ2LDcg QEAgRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbNF0ua2luZCA9PSAncwogRVhQRUNURUQgKHZp ZGVvLnRleHRUcmFja3NbNF0ubW9kZSA9PSAnZGlzYWJsZWQnKSBPSwogCiBFWFBFQ1RFRCAodmlk ZW8udGV4dFRyYWNrc1s1XS5sYW5ndWFnZSA9PSAnZXMnKSBPSwotRVhQRUNURUQgKHZpZGVvLnRl eHRUcmFja3NbNV0ua2luZCA9PSAnc3VidGl0bGVzJykgT0sKK0VYUEVDVEVEICh2aWRlby50ZXh0 VHJhY2tzWzVdLmtpbmQgPT0gJ2ZvcmNlZCcpIE9LCiBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNr c1s1XS5tb2RlID09ICdkaXNhYmxlZCcpIE9LCiAKIEVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tz WzZdLmxhbmd1YWdlID09ICdkZScpIE9LCkBAIC00Miw3ICs1NCw3IEBAIEVYUEVDVEVEICh2aWRl by50ZXh0VHJhY2tzWzZdLmtpbmQgPT0gJ3MKIEVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzWzZd Lm1vZGUgPT0gJ2Rpc2FibGVkJykgT0sKIAogRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbN10u bGFuZ3VhZ2UgPT0gJ2RlJykgT0sKLUVYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzWzddLmtpbmQg PT0gJ3N1YnRpdGxlcycpIE9LCitFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1s3XS5raW5kID09 ICdmb3JjZWQnKSBPSwogRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3NbN10ubW9kZSA9PSAnZGlz YWJsZWQnKSBPSwogCiBFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrc1s4XS5sYW5ndWFnZSA9PSAn ZW4nKSBPSwpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stbWFudWFsLW1vZGUu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1tYW51YWwt bW9kZS5odG1sCShyZXZpc2lvbiAxOTYzMjkpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90 cmFjay1tYW51YWwtbW9kZS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMCw4ICsxMCw3IEBACiAK ICAgICAgICAgICAgIGZ1bmN0aW9uIHRlc3RUcmFja3MoKQogICAgICAgICAgICAgewotICAgICAg ICAgICAgICAgIGNvbnNvbGVXcml0ZShgPGJyPjxpPioqIEZvcmNlZCB0cmFja3Mgc2hvdWxkIGJl IGluIC50ZXh0VHJhY2tzIGFzIHdlbGwgYXMgaW4gdGhlIG1lbnUsYCk7Ci0gICAgICAgICAgICAg ICAgY29uc29sZVdyaXRlKGA8aT4qKiBidXQgc2hvdWxkIGJlIGxhYmVsZWQgYXMgJ3N1YnRpdGxl cyc8L2k+PGJyPmApOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZShgPGJyPjxpPioqIEZv cmNlZCB0cmFja3Mgc2hvdWxkIGJlIGluIC50ZXh0VHJhY2tzIGFzIHdlbGwgYXMgaW4gdGhlIG1l bnVgKTsKICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3MubGVu Z3RoIiwgOSk7CiAKICAgICAgICAgICAgICAgICAvLyBDbGljayB0aGUgQ0MgYnV0dG9uIHRvIHNo b3cgdGhlIG1lbnUgYmVjYXVzZSBpdCBpc24ndCBjcmVhdGVkIHVudGlsIGl0IGJlY29tZXMgdmlz aWJsZS4KQEAgLTI0LDYgKzIzLDkgQEAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ0cmFja01lbnVJdGVtcy5sZW5ndGgiLCAxMSk7CiAKKyAgICAgICAg ICAgICAgICBjb25zb2xlV3JpdGUoYDxicj48aT4qKiAnZm9yY2VkJyBzaG91bGQgYmUgaW4gdGhl IHRpdGxlIG9mIGEgZm9yY2VkIHRyYWNrIG1lbnUgaXRlbTxpPmApOworICAgICAgICAgICAgICAg IGxpc3RUcmFja01lbnUoKTsKKwogICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPjxp PioqIE5vIHRyYWNrIHNob3VsZCBiZSBlbmFibGVkIGJ5IGRlZmF1bHQ8IiArICIvaT4iKTsKICAg ICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3NbMF0ubGFuZ3VhZ2Ui LCAiZW4iKTsKICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3Nb MF0ua2luZCIsICJzdWJ0aXRsZXMiKTsKQEAgLTMxLDcgKzMzLDcgQEAKICAgICAgICAgICAgICAg ICBjb25zb2xlV3JpdGUoIiIpOwogCiAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRl by50ZXh0VHJhY2tzWzFdLmxhbmd1YWdlIiwgImVuIik7Ci0gICAgICAgICAgICAgICAgdGVzdEV4 cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzFdLmtpbmQiLCAic3VidGl0bGVzIik7CisgICAgICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzFdLmtpbmQiLCAiZm9yY2Vk Iik7CiAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzFdLm1v ZGUiLCAiZGlzYWJsZWQiKTsKICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwogCkBA IC00MSw3ICs0Myw3IEBACiAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKIAogICAg ICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1szXS5sYW5ndWFnZSIs ICJmciIpOwotICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1sz XS5raW5kIiwgInN1YnRpdGxlcyIpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlk ZW8udGV4dFRyYWNrc1szXS5raW5kIiwgImZvcmNlZCIpOwogICAgICAgICAgICAgICAgIHRlc3RF eHBlY3RlZCgidmlkZW8udGV4dFRyYWNrc1szXS5tb2RlIiwgImRpc2FibGVkIik7CiAgICAgICAg ICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKIApAQCAtNTEsNyArNTMsNyBAQAogICAgICAgICAg ICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CiAKICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo InZpZGVvLnRleHRUcmFja3NbNV0ubGFuZ3VhZ2UiLCAiZXMiKTsKLSAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3NbNV0ua2luZCIsICJzdWJ0aXRsZXMiKTsKKyAg ICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3NbNV0ua2luZCIsICJm b3JjZWQiKTsKICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3Nb NV0ubW9kZSIsICJkaXNhYmxlZCIpOwogICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7 CiAKQEAgLTYxLDcgKzYzLDcgQEAKICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwog CiAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzddLmxhbmd1 YWdlIiwgImRlIik7Ci0gICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJh Y2tzWzddLmtpbmQiLCAic3VidGl0bGVzIik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby50ZXh0VHJhY2tzWzddLmtpbmQiLCAiZm9yY2VkIik7CiAgICAgICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzWzddLm1vZGUiLCAiZGlzYWJsZWQiKTsKICAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwogCg==