118319 2013-07-02 12:40:39 -0700 [Mac] .webkitClosedCaptionsVisible doesn't work with "Automatic" caption mode 2023-10-14 09:18:25 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 118333 1 eric.carlson eric.carlson ahmad.saleem792 commit-queue dfarler dino esprehn+autocc glenn jer.noble oldest_to_newest 905548 0 eric.carlson 2013-07-02 12:40:39 -0700 Setting video.webkitClosedCaptionsVisible = true has no effect when the caption menu is in "Automatic" mode. 905549 1 eric.carlson 2013-07-02 12:41:43 -0700 <rdar://problem/13834460> 905553 2 205938 eric.carlson 2013-07-02 12:52:20 -0700 Created attachment 205938 Proposed patch 905565 3 eric.carlson 2013-07-02 13:30:47 -0700 Committed in r152318: https://trac.webkit.org/r152318 905647 4 commit-queue 2013-07-02 17:27:30 -0700 Re-opened since this is blocked by bug 118333 905652 5 dfarler 2013-07-02 17:34:58 -0700 *** Bug 118332 has been marked as a duplicate of this bug. *** 905654 6 dfarler 2013-07-02 17:36:22 -0700 <rdar://problem/14339340> 906023 7 206044 eric.carlson 2013-07-03 19:11:37 -0700 Created attachment 206044 Patch that causes fewer regressions! 906024 8 206045 eric.carlson 2013-07-03 19:22:46 -0700 Created attachment 206045 Patch that causes fewer regressions, AND with a complete ChangeLog! 906460 9 206045 jer.noble 2013-07-05 11:20:45 -0700 Comment on attachment 206045 Patch that causes fewer regressions, AND with a complete ChangeLog! View in context: https://bugs.webkit.org/attachment.cgi?id=206045&action=review > Source/WebCore/html/HTMLMediaElement.cpp:301 > , m_closedCaptionsVisible(false) > + , m_webkitClosedCaptionsVisible(false) It seems awkward to have these two ivars named so similarly. How about m_webkitLegacyClosedCaptionOverride? > Source/WebCore/html/HTMLMediaElement.cpp:4530 > + m_webkitClosedCaptionsVisible = visible; This would be: m_webkitLegacyClosedCaptionOverride = visible; > Source/WebCore/html/HTMLMediaElement.cpp:4532 > + m_webkitClosedCaptionsVisible = m_closedCaptionsVisible; You can remove this line if... (ctd) > Source/WebCore/html/HTMLMediaElement.cpp:4537 > - return m_closedCaptionsVisible; > + return m_webkitClosedCaptionsVisible; You rename this: m_closedCaptionsVisible && m_webkitLegacyClosedCaptionOverride; 906472 10 eric.carlson 2013-07-05 13:37:55 -0700 (In reply to comment #9) > (From update of attachment 206045 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206045&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:301 > > , m_closedCaptionsVisible(false) > > + , m_webkitClosedCaptionsVisible(false) > > It seems awkward to have these two ivars named so similarly. How about m_webkitLegacyClosedCaptionOverride? > > > Source/WebCore/html/HTMLMediaElement.cpp:4530 > > + m_webkitClosedCaptionsVisible = visible; > > This would be: m_webkitLegacyClosedCaptionOverride = visible; > > > Source/WebCore/html/HTMLMediaElement.cpp:4532 > > + m_webkitClosedCaptionsVisible = m_closedCaptionsVisible; > > You can remove this line if... (ctd) > > > Source/WebCore/html/HTMLMediaElement.cpp:4537 > > - return m_closedCaptionsVisible; > > + return m_webkitClosedCaptionsVisible; > > You rename this: m_closedCaptionsVisible && m_webkitLegacyClosedCaptionOverride; All good suggestions, I will make them before landing. Thanks! 906473 11 eric.carlson 2013-07-05 13:38:03 -0700 Committed in r152422: https://trac.webkit.org/r152422 1985120 12 ahmad.saleem792 2023-10-14 09:18:25 -0700 Landed finally with this but didn't get marked as 'RESOLVED FIXED': https://github.com/WebKit/WebKit/commit/97a3125e7fc58bc3583d6ca841d59eb507fe1dcf 205938 2013-07-02 12:52:20 -0700 2013-07-03 19:11:37 -0700 Proposed patch patch_1.txt text/plain 6312 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjMxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3LTAyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIC53ZWJraXRD bG9zZWRDYXB0aW9uc1Zpc2libGUgZG9lc24ndCB3b3JrIHdpdGggIkF1dG9tYXRpYyIgY2FwdGlv biBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0OiBtZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS5odG1s CisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjp0ZXh0VHJhY2tT ZWxlY3Rpb25TY29yZSk6IERvbid0IGFwcGx5ICJhdXRvbWF0aWMiCisgICAgICAgICAgICBsb2dp YyB3aGVuIGNhcHRpb25zIHdlcmUgZW5hYmxlZCB3aXRoIC53ZWJraXRDbG9zZWRDYXB0aW9uc1Zp c2libGUuCisKIDIwMTMtMDYtMjYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgog CiAgICAgICAgIGVtcHR5IGlubGluZXMgc2hvdWxkIG5vdCBhZmZlY3QgbGluZS13cmFwcGluZwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVu Y2VzTWVkaWFBRi5jcHAJKHJldmlzaW9uIDE1MjI5MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02ODAs NyArNjgwLDcgQEAgaW50IENhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjp0ZXh0VAogCiAg ICAgVmVjdG9yPFN0cmluZz4gdXNlclByZWZlcnJlZENhcHRpb25MYW5ndWFnZXMgPSBwcmVmZXJy ZWRMYW5ndWFnZXMoKTsKIAotICAgIGlmIChkaXNwbGF5TW9kZSA9PSBBdXRvbWF0aWMgfHwgdHJh Y2tIYXNPbmx5Rm9yY2VkU3VidGl0bGVzKSB7CisgICAgaWYgKChkaXNwbGF5TW9kZSA9PSBBdXRv bWF0aWMgJiYgIWxlZ2FjeU92ZXJyaWRlKSB8fCB0cmFja0hhc09ubHlGb3JjZWRTdWJ0aXRsZXMp IHsKIAogICAgICAgICBpZiAoIW1lZGlhRWxlbWVudCB8fCAhbWVkaWFFbGVtZW50LT5wbGF5ZXIo KSkKICAgICAgICAgICAgIHJldHVybiAwOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTUyMzE0KQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTMtMDctMDIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW01hY10gLndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSBkb2Vzbid0IHdvcmsgd2l0aCAi QXV0b21hdGljIiBjYXB0aW9uIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExODMxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogbWVkaWEvdHJhY2svdHJhY2stbGVnYWN5YXBpLXdpdGgtYXV0b21h dGljLW1vZGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS90cmFjay90cmFj ay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS5odG1sOiBBZGRlZC4KKwogMjAxMy0wNi0y NiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgZW1wdHkgaW5s aW5lcyBzaG91bGQgbm90IGFmZmVjdCBsaW5lLXdyYXBwaW5nCkluZGV4OiBMYXlvdXRUZXN0cy9t ZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS1leHBlY3RlZC50 eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stbGVnYWN5YXBp LXdpdGgtYXV0b21hdGljLW1vZGUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvbWVkaWEvdHJhY2svdHJhY2stbGVnYWN5YXBpLXdpdGgtYXV0b21hdGljLW1vZGUtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzAgQEAKK1Rlc3QgdGhhdCBlbmFi bGluZyBhIHRyYWNrIHdpdGggLndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSBzdWNjZWVkcyB3 aGVuIGluICJhdXRvbWF0aWMiIG1vZGUuCisKKworKiogU2V0dXAKK1JVTihpbnRlcm5hbHMuc2V0 Q2FwdGlvbkRpc3BsYXlNb2RlKCdBdXRvbWF0aWMnKSkKK1JVTih0cmFja0VsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCd0cmFjaycpKQorUlVOKHRyYWNrRWxlbWVudC5raW5kID0gJ2Nh cHRpb25zJykKK1JVTih0cmFja0VsZW1lbnQuc3JjID0gJ2NhcHRpb25zLXdlYnZ0dC90YzAwNC13 ZWJ2dHQtZmlsZS52dHQnKQorUlVOKHZpZGVvLmFwcGVuZENoaWxkKHRyYWNrRWxlbWVudCkpCisK K0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorCisqKiBUZXN0IGluaXRpYWwgc3RhdGUKK0VYUEVDVEVE ICh2aWRlby50ZXh0VHJhY2tzLmxlbmd0aCA9PSAnMScpIE9LCitFWFBFQ1RFRCAodmlkZW8udGV4 dFRyYWNrc1swXS5tb2RlID09ICdkaXNhYmxlZCcpIE9LCisKKyoqIEVuYWJsZSBjdWVzLCBhbGxv dyB0aGVtIHRvIGxvYWQKK1JVTih2aWRlby53ZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2libGUgPSB0 cnVlKQorRVZFTlQobG9hZCkKK0VYUEVDVEVEICh0cmFjay5yZWFkeVN0YXRlID09ICcyJykgT0sK K1JVTih2aWRlby5jdXJyZW50VGltZSA9IDAuNSkKKworRVZFTlQoc2Vla2VkKQorCisqKiBDaGVj ayB0byBtYWtlIHN1cmUgY2FwdGlvbnMgYXJlIGRpc3BsYXlpbmcKK0VYUEVDVEVEICh2aWRlby50 ZXh0VHJhY2tzWzBdLmN1ZXMgIT0gJ251bGwnKSBPSworRVhQRUNURUQgKHRleHRUcmFja0Rpc3Bs YXlFbGVtZW50KHZpZGVvLCAnY3VlJykudGV4dENvbnRlbnQgIT0gJ251bGwnKSBPSworCitFTkQg T0YgVEVTVAorCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGkt d2l0aC1hdXRvbWF0aWMtbW9kZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlh L3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1dG9tYXRpYy1tb2RlLmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRv bWF0aWMtbW9kZS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNjcgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDx0aXRsZT5FbmFibGluZyBhIHRy YWNrIHdpdGggbGVnYWN5IEFQSSBzdWNjZWVkcyB3aGVuIGluICJBdXRvbWF0aWMiIG1vZGU8L3Rp dGxlPgorCisgICAgICAgIDxzY3JpcHQgc3JjPS4uL21lZGlhLWZpbGUuanM+PC9zY3JpcHQ+Cisg ICAgICAgIDxzY3JpcHQgc3JjPS4uL3ZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CisgICAgICAgIDxz Y3JpcHQgc3JjPS4uL3RyYWNrbWVudS10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 IHNyYz0uLi9tZWRpYS1jb250cm9scy5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKwor ICAgICAgICAgICAgZnVuY3Rpb24gc2Vla2VkKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIjxicj48aT4qKiBDaGVjayB0byBtYWtlIHN1cmUgY2FwdGlvbnMg YXJlIGRpc3BsYXlpbmc8IiArICIvaT4iKTsKKworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgidmlkZW8udGV4dFRyYWNrc1swXS5jdWVzIiwgbnVsbCwgJyE9Jyk7CisgICAgICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ0ZXh0VHJhY2tEaXNwbGF5RWxlbWVudCh2aWRlbywgJ2N1ZScpLnRl eHRDb250ZW50IiwgbnVsbCwgJyE9Jyk7CisKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUo IiIpOworICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgZnVuY3Rpb24gdHJhY2tMb2FkZWQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiRVZFTlQobG9hZCkiKTsKKyAgICAgICAgICAgICAgICB0cmFjayA9 IGV2ZW50LnRhcmdldDsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInRyYWNrLnJlYWR5 U3RhdGUiLCBIVE1MVHJhY2tFbGVtZW50LkxPQURFRCk7CisgICAgICAgICAgICAgICAgcnVuKCJ2 aWRlby5jdXJyZW50VGltZSA9IDAuNSIpOworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgn c2Vla2VkJywgc2Vla2VkKTsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBjYW5wbGF5dGhyb3VnaCgpCisgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+PGk+KiogVGVzdCBp bml0aWFsIHN0YXRlPCIgKyAiL2k+Iik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby50ZXh0VHJhY2tzLmxlbmd0aCIsIDEpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgidmlkZW8udGV4dFRyYWNrc1swXS5tb2RlIiwgImRpc2FibGVkIik7CisKKyAgICAgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIjxicj48aT4qKiBFbmFibGUgY3VlcywgYWxsb3cgdGhlbSB0byBs b2FkPCIgKyAiL2k+Iik7CisgICAgICAgICAgICAgICAgcnVuKCJ2aWRlby53ZWJraXRDbG9zZWRD YXB0aW9uc1Zpc2libGUgPSB0cnVlIik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1 bmN0aW9uIHNldHVwKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3Jp dGUoIjxicj48aT4qKiBTZXR1cDwiICsgIi9pPiIpOworICAgICAgICAgICAgICAgIGZpbmRNZWRp YUVsZW1lbnQoKTsKKworICAgICAgICAgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAg ICAgICAgICAgICAgICAgICBydW4oImludGVybmFscy5zZXRDYXB0aW9uRGlzcGxheU1vZGUoJ0F1 dG9tYXRpYycpIik7CisgICAgICAgICAgICAgICAgcnVuKCJ0cmFja0VsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCd0cmFjaycpIik7CisgICAgICAgICAgICAgICAgcnVuKCJ0cmFja0Vs ZW1lbnQua2luZCA9ICdjYXB0aW9ucyciKTsKKyAgICAgICAgICAgICAgICBydW4oInRyYWNrRWxl bWVudC5zcmMgPSAnY2FwdGlvbnMtd2VidnR0L3RjMDA0LXdlYnZ0dC1maWxlLnZ0dCciKTsKKyAg ICAgICAgICAgICAgICBydW4oInZpZGVvLmFwcGVuZENoaWxkKHRyYWNrRWxlbWVudCkiKTsKKwor ICAgICAgICAgICAgICAgIHZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoJ3ZpZGVvJywgJy4uL2Nv bnRlbnQvdGVzdCcpOworICAgICAgICAgICAgICAgIHRyYWNrRWxlbWVudC5zZXRBdHRyaWJ1dGUo J29ubG9hZCcsICd0cmFja0xvYWRlZCgpJyk7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50 KCdjYW5wbGF5dGhyb3VnaCcsIGNhbnBsYXl0aHJvdWdoKTsKKyAgICAgICAgICAgICAgICBjb25z b2xlV3JpdGUoIiIpOworICAgICAgICAgICAgfQorCisgICAgICAgIDwvc2NyaXB0PgorICAgIDwv aGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9InNldHVwKCkiPgorICAgICAgICA8dmlkZW8gY29udHJv bHMgd2lkdGg9NTAwPjwvdmlkZW8+CisgICAgICAgIDxwPlRlc3QgdGhhdCBlbmFibGluZyBhIHRy YWNrIHdpdGggLndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSBzdWNjZWVkcyB3aGVuIGluICJh dXRvbWF0aWMiIG1vZGUuPC9wPgorICAgIDwvYm9keT4KKzwvaHRtbD4K 206044 2013-07-03 19:11:37 -0700 2013-07-03 19:22:46 -0700 Patch that causes fewer regressions! patch_2.txt text/plain 7733 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjM3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3LTAzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIC53ZWJraXRD bG9zZWRDYXB0aW9uc1Zpc2libGUgZG9lc24ndCB3b3JrIHdpdGggIkF1dG9tYXRpYyIgY2FwdGlv biBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0OiBtZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS5odG1s CisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGOjp0ZXh0VHJhY2tT ZWxlY3Rpb25TY29yZSk6IERvbid0IGFwcGx5ICJhdXRvbWF0aWMiCisgICAgICAgICAgICBsb2dp YyB3aGVuIGNhcHRpb25zIHdlcmUgZW5hYmxlZCB3aXRoIC53ZWJraXRDbG9zZWRDYXB0aW9uc1Zp c2libGUuCisKIDIwMTMtMDctMDMgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4K IAogICAgICAgICBTcGVjdWxhdGl2ZSBidWlsZCBmaXggYWZ0ZXIgcjE1MjM0MC4KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTUyMzc0KQor KysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjk4LDYgKzI5OCw3IEBAIEhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQo Y29uc3QKICAgICAsIG1fc2VuZFByb2dyZXNzRXZlbnRzKHRydWUpCiAgICAgLCBtX2lzRnVsbHNj cmVlbihmYWxzZSkKICAgICAsIG1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxlKGZhbHNlKQorICAgICwg bV93ZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2libGUoZmFsc2UpCiAjaWYgRU5BQkxFKFBMVUdJTl9Q Uk9YWV9GT1JfVklERU8pCiAgICAgLCBtX25lZWRXaWRnZXRVcGRhdGUoZmFsc2UpCiAjZW5kaWYK QEAgLTQ1MjYsMTIgKzQ1MjcsMTQgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRDbG9zZWRD YXB0aW9ucwogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFdlYmtpdENsb3NlZENhcHRpb25z VmlzaWJsZShib29sIHZpc2libGUpCiB7CisgICAgbV93ZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2li bGUgPSB2aXNpYmxlOwogICAgIHNldENsb3NlZENhcHRpb25zVmlzaWJsZSh2aXNpYmxlKTsKKyAg ICBtX3dlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSA9IG1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxl OwogfQogCiBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJs ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxlOworICAgIHJl dHVybiBtX3dlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZTsKIH0KIAogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gMTUyMzc0KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTcxMCw2 ICs3MTAsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2lzRnVsbHNjcmVlbiA6IDE7CiAgICAg Ym9vbCBtX2Nsb3NlZENhcHRpb25zVmlzaWJsZSA6IDE7CisgICAgYm9vbCBtX3dlYmtpdENsb3Nl ZENhcHRpb25zVmlzaWJsZSA6IDE7CiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURF TykKICAgICBib29sIG1fbmVlZFdpZGdldFVwZGF0ZSA6IDE7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAkocmV2 aXNpb24gMTUyMzc0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVu Y2VzTWVkaWFBRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4MCw3ICs2ODAsNyBAQCBpbnQgQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnRleHRUCiAKICAgICBWZWN0b3I8U3RyaW5nPiB1 c2VyUHJlZmVycmVkQ2FwdGlvbkxhbmd1YWdlcyA9IHByZWZlcnJlZExhbmd1YWdlcygpOwogCi0g ICAgaWYgKGRpc3BsYXlNb2RlID09IEF1dG9tYXRpYyB8fCB0cmFja0hhc09ubHlGb3JjZWRTdWJ0 aXRsZXMpIHsKKyAgICBpZiAoKGRpc3BsYXlNb2RlID09IEF1dG9tYXRpYyAmJiAhbGVnYWN5T3Zl cnJpZGUpIHx8IHRyYWNrSGFzT25seUZvcmNlZFN1YnRpdGxlcykgewogCiAgICAgICAgIGlmICgh bWVkaWFFbGVtZW50IHx8ICFtZWRpYUVsZW1lbnQtPnBsYXllcigpKQogICAgICAgICAgICAgcmV0 dXJuIDA7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTIzNzQpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wNy0wMyAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSAud2Via2l0Q2xv c2VkQ2FwdGlvbnNWaXNpYmxlIGRvZXNuJ3Qgd29yayB3aXRoICJBdXRvbWF0aWMiIGNhcHRpb24g bW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4 MzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBt ZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1 dG9tYXRpYy1tb2RlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA3LTAzICBTaW1vbiBQZW5hICA8c2lt b24ucGVuYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBXZWJUZXh0Q2hlY2tlckNsaWVudCBkb2Vz bid0IGluaXRpYWxpemUgb3V0cHV0IGFyZ3VtZW50cy4KSW5kZXg6IExheW91dFRlc3RzL21lZGlh L3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1dG9tYXRpYy1tb2RlLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0 aC1hdXRvbWF0aWMtbW9kZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9tZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMCBAQAorVGVzdCB0aGF0IGVuYWJsaW5n IGEgdHJhY2sgd2l0aCAud2Via2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxlIHN1Y2NlZWRzIHdoZW4g aW4gImF1dG9tYXRpYyIgbW9kZS4KKworCisqKiBTZXR1cAorUlVOKGludGVybmFscy5zZXRDYXB0 aW9uRGlzcGxheU1vZGUoJ0F1dG9tYXRpYycpKQorUlVOKHRyYWNrRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoJ3RyYWNrJykpCitSVU4odHJhY2tFbGVtZW50LmtpbmQgPSAnY2FwdGlv bnMnKQorUlVOKHRyYWNrRWxlbWVudC5zcmMgPSAnY2FwdGlvbnMtd2VidnR0L3RjMDA0LXdlYnZ0 dC1maWxlLnZ0dCcpCitSVU4odmlkZW8uYXBwZW5kQ2hpbGQodHJhY2tFbGVtZW50KSkKKworRVZF TlQoY2FucGxheXRocm91Z2gpCisKKyoqIFRlc3QgaW5pdGlhbCBzdGF0ZQorRVhQRUNURUQgKHZp ZGVvLnRleHRUcmFja3MubGVuZ3RoID09ICcxJykgT0sKK0VYUEVDVEVEICh2aWRlby50ZXh0VHJh Y2tzWzBdLm1vZGUgPT0gJ2Rpc2FibGVkJykgT0sKKworKiogRW5hYmxlIGN1ZXMsIGFsbG93IHRo ZW0gdG8gbG9hZAorUlVOKHZpZGVvLndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSA9IHRydWUp CitFVkVOVChsb2FkKQorRVhQRUNURUQgKHRyYWNrLnJlYWR5U3RhdGUgPT0gJzInKSBPSworUlVO KHZpZGVvLmN1cnJlbnRUaW1lID0gMC41KQorCitFVkVOVChzZWVrZWQpCisKKyoqIENoZWNrIHRv IG1ha2Ugc3VyZSBjYXB0aW9ucyBhcmUgZGlzcGxheWluZworRVhQRUNURUQgKHZpZGVvLnRleHRU cmFja3NbMF0uY3VlcyAhPSAnbnVsbCcpIE9LCitFWFBFQ1RFRCAodGV4dFRyYWNrRGlzcGxheUVs ZW1lbnQodmlkZW8sICdjdWUnKS50ZXh0Q29udGVudCAhPSAnbnVsbCcpIE9LCisKK0VORCBPRiBU RVNUCisKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRo LWF1dG9tYXRpYy1tb2RlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJh Y2svdHJhY2stbGVnYWN5YXBpLXdpdGgtYXV0b21hdGljLW1vZGUuaHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1dG9tYXRp Yy1tb2RlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw2NyBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHRpdGxlPkVuYWJsaW5nIGEgdHJhY2sg d2l0aCBsZWdhY3kgQVBJIHN1Y2NlZWRzIHdoZW4gaW4gIkF1dG9tYXRpYyIgbW9kZTwvdGl0bGU+ CisKKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICAg ICAgPHNjcmlwdCBzcmM9Li4vdmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Li4vdHJhY2ttZW51LXRlc3QuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3Jj PS4uL21lZGlhLWNvbnRyb2xzLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorCisgICAg ICAgICAgICBmdW5jdGlvbiBzZWVrZWQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiPGJyPjxpPioqIENoZWNrIHRvIG1ha2Ugc3VyZSBjYXB0aW9ucyBhcmUg ZGlzcGxheWluZzwiICsgIi9pPiIpOworCisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby50ZXh0VHJhY2tzWzBdLmN1ZXMiLCBudWxsLCAnIT0nKTsKKyAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoInRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykudGV4dENv bnRlbnQiLCBudWxsLCAnIT0nKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7 CisgICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAg ICBmdW5jdGlvbiB0cmFja0xvYWRlZCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCJFVkVOVChsb2FkKSIpOworICAgICAgICAgICAgICAgIHRyYWNrID0gZXZl bnQudGFyZ2V0OworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidHJhY2sucmVhZHlTdGF0 ZSIsIEhUTUxUcmFja0VsZW1lbnQuTE9BREVEKTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVv LmN1cnJlbnRUaW1lID0gMC41Iik7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdzZWVr ZWQnLCBzZWVrZWQpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGNhbnBsYXl0aHJvdWdoKCkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj48aT4qKiBUZXN0IGluaXRp YWwgc3RhdGU8IiArICIvaT4iKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVv LnRleHRUcmFja3MubGVuZ3RoIiwgMSk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby50ZXh0VHJhY2tzWzBdLm1vZGUiLCAiZGlzYWJsZWQiKTsKKworICAgICAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiPGJyPjxpPioqIEVuYWJsZSBjdWVzLCBhbGxvdyB0aGVtIHRvIGxvYWQ8 IiArICIvaT4iKTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVvLndlYmtpdENsb3NlZENhcHRp b25zVmlzaWJsZSA9IHRydWUiKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rp b24gc2V0dXAoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgi PGJyPjxpPioqIFNldHVwPCIgKyAiL2k+Iik7CisgICAgICAgICAgICAgICAgZmluZE1lZGlhRWxl bWVudCgpOworCisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAg ICAgICAgICAgICAgIHJ1bigiaW50ZXJuYWxzLnNldENhcHRpb25EaXNwbGF5TW9kZSgnQXV0b21h dGljJykiKTsKKyAgICAgICAgICAgICAgICBydW4oInRyYWNrRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoJ3RyYWNrJykiKTsKKyAgICAgICAgICAgICAgICBydW4oInRyYWNrRWxlbWVu dC5raW5kID0gJ2NhcHRpb25zJyIpOworICAgICAgICAgICAgICAgIHJ1bigidHJhY2tFbGVtZW50 LnNyYyA9ICdjYXB0aW9ucy13ZWJ2dHQvdGMwMDQtd2VidnR0LWZpbGUudnR0JyIpOworICAgICAg ICAgICAgICAgIHJ1bigidmlkZW8uYXBwZW5kQ2hpbGQodHJhY2tFbGVtZW50KSIpOworCisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vY29udGVu dC90ZXN0Jyk7CisgICAgICAgICAgICAgICAgdHJhY2tFbGVtZW50LnNldEF0dHJpYnV0ZSgnb25s b2FkJywgJ3RyYWNrTG9hZGVkKCknKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2Nh bnBsYXl0aHJvdWdoJywgY2FucGxheXRocm91Z2gpOworICAgICAgICAgICAgICAgIGNvbnNvbGVX cml0ZSgiIik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFk PgorICAgIDxib2R5IG9ubG9hZD0ic2V0dXAoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scyB3 aWR0aD01MDA+PC92aWRlbz4KKyAgICAgICAgPHA+VGVzdCB0aGF0IGVuYWJsaW5nIGEgdHJhY2sg d2l0aCAud2Via2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxlIHN1Y2NlZWRzIHdoZW4gaW4gImF1dG9t YXRpYyIgbW9kZS48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 206045 2013-07-03 19:22:46 -0700 2013-07-05 13:40:07 -0700 Patch that causes fewer regressions, AND with a complete ChangeLog! patch_3.txt text/plain 8303 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjM4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA3LTAzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIC53ZWJraXRD bG9zZWRDYXB0aW9uc1Zpc2libGUgZG9lc24ndCB3b3JrIHdpdGggIkF1dG9tYXRpYyIgY2FwdGlv biBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayB3aGVuIGNhcHRpb25zIGFyZSBlbmFibGVkIHdpdGggdGhlIG9sZCAnd2Via2l0Q2xvc2Vk Q2FwdGlvbnNWaXNpYmxlJyBhdHRyaWJ1dGUgYW5kCisgICAgICAgIGNvbnNpZGVyIHRoYXQgd2hl biBkZXRlcm1pbmluZyB3aGljaCB0cmFjayBzaG91bGQgYmUgZW5hYmxlZC4KKworICAgICAgICBU ZXN0OiBtZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS5odG1s CisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTE1lZGlhRWxlbWVudDo6SFRNTE1lZGlhRWxlbWVudCk6IEluaXRpYWxpemUgbV93ZWJr aXRDbG9zZWRDYXB0aW9uc1Zpc2libGUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVt ZW50OjpzZXRXZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2libGUpOiBTZXQgbV93ZWJraXRDbG9zZWRD YXB0aW9uc1Zpc2libGUKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OndlYmtp dENsb3NlZENhcHRpb25zVmlzaWJsZSk6IFJldHVybiBtX3dlYmtpdENsb3NlZENhcHRpb25zVmlz aWJsZS4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKworICAgICAgICAqIHBh Z2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnRleHRUcmFja1NlbGVjdGlvblNjb3JlKTog RG9uJ3QgYXBwbHkgImF1dG9tYXRpYyIKKyAgICAgICAgICAgIGxvZ2ljIHdoZW4gY2FwdGlvbnMg d2VyZSBlbmFibGVkIHdpdGggLndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZS4KKwogMjAxMy0w Ny0wMyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2lu ZG93c10gVW5yZXZpZXdlZCBidWlsZCBjb3JyZWN0aW9uIGFmdGVyIHIxNTI4My4KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTUyMzc0KQor KysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjk4LDYgKzI5OCw3IEBAIEhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQo Y29uc3QKICAgICAsIG1fc2VuZFByb2dyZXNzRXZlbnRzKHRydWUpCiAgICAgLCBtX2lzRnVsbHNj cmVlbihmYWxzZSkKICAgICAsIG1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxlKGZhbHNlKQorICAgICwg bV93ZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2libGUoZmFsc2UpCiAjaWYgRU5BQkxFKFBMVUdJTl9Q Uk9YWV9GT1JfVklERU8pCiAgICAgLCBtX25lZWRXaWRnZXRVcGRhdGUoZmFsc2UpCiAjZW5kaWYK QEAgLTQ1MjYsMTIgKzQ1MjcsMTQgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRDbG9zZWRD YXB0aW9ucwogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFdlYmtpdENsb3NlZENhcHRpb25z VmlzaWJsZShib29sIHZpc2libGUpCiB7CisgICAgbV93ZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2li bGUgPSB2aXNpYmxlOwogICAgIHNldENsb3NlZENhcHRpb25zVmlzaWJsZSh2aXNpYmxlKTsKKyAg ICBtX3dlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSA9IG1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxl OwogfQogCiBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJs ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxlOworICAgIHJl dHVybiBtX3dlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZTsKIH0KIAogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gMTUyMzc0KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTcxMCw2 ICs3MTAsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2lzRnVsbHNjcmVlbiA6IDE7CiAgICAg Ym9vbCBtX2Nsb3NlZENhcHRpb25zVmlzaWJsZSA6IDE7CisgICAgYm9vbCBtX3dlYmtpdENsb3Nl ZENhcHRpb25zVmlzaWJsZSA6IDE7CiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURF TykKICAgICBib29sIG1fbmVlZFdpZGdldFVwZGF0ZSA6IDE7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNZWRpYUFGLmNwcAkocmV2 aXNpb24gMTUyMzc0KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVu Y2VzTWVkaWFBRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4MCw3ICs2ODAsNyBAQCBpbnQgQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnRleHRUCiAKICAgICBWZWN0b3I8U3RyaW5nPiB1 c2VyUHJlZmVycmVkQ2FwdGlvbkxhbmd1YWdlcyA9IHByZWZlcnJlZExhbmd1YWdlcygpOwogCi0g ICAgaWYgKGRpc3BsYXlNb2RlID09IEF1dG9tYXRpYyB8fCB0cmFja0hhc09ubHlGb3JjZWRTdWJ0 aXRsZXMpIHsKKyAgICBpZiAoKGRpc3BsYXlNb2RlID09IEF1dG9tYXRpYyAmJiAhbGVnYWN5T3Zl cnJpZGUpIHx8IHRyYWNrSGFzT25seUZvcmNlZFN1YnRpdGxlcykgewogCiAgICAgICAgIGlmICgh bWVkaWFFbGVtZW50IHx8ICFtZWRpYUVsZW1lbnQtPnBsYXllcigpKQogICAgICAgICAgICAgcmV0 dXJuIDA7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTIzODYpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wNy0wMyAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSAud2Via2l0Q2xv c2VkQ2FwdGlvbnNWaXNpYmxlIGRvZXNuJ3Qgd29yayB3aXRoICJBdXRvbWF0aWMiIGNhcHRpb24g bW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4 MzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBt ZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1 dG9tYXRpYy1tb2RlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA3LTAzICBTaW1vbiBQZW5hICA8c2lt b24ucGVuYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBXZWJUZXh0Q2hlY2tlckNsaWVudCBkb2Vz bid0IGluaXRpYWxpemUgb3V0cHV0IGFyZ3VtZW50cy4KSW5kZXg6IExheW91dFRlc3RzL21lZGlh L3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1dG9tYXRpYy1tb2RlLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0 aC1hdXRvbWF0aWMtbW9kZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9tZWRpYS90cmFjay90cmFjay1sZWdhY3lhcGktd2l0aC1hdXRvbWF0aWMtbW9kZS1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMCBAQAorVGVzdCB0aGF0IGVuYWJsaW5n IGEgdHJhY2sgd2l0aCAud2Via2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxlIHN1Y2NlZWRzIHdoZW4g aW4gImF1dG9tYXRpYyIgbW9kZS4KKworCisqKiBTZXR1cAorUlVOKGludGVybmFscy5zZXRDYXB0 aW9uRGlzcGxheU1vZGUoJ0F1dG9tYXRpYycpKQorUlVOKHRyYWNrRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoJ3RyYWNrJykpCitSVU4odHJhY2tFbGVtZW50LmtpbmQgPSAnY2FwdGlv bnMnKQorUlVOKHRyYWNrRWxlbWVudC5zcmMgPSAnY2FwdGlvbnMtd2VidnR0L3RjMDA0LXdlYnZ0 dC1maWxlLnZ0dCcpCitSVU4odmlkZW8uYXBwZW5kQ2hpbGQodHJhY2tFbGVtZW50KSkKKworRVZF TlQoY2FucGxheXRocm91Z2gpCisKKyoqIFRlc3QgaW5pdGlhbCBzdGF0ZQorRVhQRUNURUQgKHZp ZGVvLnRleHRUcmFja3MubGVuZ3RoID09ICcxJykgT0sKK0VYUEVDVEVEICh2aWRlby50ZXh0VHJh Y2tzWzBdLm1vZGUgPT0gJ2Rpc2FibGVkJykgT0sKKworKiogRW5hYmxlIGN1ZXMsIGFsbG93IHRo ZW0gdG8gbG9hZAorUlVOKHZpZGVvLndlYmtpdENsb3NlZENhcHRpb25zVmlzaWJsZSA9IHRydWUp CitFVkVOVChsb2FkKQorRVhQRUNURUQgKHRyYWNrLnJlYWR5U3RhdGUgPT0gJzInKSBPSworUlVO KHZpZGVvLmN1cnJlbnRUaW1lID0gMC41KQorCitFVkVOVChzZWVrZWQpCisKKyoqIENoZWNrIHRv IG1ha2Ugc3VyZSBjYXB0aW9ucyBhcmUgZGlzcGxheWluZworRVhQRUNURUQgKHZpZGVvLnRleHRU cmFja3NbMF0uY3VlcyAhPSAnbnVsbCcpIE9LCitFWFBFQ1RFRCAodGV4dFRyYWNrRGlzcGxheUVs ZW1lbnQodmlkZW8sICdjdWUnKS50ZXh0Q29udGVudCAhPSAnbnVsbCcpIE9LCisKK0VORCBPRiBU RVNUCisKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRo LWF1dG9tYXRpYy1tb2RlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdHJh Y2svdHJhY2stbGVnYWN5YXBpLXdpdGgtYXV0b21hdGljLW1vZGUuaHRtbAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL21lZGlhL3RyYWNrL3RyYWNrLWxlZ2FjeWFwaS13aXRoLWF1dG9tYXRp Yy1tb2RlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw2NyBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHRpdGxlPkVuYWJsaW5nIGEgdHJhY2sg d2l0aCBsZWdhY3kgQVBJIHN1Y2NlZWRzIHdoZW4gaW4gIkF1dG9tYXRpYyIgbW9kZTwvdGl0bGU+ CisKKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICAg ICAgPHNjcmlwdCBzcmM9Li4vdmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlw dCBzcmM9Li4vdHJhY2ttZW51LXRlc3QuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3Jj PS4uL21lZGlhLWNvbnRyb2xzLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorCisgICAg ICAgICAgICBmdW5jdGlvbiBzZWVrZWQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiPGJyPjxpPioqIENoZWNrIHRvIG1ha2Ugc3VyZSBjYXB0aW9ucyBhcmUg ZGlzcGxheWluZzwiICsgIi9pPiIpOworCisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby50ZXh0VHJhY2tzWzBdLmN1ZXMiLCBudWxsLCAnIT0nKTsKKyAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoInRleHRUcmFja0Rpc3BsYXlFbGVtZW50KHZpZGVvLCAnY3VlJykudGV4dENv bnRlbnQiLCBudWxsLCAnIT0nKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7 CisgICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAg ICBmdW5jdGlvbiB0cmFja0xvYWRlZCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCJFVkVOVChsb2FkKSIpOworICAgICAgICAgICAgICAgIHRyYWNrID0gZXZl bnQudGFyZ2V0OworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidHJhY2sucmVhZHlTdGF0 ZSIsIEhUTUxUcmFja0VsZW1lbnQuTE9BREVEKTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVv LmN1cnJlbnRUaW1lID0gMC41Iik7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdzZWVr ZWQnLCBzZWVrZWQpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGNhbnBsYXl0aHJvdWdoKCkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj48aT4qKiBUZXN0IGluaXRp YWwgc3RhdGU8IiArICIvaT4iKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVv LnRleHRUcmFja3MubGVuZ3RoIiwgMSk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby50ZXh0VHJhY2tzWzBdLm1vZGUiLCAiZGlzYWJsZWQiKTsKKworICAgICAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiPGJyPjxpPioqIEVuYWJsZSBjdWVzLCBhbGxvdyB0aGVtIHRvIGxvYWQ8 IiArICIvaT4iKTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVvLndlYmtpdENsb3NlZENhcHRp b25zVmlzaWJsZSA9IHRydWUiKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rp b24gc2V0dXAoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgi PGJyPjxpPioqIFNldHVwPCIgKyAiL2k+Iik7CisgICAgICAgICAgICAgICAgZmluZE1lZGlhRWxl bWVudCgpOworCisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAg ICAgICAgICAgICAgIHJ1bigiaW50ZXJuYWxzLnNldENhcHRpb25EaXNwbGF5TW9kZSgnQXV0b21h dGljJykiKTsKKyAgICAgICAgICAgICAgICBydW4oInRyYWNrRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoJ3RyYWNrJykiKTsKKyAgICAgICAgICAgICAgICBydW4oInRyYWNrRWxlbWVu dC5raW5kID0gJ2NhcHRpb25zJyIpOworICAgICAgICAgICAgICAgIHJ1bigidHJhY2tFbGVtZW50 LnNyYyA9ICdjYXB0aW9ucy13ZWJ2dHQvdGMwMDQtd2VidnR0LWZpbGUudnR0JyIpOworICAgICAg ICAgICAgICAgIHJ1bigidmlkZW8uYXBwZW5kQ2hpbGQodHJhY2tFbGVtZW50KSIpOworCisgICAg ICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vY29udGVu dC90ZXN0Jyk7CisgICAgICAgICAgICAgICAgdHJhY2tFbGVtZW50LnNldEF0dHJpYnV0ZSgnb25s b2FkJywgJ3RyYWNrTG9hZGVkKCknKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2Nh bnBsYXl0aHJvdWdoJywgY2FucGxheXRocm91Z2gpOworICAgICAgICAgICAgICAgIGNvbnNvbGVX cml0ZSgiIik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFk PgorICAgIDxib2R5IG9ubG9hZD0ic2V0dXAoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scyB3 aWR0aD01MDA+PC92aWRlbz4KKyAgICAgICAgPHA+VGVzdCB0aGF0IGVuYWJsaW5nIGEgdHJhY2sg d2l0aCAud2Via2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxlIHN1Y2NlZWRzIHdoZW4gaW4gImF1dG9t YXRpYyIgbW9kZS48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo=