199661 2019-07-09 23:43:36 -0700 Allow MediaStream and non MediaStream backed videos to play together 2021-01-21 10:09:02 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 220504 1 ben.browitt youennf ben.browitt eric.carlson ews-watchlist glenn jer.noble miguel philipj sergio webkit-bug-importer youennf oldest_to_newest 1551615 0 ben.browitt 2019-07-09 23:43:36 -0700 This commit says: "Any non MediaStream backed video will stop all MediaStream backed video elements." https://trac.webkit.org/changeset/245712/webkit In our app the meeting organizer share mp4 or youtube video. The video will stop WebRTC streams and make the app broken. Why is it important to prevent webrtc streams to play with non MediaStream videos? 1556683 1 ben.browitt 2019-07-29 13:46:44 -0700 Hi youenn, Any workaround that will let us play a MediaStream backed video with a non MediaStream video at the same time? I think we are already affected by this on iOS and can't play a non MediaStream backed video (HLS) when there is AudioContext playing a mix of serveral MediaStream audio. 1687275 2 miguel 2020-09-09 22:37:45 -0700 Hi Youenn, about this update: https://trac.webkit.org/changeset/245712/webkit/ Our app is a modern webinar platform that has a feature to play a HLS video to share it with your audience together with multiple WebRTC videos backed with MediaStreams. The issue that exists only in Safari is that the WebRTC videos backed with MediaStreams are paused when a non MediaStreams backed video is played. This is clearly intentional as per the description in the changelog: Any non-MediaStream backed video will stop all MediaStream backed video elements. Conversely, all non MediaStream backed videos will stop when playing one MediaStream backed video. The use case for playing non MediaStreams backed videos together with MediaStreams backed videos is important for Webinar or Video-call platforms. Please, consider to solve it to standardize this behavior with other browsers. Meanwhile, what would be the work-around to make this feature work in Safari? We have ended up using a pair of <audio> and <video muted> tags to be able to play a non MediaStreams backed video together with MediaStream backed videos. This has removed the synchronization between audio and video tracks. We have not considered using a media controller because it status is not clear or documented. Thank you all! 1687280 3 webkit-bug-importer 2020-09-09 23:21:13 -0700 <rdar://problem/68622411> 1689047 4 408906 youennf 2020-09-16 02:06:13 -0700 Created attachment 408906 Patch 1718249 5 miguel 2021-01-08 02:21:59 -0800 Thanks for the quick patch Youenn! Is there any way to assign it to a reviewer to move it forward? 1718491 6 408906 jer.noble 2021-01-08 16:17:07 -0800 Comment on attachment 408906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408906&action=review > Source/WebCore/platform/audio/PlatformMediaSession.cpp:356 > - return m_client.hasMediaStreamSource() && otherSession.m_client.hasMediaStreamSource(); > + return m_client.hasMediaStreamSource() || otherSession.m_client.hasMediaStreamSource(); I don't think this is correct; we shouldn't allow a Media Stream in one document context to play simultaneously to a YouTube video in an entirely separate document context. Can we narrow this to enable playback only when the two sessions are both in the same document? 1718649 7 youennf 2021-01-11 03:25:58 -0800 (In reply to Jer Noble from comment #6) > Comment on attachment 408906 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408906&action=review > > > Source/WebCore/platform/audio/PlatformMediaSession.cpp:356 > > - return m_client.hasMediaStreamSource() && otherSession.m_client.hasMediaStreamSource(); > > + return m_client.hasMediaStreamSource() || otherSession.m_client.hasMediaStreamSource(); > > I don't think this is correct; we shouldn't allow a Media Stream in one > document context to play simultaneously to a YouTube video in an entirely > separate document context. Can we narrow this to enable playback only when > the two sessions are both in the same document? True, that is an existing issue, let's fix it in https://bugs.webkit.org/show_bug.cgi?id=220504. 1718651 8 408906 youennf 2021-01-11 03:29:02 -0800 Comment on attachment 408906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408906&action=review >>> Source/WebCore/platform/audio/PlatformMediaSession.cpp:356 >>> + return m_client.hasMediaStreamSource() || otherSession.m_client.hasMediaStreamSource(); >> >> I don't think this is correct; we shouldn't allow a Media Stream in one document context to play simultaneously to a YouTube video in an entirely separate document context. Can we narrow this to enable playback only when the two sessions are both in the same document? > > True, that is an existing issue, let's fix it in https://bugs.webkit.org/show_bug.cgi?id=220504. Looking at PlatformMediaSessionManager::sessionWillBeginPlayback, it seems that we will not even interrupt sessions if they do not have the same media session type. Meaning that audio would not interrupt VideoAudio for instance. Not sure this is expected either. 1720864 9 417961 youennf 2021-01-20 05:30:34 -0800 Created attachment 417961 Rebasing 1721199 10 ews-feeder 2021-01-21 09:28:38 -0800 commit-queue failed to commit attachment 417961 to WebKit repository. 1721221 11 ews-feeder 2021-01-21 10:09:00 -0800 Committed r271698: <https://trac.webkit.org/changeset/271698> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417961. 408906 2020-09-16 02:06:13 -0700 2021-01-20 05:30:30 -0800 Patch bug-199661-20200916110611.patch text/plain 9552 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjVhY2RjMDdiNjBiOGZk ZGRjOWRlNGM1ZTY0NzM3YTQ5NDBhYThlYi4uMDg5ZWQ4M2RmMmZkNjgwNWNlNTM2ODBmZmNhYjVi ZTU4ZTRiODNmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA5LTE2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBNZWRpYVN0cmVh bSBhbmQgbm9uIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlb3MgdG8gcGxheSB0b2dldGhlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NjYxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82ODYyMjQxMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2luZyBoZXVyaXN0aWMgdG8gYWx3YXlzIGFsbG93 IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlb3MgdG8gcGxheSBjb25jdXJyZW50bHkgd2l0aCBvdGhl ciB2aWRlb3MuCisgICAgICAgIFRvIG5vdCBicmVhayBleGlzdGluZyB3ZWJzaXRlcywgd2Uga2Vl cCB0aGUgZXhpc3RpbmcgYmVoYXZpb3IgZm9yIG5vbiBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW9z LgorCisgICAgICAgIFRlc3Q6IHdlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjazIuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb246OmNhblBsYXlDb25jdXJyZW50bHkg Y29uc3QpOgorCiAyMDIwLTA5LTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBYSFIudGltZW91dCBpcyBhZmZlY3RlZCBieSBsb25nIHRhc2tzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5j cHAKaW5kZXggYWMwNTFlMGFlNjNhMDUzOWJjY2RmYTIxZmY1YTYzMjYxM2ZlYzdkMS4uNDc4MWQ3 ZmQ0OWIyOWJjOWY4ZDAzZTA1MzE0NzQwYTFhMzBkZTBiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMzUz LDcgKzM1Myw3IEBAIHZvaWQgUGxhdGZvcm1NZWRpYVNlc3Npb246OmNsaWVudENoYXJhY3Rlcmlz dGljc0NoYW5nZWQoKQogCiBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpjYW5QbGF5Q29uY3Vy cmVudGx5KGNvbnN0IFBsYXRmb3JtTWVkaWFTZXNzaW9uJiBvdGhlclNlc3Npb24pIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIG1fY2xpZW50Lmhhc01lZGlhU3RyZWFtU291cmNlKCkgJiYgb3RoZXJTZXNz aW9uLm1fY2xpZW50Lmhhc01lZGlhU3RyZWFtU291cmNlKCk7CisgICAgcmV0dXJuIG1fY2xpZW50 Lmhhc01lZGlhU3RyZWFtU291cmNlKCkgfHwgb3RoZXJTZXNzaW9uLm1fY2xpZW50Lmhhc01lZGlh U3RyZWFtU291cmNlKCk7CiB9CiAKIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OnNob3VsZE92 ZXJyaWRlUGF1c2VEdXJpbmdSb3V0ZUNoYW5nZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmY2NzNlNDY0OTE4 YmQ1NGU1NDdiNjE0MDMzOWE1Njk2Yzk3YmRjOC4uZGUzNTI1OTZiODZjMjQyZjg5OGVkMDdiNGJk YzA1OTM3NWEzZDg5MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTE2ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBNZWRpYVN0cmVhbSBh bmQgbm9uIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlb3MgdG8gcGxheSB0b2dldGhlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NjYxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS82ODYyMjQxMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjay1leHBl Y3RlZC50eHQ6CisgICAgICAgICogd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLmh0bWw6 CisgICAgICAgICogd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrMi1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIHdlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjazIuaHRtbDog QWRkZWQuCisKIDIwMjAtMDktMTQgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KIAogICAgICAgICBbQXBwbGUgV2luXSBNaWdyYXRlIGZyb20gRm9udFBsYXRmb3JtRGF0 YVdpbi5jcHAgdG8gRm9udFBsYXRmb3JtRGF0YUNvcmVUZXh0LmNwcApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3dlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjay1leHBlY3RlZC50eHQKaW5k ZXggN2VjN2RmYjNkNDQyNzdkMTk2YmVkNzE1MjdhZWMwMDhlNDVkNTNkMC4uZjRmZTAxNDNiYWY3 MjM1NWJmOGFlMDRmZjFlODllNmNhMGZiYWNiZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2Vi cnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy93ZWJydGMvY29uY3VycmVudFZpZGVvUGxheWJhY2stZXhwZWN0ZWQudHh0CkBAIC0yLDYgKzIs NSBAQAogCiBQQVNTIEJhc2ljIGF1ZGlvL3ZpZGVvIGV4Y2hhbmdlIAogUEFTUyBQbGF5IE1lZGlh U3RyZWFtIGJhY2tlZCBzdHJlYW1zIGNvbmN1cnJlbnRseSAKLVBBU1MgUGxheSByZWd1bGFyIHZp ZGVvIGNvbnRlbnQgc2hvdWxkIHBhdXNlIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVtZW50 cyAKLVBBU1MgUGxheSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgc2hvdWxkIHBh dXNlIHJlZ3VsYXIgdmlkZW8gY29udGVudCAKK1BBU1MgUGxheSByZWd1bGFyIHZpZGVvIGNvbnRl bnQgc2hvdWxkIG5vdCBwYXVzZSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgCiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjay5o dG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLmh0bWwKaW5k ZXggNTk2MTBjNGRjZDM1NGQ5YWUyYWQ4YjVjM2I4ZTJiNWU0NWI5MjY0MC4uM2JkOTI3YTRjODE1 YTQwMzk1MmRmNzdhMjE4NTBmNTE1YmM4NGUyOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2Vi cnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRj L2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLmh0bWwKQEAgLTUxLDMwICs1MSwxMCBAQCBwcm9taXNl X3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKICAgICB2aWRlbzMuc3JjID0gZmluZE1lZGlhRmlsZSgn dmlkZW8nLCAnLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFja3MnKTsKICAgICBhd2FpdCB2aWRl bzMucGxheSgpOwogCi0gICAgbGV0IGNvdW50ZXIgPSAwOwotICAgIHdoaWxlICghdmlkZW8xLnBh dXNlZCAmJiArK2NvdW50ZXIgPCAyMCkKLSAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2 ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7Ci0KLSAgICBhc3NlcnRfdHJ1ZSh2aWRlbzEu cGF1c2VkLCAidmlkZW8xIHBhdXNlZCIpOwotICAgIGFzc2VydF90cnVlKHZpZGVvMi5wYXVzZWQs ICJ2aWRlbzIgcGF1c2VkIik7Ci0gICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMy5wYXVzZWQsICJ2aWRl bzMgcGF1c2VkIik7Ci19LCAiUGxheSByZWd1bGFyIHZpZGVvIGNvbnRlbnQgc2hvdWxkIHBhdXNl IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVtZW50cyIpOwotCi1wcm9taXNlX3Rlc3QoYXN5 bmMgKHRlc3QpID0+IHsKLSAgICBhd2FpdCB2aWRlbzEucGxheSgpOwotCi0gICAgYXNzZXJ0X3Ry dWUodmlkZW8zLnBhdXNlZCwgInZpZGVvMyBwYXVzZWQiKTsKLQotICAgIGF3YWl0IHZpZGVvMi5w bGF5KCk7Ci0KLSAgICBsZXQgY291bnRlciA9IDA7Ci0gICAgd2hpbGUgKCF2aWRlbzMucGF1c2Vk ICYmICsrY291bnRlciA8IDIwKQotICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+ IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKLQogICAgIGFzc2VydF9mYWxzZSh2aWRlbzEucGF1 c2VkLCAidmlkZW8xIHBhdXNlZCIpOwogICAgIGFzc2VydF9mYWxzZSh2aWRlbzIucGF1c2VkLCAi dmlkZW8yIHBhdXNlZCIpOwotICAgIGFzc2VydF90cnVlKHZpZGVvMy5wYXVzZWQsICJ2aWRlbzMg cGF1c2VkIik7Ci19LCAiUGxheSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgc2hv dWxkIHBhdXNlIHJlZ3VsYXIgdmlkZW8gY29udGVudCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRl bzMucGF1c2VkLCAidmlkZW8zIHBhdXNlZCIpOworfSwgIlBsYXkgcmVndWxhciB2aWRlbyBjb250 ZW50IHNob3VsZCBub3QgcGF1c2UgTWVkaWFTdHJlYW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIik7 CiAgICAgICAgIDwvc2NyaXB0PgogICAgIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3dlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjazItZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrMi1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uZDc5MjU2ZmNkNmZmOGFhZGI4N2UzNDdiYTY0YmRkZDdkNGRlMzM4MgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFj azItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorICAgCisKK1BBU1MgQmFzaWMgYXVkaW8v dmlkZW8gZXhjaGFuZ2UgCitQQVNTIFBsYXkgcmVndWxhciB2aWRlbyBjb250ZW50IHNob3VsZCBu b3QgcGF1c2UgTWVkaWFTdHJlYW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIAorUEFTUyBQbGF5IHJl Z3VsYXIgdmlkZW8gY29udGVudCBzaG91bGQgbm90IHBhdXNlIE1lZGlhU3RyZWFtIGJhY2tlZCB2 aWRlbyBlbGVtZW50cyBidXQgc2hvdWxkIHBhdXNlIG5vdCBNZWRpYVN0cmVhbSBiYWNrZWQgdmlk ZW8gZWxlbWVudHMgCitQQVNTIFJlc3RhcnQgcmVndWxhciB2aWRlbyBjb250ZW50IHNob3VsZCBu b3QgcGF1c2UgTWVkaWFTdHJlYW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIGJ1dCBzaG91bGQgcGF1 c2Ugbm90IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVtZW50cyAKK1BBU1MgUGF1c2UvcGxh eSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgc2hvdWxkIG5vdCBjaGFuZ2UgcmVn dWxhciB2aWRlbyBjb250ZW50IAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvY29u Y3VycmVudFZpZGVvUGxheWJhY2syLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvY29uY3VycmVu dFZpZGVvUGxheWJhY2syLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmNmYTMxYTRlZmUwMDRlYWJiOGJjYTlm MzMzYjZlYzI1MzQ4YzJmNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9j b25jdXJyZW50VmlkZW9QbGF5YmFjazIuaHRtbApAQCAtMCwwICsxLDg4IEBACis8IWRvY3R5cGUg aHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+ CisgICAgICAgIDx0aXRsZT5UZXN0aW5nIGNvbmN1cnJlbnQgdmlkZW8gcGxheWluZyAyPC90aXRs ZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9z Y3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBv cnQuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vbWVkaWEvbWVkaWEtZmls ZS5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8dmlkZW8g aWQ9InZpZGVvMSIgYXV0b3BsYXkgY29udHJvbHM+PC92aWRlbz4KKyAgICAgICAgPHZpZGVvIGlk PSJ2aWRlbzIiIGF1dG9wbGF5IGNvbnRyb2xzPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0i dmlkZW8zIiBhdXRvcGxheSBjb250cm9scz48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InZp ZGVvNCIgYXV0b3BsYXkgY29udHJvbHM+PC92aWRlbz4KKyAgICAgICAgPHNjcmlwdCBzcmMgPSJy b3V0aW5lcy5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+Citwcm9taXNlX3Rlc3QoYXN5 bmMgKHRlc3QpID0+IHsKKyAgICBsb2NhbFN0cmVhbSA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURl dmljZXMuZ2V0VXNlck1lZGlhKHthdWRpbzogdHJ1ZSwgdmlkZW86IHRydWV9KTsKKworICAgIGNv bnN0IHJlbW90ZVN0cmVhbSA9IGF3YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+ IHsKKyAgICAgICAgY3JlYXRlQ29ubmVjdGlvbnMoKGZpcnN0Q29ubmVjdGlvbikgPT4geworICAg ICAgICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYWNrKGxvY2FsU3RyZWFtLmdldFZpZGVvVHJh Y2tzKClbMF0sIGxvY2FsU3RyZWFtKTsKKyAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRU cmFjayhsb2NhbFN0cmVhbS5nZXRBdWRpb1RyYWNrcygpWzBdLCBsb2NhbFN0cmVhbSk7CisgICAg ICAgIH0sIChzZWNvbmRDb25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICBzZWNvbmRDb25uZWN0 aW9uLm9udHJhY2sgPSAodHJhY2tFdmVudCkgPT4geworICAgICAgICAgICAgICAgIHJlc29sdmUo dHJhY2tFdmVudC5zdHJlYW1zWzBdKTsKKyAgICAgICAgICAgIH07CisgICAgICAgIH0pOworICAg ICAgICBzZXRUaW1lb3V0KCgpID0+IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAwMCk7Cisg ICAgfSk7CisKKyAgICB2aWRlbzEuc3JjT2JqZWN0ID0gbG9jYWxTdHJlYW07CisgICAgdmlkZW8y LnNyY09iamVjdCA9IHJlbW90ZVN0cmVhbTsKKyAgICBhd2FpdCB2aWRlbzEucGxheSgpOworICAg IGF3YWl0IHZpZGVvMi5wbGF5KCk7Cit9LCAiQmFzaWMgYXVkaW8vdmlkZW8gZXhjaGFuZ2UiKTsK KworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgaWYgKHdpbmRvdy5pbnRlcm5h bHMpCisgICAgICAgIGludGVybmFscy5zZXRNZWRpYVNlc3Npb25SZXN0cmljdGlvbnMoJ3ZpZGVv YXVkaW8nLCAnQ29uY3VycmVudFBsYXliYWNrTm90UGVybWl0dGVkJyk7CisKKyAgICB2aWRlbzMu c3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFj a3MnKTsKKyAgICBhd2FpdCB2aWRlbzMucGxheSgpOworCisgICAgbGV0IGNvdW50ZXIgPSAwOwor ICAgIHdoaWxlICghdmlkZW8xLnBhdXNlZCAmJiArK2NvdW50ZXIgPCAyMCkKKyAgICAgICAgYXdh aXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisKKyAg ICBhc3NlcnRfZmFsc2UodmlkZW8xLnBhdXNlZCwgInZpZGVvMSBwYXVzZWQiKTsKKyAgICBhc3Nl cnRfZmFsc2UodmlkZW8yLnBhdXNlZCwgInZpZGVvMiBwYXVzZWQiKTsKKyAgICBhc3NlcnRfZmFs c2UodmlkZW8zLnBhdXNlZCwgInZpZGVvMyBwYXVzZWQiKTsKK30sICJQbGF5IHJlZ3VsYXIgdmlk ZW8gY29udGVudCBzaG91bGQgbm90IHBhdXNlIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVt ZW50cyIpOworCitwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICB2aWRlbzQuc3Jj ID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFja3Mn KTsKKyAgICBhd2FpdCB2aWRlbzQucGxheSgpOworCisgICAgbGV0IGNvdW50ZXIgPSAwOworICAg IHdoaWxlICghdmlkZW8xLnBhdXNlZCAmJiArK2NvdW50ZXIgPCAyMCkKKyAgICAgICAgYXdhaXQg bmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisKKyAgICBh c3NlcnRfZmFsc2UodmlkZW8xLnBhdXNlZCwgInZpZGVvMSBwYXVzZWQiKTsKKyAgICBhc3NlcnRf ZmFsc2UodmlkZW8yLnBhdXNlZCwgInZpZGVvMiBwYXVzZWQiKTsKKyAgICBhc3NlcnRfdHJ1ZSh2 aWRlbzMucGF1c2VkLCAidmlkZW8zIHBhdXNlZCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRlbzQu cGF1c2VkLCAidmlkZW80IHBhdXNlZCIpOworfSwgIlBsYXkgcmVndWxhciB2aWRlbyBjb250ZW50 IHNob3VsZCBub3QgcGF1c2UgTWVkaWFTdHJlYW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIGJ1dCBz aG91bGQgcGF1c2Ugbm90IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVtZW50cyIpOworCitw cm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICBhd2FpdCB2aWRlbzMucGxheSgpOwor CisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMS5wYXVzZWQsICJ2aWRlbzEgcGF1c2VkIik7CisgICAg YXNzZXJ0X2ZhbHNlKHZpZGVvMi5wYXVzZWQsICJ2aWRlbzIgcGF1c2VkIik7CisgICAgYXNzZXJ0 X2ZhbHNlKHZpZGVvMy5wYXVzZWQsICJ2aWRlbzMgcGF1c2VkIik7CisgICAgYXNzZXJ0X3RydWUo dmlkZW80LnBhdXNlZCwgInZpZGVvNCBwYXVzZWQiKTsKK30sICJSZXN0YXJ0IHJlZ3VsYXIgdmlk ZW8gY29udGVudCBzaG91bGQgbm90IHBhdXNlIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVt ZW50cyBidXQgc2hvdWxkIHBhdXNlIG5vdCBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxlbWVu dHMiKTsKKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgYXdhaXQgdmlkZW8y LnBhdXNlKCk7CisgICAgYXdhaXQgdmlkZW8yLnBsYXkoKTsKKworICAgIGFzc2VydF9mYWxzZSh2 aWRlbzEucGF1c2VkLCAidmlkZW8xIHBhdXNlZCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRlbzIu cGF1c2VkLCAidmlkZW8yIHBhdXNlZCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRlbzMucGF1c2Vk LCAidmlkZW8zIHBhdXNlZCIpOworICAgIGFzc2VydF90cnVlKHZpZGVvNC5wYXVzZWQsICJ2aWRl bzQgcGF1c2VkIik7Cit9LCAiUGF1c2UvcGxheSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxl bWVudHMgc2hvdWxkIG5vdCBjaGFuZ2UgcmVndWxhciB2aWRlbyBjb250ZW50Iik7CisgICAgICAg IDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K 417961 2021-01-20 05:30:34 -0800 2021-01-21 10:09:01 -0800 Rebasing bug-199661-20210120143033.patch text/plain 9571 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM4NThlNjlkZmJhYWI3 ZjJlNWE3YjZiYWQ5ZGI5Njc3MjFiNWVjMC4uOWZhNDViZjJkMGRmNTIxZWExNWNhMjQ5MjkxY2Ez NDZkM2E5OTBiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTIwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBNZWRpYVN0cmVh bSBhbmQgbm9uIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlb3MgdG8gcGxheSB0b2dldGhlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NjYxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82ODYyMjQxMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2luZyBoZXVyaXN0aWMgdG8gYWx3YXlzIGFsbG93 IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlb3MgdG8gcGxheSBjb25jdXJyZW50bHkgd2l0aCBvdGhl ciB2aWRlb3MuCisgICAgICAgIFRvIG5vdCBicmVhayBleGlzdGluZyB3ZWJzaXRlcywgd2Uga2Vl cCB0aGUgZXhpc3RpbmcgYmVoYXZpb3IgZm9yIG5vbiBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW9z LgorCisgICAgICAgIFRlc3Q6IHdlYnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjazIuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb246OmNhblBsYXlDb25jdXJyZW50bHkg Y29uc3QpOgorCiAyMDIxLTAxLTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBUd28gcGFnZXMgaW4gdGhlIHNhbWUgcHJvY2VzcyBzaG91bGQgbm90IGJlIGFi bGUgdG8gcGxheSBtZWRpYSBzdHJlYW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIGF0IHRoZSBzYW1l IHRpbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3Jt TWVkaWFTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3Jt TWVkaWFTZXNzaW9uLmNwcAppbmRleCBlZDIxMjcxMWMwOWQ3YzMxMTdlNGU5YmQ4YWQ2MTMzYmE2 OTY0MDZiLi45MjY5YWQzOTNlNjIwNTkxYzgwYjQyMThmNTk4NDQ1OWZlZjlmYmEzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Np b24uY3BwCkBAIC0zNjUsNyArMzY1LDcgQEAgYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Y2Fu UGxheUNvbmN1cnJlbnRseShjb25zdCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbiYgb3RoZXIKICAgICBp ZiAoIWdyb3VwSUQgfHwgIW90aGVyR3JvdXBJRCB8fCBncm91cElEICE9IG90aGVyR3JvdXBJRCkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIG1fY2xpZW50Lmhhc01lZGlhU3Ry ZWFtU291cmNlKCkgJiYgb3RoZXJTZXNzaW9uLm1fY2xpZW50Lmhhc01lZGlhU3RyZWFtU291cmNl KCk7CisgICAgcmV0dXJuIG1fY2xpZW50Lmhhc01lZGlhU3RyZWFtU291cmNlKCkgfHwgb3RoZXJT ZXNzaW9uLm1fY2xpZW50Lmhhc01lZGlhU3RyZWFtU291cmNlKCk7CiB9CiAKIGJvb2wgUGxhdGZv cm1NZWRpYVNlc3Npb246OnNob3VsZE92ZXJyaWRlUGF1c2VEdXJpbmdSb3V0ZUNoYW5nZSgpIGNv bnN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggMjMwNmJmZjhlZDkyNTViYmNiZmNkZjE0ZTI4YmJmNzY0YWMxNDljMC4uMjcy MTc0NTAxMGI5ODdjZjE3ZDdiZTM3NmJlNmY2Mzc5MmI5NzhkMiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTAxLTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBBbGxvdyBNZWRpYVN0cmVhbSBhbmQgbm9uIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlb3Mg dG8gcGxheSB0b2dldGhlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk5NjYxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODYyMjQxMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy9jb25j dXJyZW50VmlkZW9QbGF5YmFjay1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2VicnRjL2NvbmN1 cnJlbnRWaWRlb1BsYXliYWNrLmh0bWw6CisgICAgICAgICogd2VicnRjL2NvbmN1cnJlbnRWaWRl b1BsYXliYWNrMi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYnJ0Yy9jb25jdXJy ZW50VmlkZW9QbGF5YmFjazIuaHRtbDogQWRkZWQuCisKIDIwMjEtMDEtMTggIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYlJUQyBsaXZlIE9wdXMgYXVkaW8g c3RyZWFtIHN0dXR0ZXJzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvY29uY3VycmVu dFZpZGVvUGxheWJhY2stZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJl bnRWaWRlb1BsYXliYWNrLWV4cGVjdGVkLnR4dAppbmRleCA0N2UzYTk1Zjc3Y2NkN2Q0Y2NkZjhk Yjg0MzVhMDk1YWFhYjYzYjgwLi5lOGZjOWU5MTcyYTU3MWJmMjY0Yjg1YjIyMGY2YmY1ZTYzOTFm NDc0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvY29uY3VycmVudFZpZGVvUGxheWJh Y2stZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9jb25jdXJyZW50VmlkZW9Q bGF5YmFjay1leHBlY3RlZC50eHQKQEAgLTIsNiArMiw1IEBACiAKIFBBU1MgQmFzaWMgYXVkaW8v dmlkZW8gZXhjaGFuZ2UKIFBBU1MgUGxheSBNZWRpYVN0cmVhbSBiYWNrZWQgc3RyZWFtcyBjb25j dXJyZW50bHkKLVBBU1MgUGxheSByZWd1bGFyIHZpZGVvIGNvbnRlbnQgc2hvdWxkIHBhdXNlIE1l ZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVtZW50cwotUEFTUyBQbGF5IE1lZGlhU3RyZWFtIGJh Y2tlZCB2aWRlbyBlbGVtZW50cyBzaG91bGQgcGF1c2UgcmVndWxhciB2aWRlbyBjb250ZW50CitQ QVNTIFBsYXkgcmVndWxhciB2aWRlbyBjb250ZW50IHNob3VsZCBub3QgcGF1c2UgTWVkaWFTdHJl YW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0 Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjay5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1 cnJlbnRWaWRlb1BsYXliYWNrLmh0bWwKaW5kZXggNTk2MTBjNGRjZDM1NGQ5YWUyYWQ4YjVjM2I4 ZTJiNWU0NWI5MjY0MC4uM2JkOTI3YTRjODE1YTQwMzk1MmRmNzdhMjE4NTBmNTE1YmM4NGUyOCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrLmh0bWwK QEAgLTUxLDMwICs1MSwxMCBAQCBwcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKICAgICB2 aWRlbzMuc3JjID0gZmluZE1lZGlhRmlsZSgndmlkZW8nLCAnLi4vbWVkaWEvY29udGVudC9hdWRp by10cmFja3MnKTsKICAgICBhd2FpdCB2aWRlbzMucGxheSgpOwogCi0gICAgbGV0IGNvdW50ZXIg PSAwOwotICAgIHdoaWxlICghdmlkZW8xLnBhdXNlZCAmJiArK2NvdW50ZXIgPCAyMCkKLSAgICAg ICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7 Ci0KLSAgICBhc3NlcnRfdHJ1ZSh2aWRlbzEucGF1c2VkLCAidmlkZW8xIHBhdXNlZCIpOwotICAg IGFzc2VydF90cnVlKHZpZGVvMi5wYXVzZWQsICJ2aWRlbzIgcGF1c2VkIik7Ci0gICAgYXNzZXJ0 X2ZhbHNlKHZpZGVvMy5wYXVzZWQsICJ2aWRlbzMgcGF1c2VkIik7Ci19LCAiUGxheSByZWd1bGFy IHZpZGVvIGNvbnRlbnQgc2hvdWxkIHBhdXNlIE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVt ZW50cyIpOwotCi1wcm9taXNlX3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKLSAgICBhd2FpdCB2aWRl bzEucGxheSgpOwotCi0gICAgYXNzZXJ0X3RydWUodmlkZW8zLnBhdXNlZCwgInZpZGVvMyBwYXVz ZWQiKTsKLQotICAgIGF3YWl0IHZpZGVvMi5wbGF5KCk7Ci0KLSAgICBsZXQgY291bnRlciA9IDA7 Ci0gICAgd2hpbGUgKCF2aWRlbzMucGF1c2VkICYmICsrY291bnRlciA8IDIwKQotICAgICAgICBh d2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKLQog ICAgIGFzc2VydF9mYWxzZSh2aWRlbzEucGF1c2VkLCAidmlkZW8xIHBhdXNlZCIpOwogICAgIGFz c2VydF9mYWxzZSh2aWRlbzIucGF1c2VkLCAidmlkZW8yIHBhdXNlZCIpOwotICAgIGFzc2VydF90 cnVlKHZpZGVvMy5wYXVzZWQsICJ2aWRlbzMgcGF1c2VkIik7Ci19LCAiUGxheSBNZWRpYVN0cmVh bSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgc2hvdWxkIHBhdXNlIHJlZ3VsYXIgdmlkZW8gY29udGVu dCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRlbzMucGF1c2VkLCAidmlkZW8zIHBhdXNlZCIpOwor fSwgIlBsYXkgcmVndWxhciB2aWRlbyBjb250ZW50IHNob3VsZCBub3QgcGF1c2UgTWVkaWFTdHJl YW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIik7CiAgICAgICAgIDwvc2NyaXB0PgogICAgIDwvYm9k eT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy9jb25jdXJyZW50Vmlk ZW9QbGF5YmFjazItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRW aWRlb1BsYXliYWNrMi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDc2ZGU2NWM2OWI5MDA4YmE5 NWNjMTg3ODg3MDBlNzYxNmUyMWQ2YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dl YnJ0Yy9jb25jdXJyZW50VmlkZW9QbGF5YmFjazItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBA QAorCisKK1BBU1MgQmFzaWMgYXVkaW8vdmlkZW8gZXhjaGFuZ2UKK1BBU1MgUGxheSByZWd1bGFy IHZpZGVvIGNvbnRlbnQgc2hvdWxkIG5vdCBwYXVzZSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8g ZWxlbWVudHMKK1BBU1MgUGxheSByZWd1bGFyIHZpZGVvIGNvbnRlbnQgc2hvdWxkIG5vdCBwYXVz ZSBNZWRpYVN0cmVhbSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgYnV0IHNob3VsZCBwYXVzZSBub3Qg TWVkaWFTdHJlYW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzCitQQVNTIFJlc3RhcnQgcmVndWxhciB2 aWRlbyBjb250ZW50IHNob3VsZCBub3QgcGF1c2UgTWVkaWFTdHJlYW0gYmFja2VkIHZpZGVvIGVs ZW1lbnRzIGJ1dCBzaG91bGQgcGF1c2Ugbm90IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVt ZW50cworUEFTUyBQYXVzZS9wbGF5IE1lZGlhU3RyZWFtIGJhY2tlZCB2aWRlbyBlbGVtZW50cyBz aG91bGQgbm90IGNoYW5nZSByZWd1bGFyIHZpZGVvIGNvbnRlbnQKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrMi5odG1sIGIvTGF5b3V0VGVz dHMvd2VicnRjL2NvbmN1cnJlbnRWaWRlb1BsYXliYWNrMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJjZmEz MWE0ZWZlMDA0ZWFiYjhiY2E5ZjMzM2I2ZWMyNTM0OGMyZjcKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy93ZWJydGMvY29uY3VycmVudFZpZGVvUGxheWJhY2syLmh0bWwKQEAgLTAsMCAr MSw4OCBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1l dGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8dGl0bGU+VGVzdGluZyBjb25jdXJyZW50IHZp ZGVvIHBsYXlpbmcgMjwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMv dGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9 Ii4uL21lZGlhL21lZGlhLWZpbGUuanMiPjwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9k eT4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzEiIGF1dG9wbGF5IGNvbnRyb2xzPjwvdmlkZW8+ CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8yIiBhdXRvcGxheSBjb250cm9scz48L3ZpZGVvPgor ICAgICAgICA8dmlkZW8gaWQ9InZpZGVvMyIgYXV0b3BsYXkgY29udHJvbHM+PC92aWRlbz4KKyAg ICAgICAgPHZpZGVvIGlkPSJ2aWRlbzQiIGF1dG9wbGF5IGNvbnRyb2xzPjwvdmlkZW8+CisgICAg ICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 PgorcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgbG9jYWxTdHJlYW0gPSBhd2Fp dCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7YXVkaW86IHRydWUsIHZpZGVv OiB0cnVlfSk7CisKKyAgICBjb25zdCByZW1vdGVTdHJlYW0gPSBhd2FpdCBuZXcgUHJvbWlzZSgo cmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENv bm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayhsb2Nh bFN0cmVhbS5nZXRWaWRlb1RyYWNrcygpWzBdLCBsb2NhbFN0cmVhbSk7CisgICAgICAgICAgICBm aXJzdENvbm5lY3Rpb24uYWRkVHJhY2sobG9jYWxTdHJlYW0uZ2V0QXVkaW9UcmFja3MoKVswXSwg bG9jYWxTdHJlYW0pOworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAg ICAgICAgc2Vjb25kQ29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKKyAgICAg ICAgICAgICAgICByZXNvbHZlKHRyYWNrRXZlbnQuc3RyZWFtc1swXSk7CisgICAgICAgICAgICB9 OworICAgICAgICB9KTsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIlRlc3QgdGlt ZWQgb3V0IiksIDUwMDApOworICAgIH0pOworCisgICAgdmlkZW8xLnNyY09iamVjdCA9IGxvY2Fs U3RyZWFtOworICAgIHZpZGVvMi5zcmNPYmplY3QgPSByZW1vdGVTdHJlYW07CisgICAgYXdhaXQg dmlkZW8xLnBsYXkoKTsKKyAgICBhd2FpdCB2aWRlbzIucGxheSgpOworfSwgIkJhc2ljIGF1ZGlv L3ZpZGVvIGV4Y2hhbmdlIik7CisKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAg IGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5hbHMuc2V0TWVkaWFTZXNzaW9u UmVzdHJpY3Rpb25zKCd2aWRlb2F1ZGlvJywgJ0NvbmN1cnJlbnRQbGF5YmFja05vdFBlcm1pdHRl ZCcpOworCisgICAgdmlkZW8zLnNyYyA9IGZpbmRNZWRpYUZpbGUoJ3ZpZGVvJywgJy4uL21lZGlh L2NvbnRlbnQvYXVkaW8tdHJhY2tzJyk7CisgICAgYXdhaXQgdmlkZW8zLnBsYXkoKTsKKworICAg IGxldCBjb3VudGVyID0gMDsKKyAgICB3aGlsZSAoIXZpZGVvMS5wYXVzZWQgJiYgKytjb3VudGVy IDwgMjApCisgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChy ZXNvbHZlLCA1MCkpOworCisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMS5wYXVzZWQsICJ2aWRlbzEg cGF1c2VkIik7CisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMi5wYXVzZWQsICJ2aWRlbzIgcGF1c2Vk Iik7CisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMy5wYXVzZWQsICJ2aWRlbzMgcGF1c2VkIik7Cit9 LCAiUGxheSByZWd1bGFyIHZpZGVvIGNvbnRlbnQgc2hvdWxkIG5vdCBwYXVzZSBNZWRpYVN0cmVh bSBiYWNrZWQgdmlkZW8gZWxlbWVudHMiKTsKKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9 PiB7CisgICAgdmlkZW80LnNyYyA9IGZpbmRNZWRpYUZpbGUoJ3ZpZGVvJywgJy4uL21lZGlhL2Nv bnRlbnQvYXVkaW8tdHJhY2tzJyk7CisgICAgYXdhaXQgdmlkZW80LnBsYXkoKTsKKworICAgIGxl dCBjb3VudGVyID0gMDsKKyAgICB3aGlsZSAoIXZpZGVvMS5wYXVzZWQgJiYgKytjb3VudGVyIDwg MjApCisgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNv bHZlLCA1MCkpOworCisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMS5wYXVzZWQsICJ2aWRlbzEgcGF1 c2VkIik7CisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMi5wYXVzZWQsICJ2aWRlbzIgcGF1c2VkIik7 CisgICAgYXNzZXJ0X3RydWUodmlkZW8zLnBhdXNlZCwgInZpZGVvMyBwYXVzZWQiKTsKKyAgICBh c3NlcnRfZmFsc2UodmlkZW80LnBhdXNlZCwgInZpZGVvNCBwYXVzZWQiKTsKK30sICJQbGF5IHJl Z3VsYXIgdmlkZW8gY29udGVudCBzaG91bGQgbm90IHBhdXNlIE1lZGlhU3RyZWFtIGJhY2tlZCB2 aWRlbyBlbGVtZW50cyBidXQgc2hvdWxkIHBhdXNlIG5vdCBNZWRpYVN0cmVhbSBiYWNrZWQgdmlk ZW8gZWxlbWVudHMiKTsKKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgYXdh aXQgdmlkZW8zLnBsYXkoKTsKKworICAgIGFzc2VydF9mYWxzZSh2aWRlbzEucGF1c2VkLCAidmlk ZW8xIHBhdXNlZCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRlbzIucGF1c2VkLCAidmlkZW8yIHBh dXNlZCIpOworICAgIGFzc2VydF9mYWxzZSh2aWRlbzMucGF1c2VkLCAidmlkZW8zIHBhdXNlZCIp OworICAgIGFzc2VydF90cnVlKHZpZGVvNC5wYXVzZWQsICJ2aWRlbzQgcGF1c2VkIik7Cit9LCAi UmVzdGFydCByZWd1bGFyIHZpZGVvIGNvbnRlbnQgc2hvdWxkIG5vdCBwYXVzZSBNZWRpYVN0cmVh bSBiYWNrZWQgdmlkZW8gZWxlbWVudHMgYnV0IHNob3VsZCBwYXVzZSBub3QgTWVkaWFTdHJlYW0g YmFja2VkIHZpZGVvIGVsZW1lbnRzIik7CisKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4g eworICAgIGF3YWl0IHZpZGVvMi5wYXVzZSgpOworICAgIGF3YWl0IHZpZGVvMi5wbGF5KCk7CisK KyAgICBhc3NlcnRfZmFsc2UodmlkZW8xLnBhdXNlZCwgInZpZGVvMSBwYXVzZWQiKTsKKyAgICBh c3NlcnRfZmFsc2UodmlkZW8yLnBhdXNlZCwgInZpZGVvMiBwYXVzZWQiKTsKKyAgICBhc3NlcnRf ZmFsc2UodmlkZW8zLnBhdXNlZCwgInZpZGVvMyBwYXVzZWQiKTsKKyAgICBhc3NlcnRfdHJ1ZSh2 aWRlbzQucGF1c2VkLCAidmlkZW80IHBhdXNlZCIpOworfSwgIlBhdXNlL3BsYXkgTWVkaWFTdHJl YW0gYmFja2VkIHZpZGVvIGVsZW1lbnRzIHNob3VsZCBub3QgY2hhbmdlIHJlZ3VsYXIgdmlkZW8g Y29udGVudCIpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==