216373 2020-09-10 10:50:18 -0700 Followup to Bug 215027: address comments to improve APP_BOUND_DOMAINS macro use 2020-09-11 10:33:31 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215027 1 katherine_cheney katherine_cheney benjamin cdumez cmarcelo darin ews-watchlist oldest_to_newest 1687461 0 katherine_cheney 2020-09-10 10:50:18 -0700 This is a followup to Bug 215027 to address Darin's comments to improve the use of the APP_BOUND_DOMAINS macro. <rdar://problem/68645704> 1687488 1 408465 katherine_cheney 2020-09-10 11:59:55 -0700 Created attachment 408465 Patch 1687504 2 408465 darin 2020-09-10 12:40:42 -0700 Comment on attachment 408465 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408465&action=review > LayoutTests/platform/wk2/TestExpectations:732 > +# App Bound Domains is for iOS only, so we should skip > +# them here and enable them in the iOS platform specific file. > +http/tests/resourceLoadStatistics/exemptDomains/ [ Skip ] I suggest putting this into TestExpectations, rather than platform/wk2/TestExpectations. Will that work? 1687510 3 katherine_cheney 2020-09-10 13:00:32 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 408465 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408465&action=review > > > LayoutTests/platform/wk2/TestExpectations:732 > > +# App Bound Domains is for iOS only, so we should skip > > +# them here and enable them in the iOS platform specific file. > > +http/tests/resourceLoadStatistics/exemptDomains/ [ Skip ] > > I suggest putting this into TestExpectations, rather than > platform/wk2/TestExpectations. Will that work? Maybe. All of http/tests/resourceLoadStatistics/ is currently set to 'pass' in LayoutTests/platform/wk2/TestExpectations, which overwrites the 'skip' for http/tests/resourceLoadStatistics/exemptDomains/ in LayoutTests/TestExpectations. I could set http/tests/resourceLoadStatistics/ to 'pass' in LayoutTests/TestExpectations instead of LayoutTests/platform/wk2/TestExpectations but then would have to edit all non-cocoa platform files to skip resourceLoadStatistics/ tests, which seems just as inelegant. Maybe you see a better option though? 1687545 4 darin 2020-09-10 14:52:09 -0700 (In reply to katherine_cheney from comment #3) > Maybe you see a better option though? No, I guess that means my idea won’t work. Sorry, I could have figured that out if I thought more carefully about your earlier comments. 1687550 5 katherine_cheney 2020-09-10 15:00:05 -0700 (In reply to Darin Adler from comment #4) > (In reply to katherine_cheney from comment #3) > > Maybe you see a better option though? > > No, I guess that means my idea won’t work. Sorry, I could have figured that > out if I thought more carefully about your earlier comments. No problem. Looks like I need to rebase to resolve a conflict in the ios-wk2 TestExpectation file to make the gtk and wincairo bots happy. I'll re-upload and confirm the bots are all green before landing. 1687556 6 408481 katherine_cheney 2020-09-10 15:05:39 -0700 Created attachment 408481 Patch 1687739 7 408538 katherine_cheney 2020-09-11 09:40:34 -0700 Created attachment 408538 Patch for landing 1687759 8 ews-feeder 2020-09-11 10:33:31 -0700 Committed r266929: <https://trac.webkit.org/changeset/266929> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408538. 408465 2020-09-10 11:59:55 -0700 2020-09-10 15:05:37 -0700 Patch bug-216373-20200910115954.patch text/plain 9926 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDJmMjRjNTQyOGM4MDA3NzEzM2EzYjI4 NGEyMTU2ZTllOWMyMmI4ZjcuLjMyNWIwMGMxOWEwYzE4YzUxYmEyYjc5MDVmNGVkZjc0OWFmMmE5 YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDktMTAgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93dXAgdG8gQnVnIDIxNTAyNzog YWRkcmVzcyBjb21tZW50cyB0byBpbXByb3ZlIEFQUF9CT1VORF9ET01BSU5TIG1hY3JvIHVzZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MzczCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODY0NTcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZGVmYXVsdC4gQWxs IGVuYWJsZSBmbGFncyBhcmUgb2ZmIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiB3dGYvUGxhdGZv cm1FbmFibGUuaDoKKwogMjAyMC0wOS0xMCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5 QGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBBcHAtQm91bmQgRG9tYWlucyBjb2RlIHRv IG9ubHkgY29tcGlsZSBmb3IgaU9TIHdpdGggaXRzIG93biBtYWNybwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGM2 OTU1MTBkODg2OTVhODI0MzdlNTVlMDcyMDBjYmM2NTdhMDM4ZGUuLmVhNTdhZmUxNGQ0YjY5MDk1 NzkyMTRkYWVmNGJlMTYzMzgzMjY4OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAy MC0wOS0xMCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KKworICAg ICAgICBGb2xsb3d1cCB0byBCdWcgMjE1MDI3OiBhZGRyZXNzIGNvbW1lbnRzIHRvIGltcHJvdmUg QVBQX0JPVU5EX0RPTUFJTlMgbWFjcm8gdXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYzNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY4NjQ1 NzA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNl cGFyYXRlIG91dCBBcHAtQm91bmQgRG9tYWluIGZ1bmN0aW9ucyB0byBhdm9pZCBuZXN0ZWQgI2lm IEVOQUJMRSgpCisgICAgICAgIG1hY3Jvcywgd2hpY2ggYXJlIGhhcmQgdG8gcmVhZC4KKworICAg ICAgICBObyBuZXcgdGVzdHMuIEJlaGF2aW9yIGNvbmZpcm1lZCBieSBleGlzdGluZyB0ZXN0cy4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg6CisK IDIwMjAtMDktMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBQ b3J0IEJhc2VBdWRpb0NvbnRleHQgdG8gdGhlIEhUTUwgZXZlbnQgbG9vcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw Mzc1ZDRlOWU1ZjkwMDhmNjYxZGRkNzk0MTE1ZjMyYTBlMzRhODllLi5iNWE3YjNiODNlMzRkMTM3 NDA2NjQzMDhkMjBmNzNhN2ZlNjMwMzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIw LTA5LTEwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAg ICAgIEZvbGxvd3VwIHRvIEJ1ZyAyMTUwMjc6IGFkZHJlc3MgY29tbWVudHMgdG8gaW1wcm92ZSBB UFBfQk9VTkRfRE9NQUlOUyBtYWNybyB1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxNjM3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg2NDU3 MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNl IGEgbG9jYWwgdmFyaWFibGUgdG8gYXZvaWQgYXdrd2FyZCAjaWYgRU5BQkxFKCkgbWFjcm8gcGxh Y2VtZW50LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6c3dTZXJ2ZXJGb3JTZXNzaW9uKToKKwog MjAyMC0wOS0xMCAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtDTWFrZV0gVXNlIGltcG9ydGVkIHRhcmdldHMgaW4gZmluZCBtb2R1bGUgZm9y IGxpYnNlY2NvbXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgg Yi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5oCmluZGV4IDM5ZDBlNmQyYTNlZjUzNTgx MmYwNDIzMGQ5ZTRjZmI3NzNiYTNhMjkuLjcwMGY5MGFkYzZjMzlhNzZiYWEyN2Q3YzhiMzFmZTRk ZTYyOTU5OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgKKysr IGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGUuaApAQCAtMTkzLDEwICsxOTMsNiBAQAog I2RlZmluZSBFTkFCTEVfQVBORyAxCiAjZW5kaWYKIAotI2lmICFkZWZpbmVkKEVOQUJMRV9BUFBf Qk9VTkRfRE9NQUlOUykKLSNkZWZpbmUgRU5BQkxFX0FQUF9CT1VORF9ET01BSU5TIDAKLSNlbmRp ZgotCiAjaWYgIWRlZmluZWQoRU5BQkxFX0NIQU5ORUxfTUVTU0FHSU5HKQogI2RlZmluZSBFTkFC TEVfQ0hBTk5FTF9NRVNTQUdJTkcgMQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaAppbmRleCA3ODZkOTFh YzNlYzBiZDczNDQzZjFkMDFkNTUzMDgxNjRjMDgwZWFlLi4xYjE3MWQwMzU1M2FjNjA5NDdlNDc1 NzdmMTUyNGNhMzYxMGUwMzkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgKQEAgLTIxMiwxMSArMjEyLDEyIEBA IHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRpZENvbW1pdENyb3NzU2l0ZUxvYWRX aXRoRGF0YVRyYW5zZmVyRnJvbVByZXZhbGVudFJlc291cmNlKGNvbnN0IFJlZ2lzdHJhYmxlRG9t YWluJiB0b0RvbWFpbiwgUGFnZUlkZW50aWZpZXIpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg cmVzZXRDcm9zc1NpdGVMb2Fkc1dpdGhMaW5rRGVjb3JhdGlvbkZvclRlc3RpbmcoKTsKICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHNldFRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUoVGhpcmRQ YXJ0eUNvb2tpZUJsb2NraW5nTW9kZSk7CisjZW5kaWYKKyAgICAKICNpZiBFTkFCTEUoQVBQX0JP VU5EX0RPTUFJTlMpCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRBcHBCb3VuZERvbWFpbnMo SGFzaFNldDxSZWdpc3RyYWJsZURvbWFpbj4mJik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBy ZXNldEFwcEJvdW5kRG9tYWlucygpOwogI2VuZGlmCi0jZW5kaWYKIAogcHJpdmF0ZToKICNpZiBQ TEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UHJvY2Vzcy5jcHAKaW5kZXggOGFhNGRlZGVmNjkyZDU2MTkzYTA1NGZlYWFhYTU1OTliMTMyNmJj ZS4uOTBlYjYyYzZhOTdjNTc4YWQ4MGNiYjBjZDAwZGU1ODMwOWQxMjRmNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTI1MDksMjAg KzI1MDksMjIgQEAgU1dTZXJ2ZXImIE5ldHdvcmtQcm9jZXNzOjpzd1NlcnZlckZvclNlc3Npb24o UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogICAgICAgICAvLyBUaGVyZSBzaG91bGQgYWxyZWFk eSBiZSBhIHJlZ2lzdGVyZWQgcGF0aCBmb3IgdGhpcyBQQUw6OlNlc3Npb25JRC4KICAgICAgICAg Ly8gSWYgdGhlcmUncyBub3QsIHRoZW4gd2hlcmUgZGlkIHRoaXMgUEFMOjpTZXNzaW9uSUQgY29t ZSBmcm9tPwogICAgICAgICBBU1NFUlQoc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkgfHwgIXBhdGgu aXNFbXB0eSgpKTsKLQotICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxTV1NlcnZlcj4obWFrZVVu aXF1ZVJlZjxXZWJTV09yaWdpblN0b3JlPigpLCBpbmZvLnByb2Nlc3NUZXJtaW5hdGlvbkRlbGF5 RW5hYmxlZCwgV1RGTW92ZShwYXRoKSwgc2Vzc2lvbklELCBwYXJlbnRQcm9jZXNzSGFzU2Vydmlj ZVdvcmtlckVudGl0bGVtZW50KCksIFt0aGlzLCBzZXNzaW9uSURdKGF1dG8mJiBqb2JEYXRhLCBi b29sIHNob3VsZFJlZnJlc2hDYWNoZSwgYXV0byYmIHJlcXVlc3QsIGF1dG8mJiBjb21wbGV0aW9u SGFuZGxlcikgbXV0YWJsZSB7Ci0gICAgICAgICAgICBTZXJ2aWNlV29ya2VyU29mdFVwZGF0ZUxv YWRlcjo6c3RhcnQobmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSwgV1RGTW92ZShqb2JEYXRhKSwg c2hvdWxkUmVmcmVzaENhY2hlLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKSk7Ci0gICAgICAgIH0sIFt0aGlzLCBzZXNzaW9uSURdKGF1dG8mIHJlZ2lzdHJhYmxl RG9tYWluLCBhdXRvJiYgY29tcGxldGlvbkhhbmRsZXIpIHsKLSAgICAgICAgICAgIEFTU0VSVCgh cmVnaXN0cmFibGVEb21haW4uaXNFbXB0eSgpKTsKLSAgICAgICAgICAgIHBhcmVudFByb2Nlc3ND b25uZWN0aW9uKCktPnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQ cm94eTo6RXN0YWJsaXNoV29ya2VyQ29udGV4dENvbm5lY3Rpb25Ub05ldHdvcmtQcm9jZXNzIHsg cmVnaXN0cmFibGVEb21haW4sIHNlc3Npb25JRCB9LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KSwgMCk7CisgICAgICAgIAogI2lmIEVOQUJMRShBUFBfQk9VTkRfRE9NQUlOUykKLSAgICAgICAg fSwgW3RoaXMsIHNlc3Npb25JRF0oYXV0byYmIGNvbXBsZXRpb25IYW5kbGVyKSB7CisgICAgICAg IGF1dG8gYXBwQm91bmREb21haW5zQ2FsbGJhY2sgPSBbdGhpcywgc2Vzc2lvbklEXShhdXRvJiYg Y29tcGxldGlvbkhhbmRsZXIpIHsKICAgICAgICAgICAgIHBhcmVudFByb2Nlc3NDb25uZWN0aW9u KCktPnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6R2V0 QXBwQm91bmREb21haW5zIHsgc2Vzc2lvbklEIH0sIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp LCAwKTsKKyAgICAgICAgfTsKICNlbHNlCi0gICAgICAgIH0sIFtdIChhdXRvJiYgY29tcGxldGlv bkhhbmRsZXIpIHsKKyAgICAgICAgYXV0byBhcHBCb3VuZERvbWFpbnNDYWxsYmFjayA9IFtdIChh dXRvJiYgY29tcGxldGlvbkhhbmRsZXIpIHsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KHsgfSk7CisgICAgICAgIH07CiAjZW5kaWYKLSAgICAgICAgfSk7CisgICAgICAgIHJldHVybiBt YWtlVW5pcXVlPFNXU2VydmVyPihtYWtlVW5pcXVlUmVmPFdlYlNXT3JpZ2luU3RvcmU+KCksIGlu Zm8ucHJvY2Vzc1Rlcm1pbmF0aW9uRGVsYXlFbmFibGVkLCBXVEZNb3ZlKHBhdGgpLCBzZXNzaW9u SUQsIHBhcmVudFByb2Nlc3NIYXNTZXJ2aWNlV29ya2VyRW50aXRsZW1lbnQoKSwgW3RoaXMsIHNl c3Npb25JRF0oYXV0byYmIGpvYkRhdGEsIGJvb2wgc2hvdWxkUmVmcmVzaENhY2hlLCBhdXRvJiYg cmVxdWVzdCwgYXV0byYmIGNvbXBsZXRpb25IYW5kbGVyKSBtdXRhYmxlIHsKKyAgICAgICAgICAg IFNlcnZpY2VXb3JrZXJTb2Z0VXBkYXRlTG9hZGVyOjpzdGFydChuZXR3b3JrU2Vzc2lvbihzZXNz aW9uSUQpLCBXVEZNb3ZlKGpvYkRhdGEpLCBzaG91bGRSZWZyZXNoQ2FjaGUsIFdURk1vdmUocmVx dWVzdCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAgfSwgW3RoaXMsIHNl c3Npb25JRF0oYXV0byYgcmVnaXN0cmFibGVEb21haW4sIGF1dG8mJiBjb21wbGV0aW9uSGFuZGxl cikgeworICAgICAgICAgICAgQVNTRVJUKCFyZWdpc3RyYWJsZURvbWFpbi5pc0VtcHR5KCkpOwor ICAgICAgICAgICAgcGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZFdpdGhBc3luY1JlcGx5 KE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpFc3RhYmxpc2hXb3JrZXJDb250ZXh0Q29u bmVjdGlvblRvTmV0d29ya1Byb2Nlc3MgeyByZWdpc3RyYWJsZURvbWFpbiwgc2Vzc2lvbklEIH0s IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCAwKTsKKyAgICAgICAgfSwgV1RGTW92ZShhcHBC b3VuZERvbWFpbnNDYWxsYmFjaykpOwogICAgIH0pOwogICAgIHJldHVybiAqcmVzdWx0Lml0ZXJh dG9yLT52YWx1ZTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5ZmI1NWNjNThhMTg3ZjQ1MDA4MzY2NjcyNDY4MjMxYzhl NjVmMWE0Li41OWE1ZDIwZTI0NDRiM2IyMzVhOGExMzIzMzVlYjNjZGI0ZjhkMTY1IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMjAtMDktMTAgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l eUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93dXAgdG8gQnVnIDIxNTAyNzogYWRkcmVzcyBj b21tZW50cyB0byBpbXByb3ZlIEFQUF9CT1VORF9ET01BSU5TIG1hY3JvIHVzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MzczCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82ODY0NTcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTa2lwIHRlc3RzIGluIHBsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRp b25zIGZpbGUgdG8gb3ZlcndyaXRlIHRoZQorICAgICAgICBleHBlY3RhdGlvbiB0aGF0IGFsbCBy ZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHRlc3RzIHBhc3Mgb24gd2syLiBUaGVuCisgICAgICAgIHVu c2tpcCBmb3IgdGhlIGlvcy13azIgc3BlY2lmaWMgcGxhdGZvcm0uCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdr Mi9UZXN0RXhwZWN0YXRpb25zOgorICAgICAgICAqIHBsYXRmb3JtL3drMi9UZXN0RXhwZWN0YXRp b25zOgorCiAyMDIwLTA5LTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgUG9ydCBCYXNlQXVkaW9Db250ZXh0IHRvIHRoZSBIVE1MIGV2ZW50IGxvb3AKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjNjhiMTBj MTI0MmYzNjgwOTU3YzQ0NWMwMjMzNDM1MDQ5YzViZTQ1Li4zNTMzYzVhYWIwYzYzOTAxZGFjNjFm ZmNiNjMxOGEwOWNiODg0OGY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mt d2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9U ZXN0RXhwZWN0YXRpb25zCkBAIC0xODc5LDMgKzE4NzksNCBAQCB3ZWJraXQub3JnL2IvMjE2Mjk4 IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvSW5kZXhlZERCL2Jsb2ItdmFsaWQtYWZ0 ZXItZAogCiB3ZWJraXQub3JnL2IvMjA5NjE5IGNvbXBvc2l0aW5nL2NsaXBwaW5nL2JvcmRlci1y YWRpdXMtYXN5bmMtb3ZlcmZsb3ctc3RhY2tpbmcuaHRtbCBbIFBhc3MgSW1hZ2VPbmx5RmFpbHVy ZSBdCiAKK2h0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9leGVtcHREb21haW5zLyBb IFBhc3MgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhw ZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25z CmluZGV4IDc4MDU2YjJiNTIwOTY0NjRjNjRiNzg3ZTMzMTZmNTNlYjE3OGRjYjkuLmI5OTJlYzgy NmM4NDdiOWNkYjM1NjBlYmUyNzYzZTMxN2U2NjQ1MzAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEyODksNiArMTI4OSwzIEBAIHdlYmtp dC5vcmcvYi8yMTYxNTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRD UGVlckNvbm5lY3Rpb24tcmVzCiB3ZWJraXQub3JnL2IvMjE2MTY0IFsgQ2F0YWxpbmEgRGVidWcg XSBodG1sNWxpYi9nZW5lcmF0ZWQvcnVuLXRlbXBsYXRlLWRhdGEuaHRtbCBbIFBhc3MgQ3Jhc2gg XQogCiB3ZWJraXQub3JnL2IvMjE2MjkyIFsgUmVsZWFzZSBdIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L3F1aXJrcy1hdXRvLWJsb2NrLXNpemUtd2l0aC1w ZXJjZW50YWdlLWl0ZW0uaHRtbCBbIFBhc3MgRmFpbHVyZSBdCi0KLSMgQXBwIEJvdW5kIERvbWFp bnMgaXMgZm9yIGlPUyBvbmx5Ci1odHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvZXhl bXB0RG9tYWlucy8gWyBTa2lwIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dr Mi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3Rh dGlvbnMKaW5kZXggNWYyNTI0YjRhMjVkZjYyOTIyMmMxYmJiYTVhYzMyYmFhZDY4NWYzYS4uZjdl OTUwYTA1OWQxMDM5ZmI3ZjZjZTk2MWI1M2U1NTQ2YTJjZTg4MCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTcyNyw2ICs3MjcsMTAgQEAgd2Via2l0Lm9y Zy9iLzE4MDcwMyBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvdGVsZW1ldHJ5LWdl bmVyYXRpb24uaHRtbAogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3BydW5lLXN0 YXRpc3RpY3MuaHRtbCBbIFBhc3MgXQogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNz IFsgUGFzcyBdCiAKKyMgQXBwIEJvdW5kIERvbWFpbnMgaXMgZm9yIGlPUyBvbmx5LCBzbyB3ZSBz aG91bGQgc2tpcAorIyB0aGVtIGhlcmUgYW5kIGVuYWJsZSB0aGVtIGluIHRoZSBpT1MgcGxhdGZv cm0gc3BlY2lmaWMgZmlsZS4KK2h0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9leGVt cHREb21haW5zLyBbIFNraXAgXQorCiAjIFRoZSBTYW1lU2l0ZSBjb29raWUgQVBJIGlzIG9ubHkg YXZhaWxhYmxlIGluIG1hY09TIENhdGFsaW5hIGFuZCBhYm92ZS4KIGh0dHAvdGVzdHMvcmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy9zZXQtYWxsLWNvb2tpZXMtdG8tc2FtZS1zaXRlLXN0cmljdC5odG1s IFsgU2tpcCBdCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvZW5mb3JjZS1zYW1l c2l0ZS1zdHJpY3QtYmFzZWQtb24tdG9wLWZyYW1lLXVuaXF1ZS1yZWRpcmVjdHMtdG8uaHRtbCBb IFNraXAgXQo= 408481 2020-09-10 15:05:39 -0700 2020-09-11 09:40:32 -0700 Patch bug-216373-20200910150538.patch text/plain 10148 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNkNDcxNzUzNzBlZWNkMDE3MDkxYzY5 Mzg3YzZkYmViNzdjYzhmOTcuLjY0MTgzMjczZDcwZTNlNmI2MGY2YWRjODBiZTMwMzNiZDYwZTBj NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDktMTAgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93dXAgdG8gQnVnIDIxNTAyNzog YWRkcmVzcyBjb21tZW50cyB0byBpbXByb3ZlIEFQUF9CT1VORF9ET01BSU5TIG1hY3JvIHVzZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MzczCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODY0NTcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZGVmYXVsdC4gQWxsIGVu YWJsZSBmbGFncyBhcmUgb2ZmIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm1F bmFibGUuaDoKKwogMjAyMC0wOS0xMCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbW9kZXJuaXplIGdlbmVyYXRlZCBiYWNrZW5kIHBy b3RvY29sIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MjdiOGQ0OTMzNDY3NTc5MzAzNTM0Y2U4ODQ3ODc5 NzNkODIzMTIxLi4zYmZiMmZlOTRlZmExYmMxOTA5MDgyMDlmZWIzN2ZkMzllMjk4MGIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDktMTAgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93dXAgdG8gQnVnIDIxNTAyNzog YWRkcmVzcyBjb21tZW50cyB0byBpbXByb3ZlIEFQUF9CT1VORF9ET01BSU5TIG1hY3JvIHVzZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MzczCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODY0NTcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBTZXBhcmF0ZSBvdXQgQXBwLUJvdW5kIERvbWFpbiBmdW5j dGlvbnMgdG8gYXZvaWQgbmVzdGVkICNpZiBFTkFCTEUoKQorICAgICAgICBtYWNyb3MsIHdoaWNo IGFyZSBoYXJkIHRvIHJlYWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBCZWhhdmlvciBjb25m aXJtZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05l dHdvcmtTdG9yYWdlU2Vzc2lvbi5oOgorCiAyMDIwLTA5LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBDb25zdHJ1Y3QgTGluZUJveDo6SW5s aW5lQm94ZXMgZm9yIG5lc3RlZCBpbmxpbmUgbGV2ZWwgYm94ZXMgd2hlbiB0aGV5IG92ZXJsYXAg bXVsdGlwbGUgbGluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNmM1ZjQ5MjRkOTEyNDYwYjIxZDc5YTljMTgyMzVk MWJmMWY1M2E4ZS4uMTViNjNjNTkxZjc1YTBjYjI3YzIxMzRjMjZlZDhiYWE5MjIyNGRlYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wOS0xMCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJp bmVfY2hlbmV5QGFwcGxlLmNvbT4KKworICAgICAgICBGb2xsb3d1cCB0byBCdWcgMjE1MDI3OiBh ZGRyZXNzIGNvbW1lbnRzIHRvIGltcHJvdmUgQVBQX0JPVU5EX0RPTUFJTlMgbWFjcm8gdXNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYzNzMKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY4NjQ1NzA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgorCisgICAgICAgIFVzZSBhIGxvY2FsIHZhcmlhYmxlIHRvIGF2b2lkIGF3a3dh cmQgI2lmIEVOQUJMRSgpIG1hY3JvIHBsYWNlbWVudC4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6 OnN3U2VydmVyRm9yU2Vzc2lvbik6CisKIDIwMjAtMDktMDkgIEJyaWFuIEJ1cmcgIDxiYnVyZ0Bh cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogX1dLSW5zcGVjdG9yRGVsZWdhdGUg c2hvdWxkIGJlIGF0dGFjaGVkIHRvIF9XS0luc3BlY3RvciBub3QgV0tXZWJWaWV3CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5oIGIvU291cmNlL1dURi93dGYvUGxh dGZvcm1FbmFibGUuaAppbmRleCAzOWQwZTZkMmEzZWY1MzU4MTJmMDQyMzBkOWU0Y2ZiNzczYmEz YTI5Li43MDBmOTBhZGM2YzM5YTc2YmFhMjdkN2M4YjMxZmU0ZGU2Mjk1OThiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1Bs YXRmb3JtRW5hYmxlLmgKQEAgLTE5MywxMCArMTkzLDYgQEAKICNkZWZpbmUgRU5BQkxFX0FQTkcg MQogI2VuZGlmCiAKLSNpZiAhZGVmaW5lZChFTkFCTEVfQVBQX0JPVU5EX0RPTUFJTlMpCi0jZGVm aW5lIEVOQUJMRV9BUFBfQk9VTkRfRE9NQUlOUyAwCi0jZW5kaWYKLQogI2lmICFkZWZpbmVkKEVO QUJMRV9DSEFOTkVMX01FU1NBR0lORykKICNkZWZpbmUgRU5BQkxFX0NIQU5ORUxfTUVTU0FHSU5H IDEKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9O ZXR3b3JrU3RvcmFnZVNlc3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv TmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgKaW5kZXggNzg2ZDkxYWMzZWMwYmQ3MzQ0M2YxZDAxZDU1 MzA4MTY0YzA4MGVhZS4uMWIxNzFkMDM1NTNhYzYwOTQ3ZTQ3NTc3ZjE1MjRjYTM2MTBlMDM5MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFn ZVNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtT dG9yYWdlU2Vzc2lvbi5oCkBAIC0yMTIsMTEgKzIxMiwxMiBAQCBwdWJsaWM6CiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBkaWRDb21taXRDcm9zc1NpdGVMb2FkV2l0aERhdGFUcmFuc2ZlckZyb21Q cmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgdG9Eb21haW4sIFBhZ2VJ ZGVudGlmaWVyKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlc2V0Q3Jvc3NTaXRlTG9hZHNX aXRoTGlua0RlY29yYXRpb25Gb3JUZXN0aW5nKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBz ZXRUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKFRoaXJkUGFydHlDb29raWVCbG9ja2luZ01v ZGUpOworI2VuZGlmCisgICAgCiAjaWYgRU5BQkxFKEFQUF9CT1VORF9ET01BSU5TKQogICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0QXBwQm91bmREb21haW5zKEhhc2hTZXQ8UmVnaXN0cmFibGVE b21haW4+JiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVzZXRBcHBCb3VuZERvbWFpbnMo KTsKICNlbmRpZgotI2VuZGlmCiAKIHByaXZhdGU6CiAjaWYgUExBVEZPUk0oQ09DT0EpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IDhh YTRkZWRlZjY5MmQ1NjE5M2EwNTRmZWFhYWE1NTk5YjEzMjZiY2UuLjkwZWI2MmM2YTk3YzU3OGFk ODBjYmIwY2QwMGRlNTgzMDlkMTI0ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yNTA5LDIwICsyNTA5LDIyIEBAIFNXU2VydmVy JiBOZXR3b3JrUHJvY2Vzczo6c3dTZXJ2ZXJGb3JTZXNzaW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Np b25JRCkKICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIGFscmVhZHkgYmUgYSByZWdpc3RlcmVkIHBh dGggZm9yIHRoaXMgUEFMOjpTZXNzaW9uSUQuCiAgICAgICAgIC8vIElmIHRoZXJlJ3Mgbm90LCB0 aGVuIHdoZXJlIGRpZCB0aGlzIFBBTDo6U2Vzc2lvbklEIGNvbWUgZnJvbT8KICAgICAgICAgQVNT RVJUKHNlc3Npb25JRC5pc0VwaGVtZXJhbCgpIHx8ICFwYXRoLmlzRW1wdHkoKSk7Ci0KLSAgICAg ICAgcmV0dXJuIG1ha2VVbmlxdWU8U1dTZXJ2ZXI+KG1ha2VVbmlxdWVSZWY8V2ViU1dPcmlnaW5T dG9yZT4oKSwgaW5mby5wcm9jZXNzVGVybWluYXRpb25EZWxheUVuYWJsZWQsIFdURk1vdmUocGF0 aCksIHNlc3Npb25JRCwgcGFyZW50UHJvY2Vzc0hhc1NlcnZpY2VXb3JrZXJFbnRpdGxlbWVudCgp LCBbdGhpcywgc2Vzc2lvbklEXShhdXRvJiYgam9iRGF0YSwgYm9vbCBzaG91bGRSZWZyZXNoQ2Fj aGUsIGF1dG8mJiByZXF1ZXN0LCBhdXRvJiYgY29tcGxldGlvbkhhbmRsZXIpIG11dGFibGUgewot ICAgICAgICAgICAgU2VydmljZVdvcmtlclNvZnRVcGRhdGVMb2FkZXI6OnN0YXJ0KG5ldHdvcmtT ZXNzaW9uKHNlc3Npb25JRCksIFdURk1vdmUoam9iRGF0YSksIHNob3VsZFJlZnJlc2hDYWNoZSwg V1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwotICAgICAgICB9 LCBbdGhpcywgc2Vzc2lvbklEXShhdXRvJiByZWdpc3RyYWJsZURvbWFpbiwgYXV0byYmIGNvbXBs ZXRpb25IYW5kbGVyKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIXJlZ2lzdHJhYmxlRG9tYWluLmlz RW1wdHkoKSk7Ci0gICAgICAgICAgICBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kV2l0 aEFzeW5jUmVwbHkoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OkVzdGFibGlzaFdvcmtl ckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyB7IHJlZ2lzdHJhYmxlRG9tYWluLCBz ZXNzaW9uSUQgfSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIDApOworICAgICAgICAKICNp ZiBFTkFCTEUoQVBQX0JPVU5EX0RPTUFJTlMpCi0gICAgICAgIH0sIFt0aGlzLCBzZXNzaW9uSURd KGF1dG8mJiBjb21wbGV0aW9uSGFuZGxlcikgeworICAgICAgICBhdXRvIGFwcEJvdW5kRG9tYWlu c0NhbGxiYWNrID0gW3RoaXMsIHNlc3Npb25JRF0oYXV0byYmIGNvbXBsZXRpb25IYW5kbGVyKSB7 CiAgICAgICAgICAgICBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kV2l0aEFzeW5jUmVw bHkoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OkdldEFwcEJvdW5kRG9tYWlucyB7IHNl c3Npb25JRCB9LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgMCk7CisgICAgICAgIH07CiAj ZWxzZQotICAgICAgICB9LCBbXSAoYXV0byYmIGNvbXBsZXRpb25IYW5kbGVyKSB7CisgICAgICAg IGF1dG8gYXBwQm91bmREb21haW5zQ2FsbGJhY2sgPSBbXSAoYXV0byYmIGNvbXBsZXRpb25IYW5k bGVyKSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOworICAgICAgICB9Owog I2VuZGlmCi0gICAgICAgIH0pOworICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxTV1NlcnZlcj4o bWFrZVVuaXF1ZVJlZjxXZWJTV09yaWdpblN0b3JlPigpLCBpbmZvLnByb2Nlc3NUZXJtaW5hdGlv bkRlbGF5RW5hYmxlZCwgV1RGTW92ZShwYXRoKSwgc2Vzc2lvbklELCBwYXJlbnRQcm9jZXNzSGFz U2VydmljZVdvcmtlckVudGl0bGVtZW50KCksIFt0aGlzLCBzZXNzaW9uSURdKGF1dG8mJiBqb2JE YXRhLCBib29sIHNob3VsZFJlZnJlc2hDYWNoZSwgYXV0byYmIHJlcXVlc3QsIGF1dG8mJiBjb21w bGV0aW9uSGFuZGxlcikgbXV0YWJsZSB7CisgICAgICAgICAgICBTZXJ2aWNlV29ya2VyU29mdFVw ZGF0ZUxvYWRlcjo6c3RhcnQobmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSwgV1RGTW92ZShqb2JE YXRhKSwgc2hvdWxkUmVmcmVzaENhY2hlLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKSk7CisgICAgICAgIH0sIFt0aGlzLCBzZXNzaW9uSURdKGF1dG8mIHJlZ2lz dHJhYmxlRG9tYWluLCBhdXRvJiYgY29tcGxldGlvbkhhbmRsZXIpIHsKKyAgICAgICAgICAgIEFT U0VSVCghcmVnaXN0cmFibGVEb21haW4uaXNFbXB0eSgpKTsKKyAgICAgICAgICAgIHBhcmVudFBy b2Nlc3NDb25uZWN0aW9uKCktPnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya1By b2Nlc3NQcm94eTo6RXN0YWJsaXNoV29ya2VyQ29udGV4dENvbm5lY3Rpb25Ub05ldHdvcmtQcm9j ZXNzIHsgcmVnaXN0cmFibGVEb21haW4sIHNlc3Npb25JRCB9LCBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKSwgMCk7CisgICAgICAgIH0sIFdURk1vdmUoYXBwQm91bmREb21haW5zQ2FsbGJhY2sp KTsKICAgICB9KTsKICAgICByZXR1cm4gKnJlc3VsdC5pdGVyYXRvci0+dmFsdWU7CiB9CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggMmFmNzA3YmY1MjMyYTA3ZDc5YTA3ZGI2NmVlZmY1OTJhZDQ5NmFiMS4uYzYxNWJmMDZiMGI4 MTIzYzllN2VjZTU5YjU4YjQyZTZmM2YzYmM3MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIw LTA5LTEwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAg ICAgIEZvbGxvd3VwIHRvIEJ1ZyAyMTUwMjc6IGFkZHJlc3MgY29tbWVudHMgdG8gaW1wcm92ZSBB UFBfQk9VTkRfRE9NQUlOUyBtYWNybyB1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxNjM3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg2NDU3 MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgU2tpcCB0 ZXN0cyBpbiBwbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucyBmaWxlIHRvIG92ZXJ3cml0ZSB0 aGUKKyAgICAgICAgZXhwZWN0YXRpb24gdGhhdCBhbGwgcmVzb3VyY2VMb2FkU3RhdGlzdGljcyB0 ZXN0cyBwYXNzIG9uIHdrMi4gVGhlbgorICAgICAgICB1bnNraXAgZm9yIHRoZSBpb3Mtd2syIHNw ZWNpZmljIHBsYXRmb3JtLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zLXdrMi9UZXN0RXhwZWN0 YXRpb25zOgorICAgICAgICAqIHBsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9uczoKKyAg ICAgICAgKiBwbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMC0wOS0xMCAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQ29uc3Ry dWN0IExpbmVCb3g6OklubGluZUJveGVzIGZvciBuZXN0ZWQgaW5saW5lIGxldmVsIGJveGVzIHdo ZW4gdGhleSBvdmVybGFwIG11bHRpcGxlIGxpbmVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p b3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZWVhMTI5MGNhYTE4ZGUwYjI0MzcxM2Q5MzMx NWEzYjIyZWM5OTBlNC4uZGRlMWJkOGMyZWFlZDgzYTY1YjIyZmI1OWI1NjMyMDEzN2IyYWMzYSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9UZXN0RXhwZWN0YXRpb25z CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAt MTg4MSwzICsxODgxLDUgQEAgd2Via2l0Lm9yZy9iLzIwOTYxOSBjb21wb3NpdGluZy9jbGlwcGlu Zy9ib3JkZXItcmFkaXVzLWFzeW5jLW92ZXJmbG93LXN0YWNraW5nLmgKIAogIzxyZGFyOi8vcHJv YmxlbS82MzAyNjI4Mz4gWyBtYWNPUyBpT1MgXSBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv cGxheWJhY2stc3VwcG9ydC9wbGF5YmFjay1zdXBwb3J0LWF1dG9wbGF5Lmh0bWwgaXMgYSBmbGFr eSBmYWlsdXJlL3RpbWVvdXQKIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGF5YmFjay1z dXBwb3J0L3BsYXliYWNrLXN1cHBvcnQtYXV0b3BsYXkuaHRtbCBbIFBhc3MgVGltZW91dCBdCisK K2h0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9leGVtcHREb21haW5zLyBbIFBhc3Mg XQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCmluZGV4 IDc4MDU2YjJiNTIwOTY0NjRjNjRiNzg3ZTMzMTZmNTNlYjE3OGRjYjkuLmI5OTJlYzgyNmM4NDdi OWNkYjM1NjBlYmUyNzYzZTMxN2U2NjQ1MzAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEyODksNiArMTI4OSwzIEBAIHdlYmtpdC5vcmcv Yi8yMTYxNTkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMvUlRDUGVlckNv bm5lY3Rpb24tcmVzCiB3ZWJraXQub3JnL2IvMjE2MTY0IFsgQ2F0YWxpbmEgRGVidWcgXSBodG1s NWxpYi9nZW5lcmF0ZWQvcnVuLXRlbXBsYXRlLWRhdGEuaHRtbCBbIFBhc3MgQ3Jhc2ggXQogCiB3 ZWJraXQub3JnL2IvMjE2MjkyIFsgUmVsZWFzZSBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L3F1aXJrcy1hdXRvLWJsb2NrLXNpemUtd2l0aC1wZXJjZW50 YWdlLWl0ZW0uaHRtbCBbIFBhc3MgRmFpbHVyZSBdCi0KLSMgQXBwIEJvdW5kIERvbWFpbnMgaXMg Zm9yIGlPUyBvbmx5Ci1odHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvZXhlbXB0RG9t YWlucy8gWyBTa2lwIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3drMi9UZXN0 RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggNWYyNTI0YjRhMjVkZjYyOTIyMmMxYmJiYTVhYzMyYmFhZDY4NWYzYS4uZjdlOTUwYTA1 OWQxMDM5ZmI3ZjZjZTk2MWI1M2U1NTQ2YTJjZTg4MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v d2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTcyNyw2ICs3MjcsMTAgQEAgd2Via2l0Lm9yZy9iLzE4 MDcwMyBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvdGVsZW1ldHJ5LWdlbmVyYXRp b24uaHRtbAogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3BydW5lLXN0YXRpc3Rp Y3MuaHRtbCBbIFBhc3MgXQogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzIFsgUGFz cyBdCiAKKyMgQXBwIEJvdW5kIERvbWFpbnMgaXMgZm9yIGlPUyBvbmx5LCBzbyB3ZSBzaG91bGQg c2tpcAorIyB0aGVtIGhlcmUgYW5kIGVuYWJsZSB0aGVtIGluIHRoZSBpT1MgcGxhdGZvcm0gc3Bl Y2lmaWMgZmlsZS4KK2h0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9leGVtcHREb21h aW5zLyBbIFNraXAgXQorCiAjIFRoZSBTYW1lU2l0ZSBjb29raWUgQVBJIGlzIG9ubHkgYXZhaWxh YmxlIGluIG1hY09TIENhdGFsaW5hIGFuZCBhYm92ZS4KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2Fk U3RhdGlzdGljcy9zZXQtYWxsLWNvb2tpZXMtdG8tc2FtZS1zaXRlLXN0cmljdC5odG1sIFsgU2tp cCBdCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvZW5mb3JjZS1zYW1lc2l0ZS1z dHJpY3QtYmFzZWQtb24tdG9wLWZyYW1lLXVuaXF1ZS1yZWRpcmVjdHMtdG8uaHRtbCBbIFNraXAg XQo= 408538 2020-09-11 09:40:34 -0700 2020-09-11 10:33:31 -0700 Patch for landing bug-216373-20200911094033.patch text/plain 9316 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDBiYWY5MmYwNjYxMjgwYzFhNTQzZGRk YWJmMzgzNjk1ZjNkMmE1NDUuLjA5ZTliYTMyNGY0ZGU0YmM0MjMxOWU1ZjBjZWMwNGIwZTdjZDBj MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDktMTAgIEthdGUgQ2hlbmV5ICA8a2F0aGVy aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9sbG93dXAgdG8gQnVnIDIxNTAyNzog YWRkcmVzcyBjb21tZW50cyB0byBpbXByb3ZlIEFQUF9CT1VORF9ET01BSU5TIG1hY3JvIHVzZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MzczCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODY0NTcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZGVmYXVsdC4gQWxsIGVu YWJsZSBmbGFncyBhcmUgb2ZmIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm1F bmFibGUuaDoKKwogMjAyMC0wOS0xMCAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBEaXNhYmxlIGhhcmR3YXJlIEpQRUcgZGVjb2Rpbmcgb24geDg2IE1hYwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDM0YTVhMjQ4M2EzOGQwNjQ4N2VmM2QzNDg1MzM3YmQ5NGIxOGFjMGQuLmRmOGE1ZjkyMGE4 Y2RjNzFiZmU1ZDdhOGNkODkxZjAzM2U2NGJjNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBA QAorMjAyMC0wOS0xMCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4K KworICAgICAgICBGb2xsb3d1cCB0byBCdWcgMjE1MDI3OiBhZGRyZXNzIGNvbW1lbnRzIHRvIGlt cHJvdmUgQVBQX0JPVU5EX0RPTUFJTlMgbWFjcm8gdXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYzNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzY4NjQ1NzA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAg IFNlcGFyYXRlIG91dCBBcHAtQm91bmQgRG9tYWluIGZ1bmN0aW9ucyB0byBhdm9pZCBuZXN0ZWQg I2lmIEVOQUJMRSgpCisgICAgICAgIG1hY3Jvcywgd2hpY2ggYXJlIGhhcmQgdG8gcmVhZC4KKwor ICAgICAgICBObyBuZXcgdGVzdHMuIEJlaGF2aW9yIGNvbmZpcm1lZCBieSBleGlzdGluZyB0ZXN0 cy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg6 CisKIDIwMjAtMDktMTEgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAg IFtXZWJJRExdIFNwbGl0IHN1cHBsZW1lbnRhbCBpbnRlcmZhY2VzIG91dCBvZiBEb2N1bWVudApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCA1MmI0NDdkMTNiODhlMWM5YTU1NjZjMGQyZTI5NmExNzE5MzZiMjdkLi44YmFi OWZlMGMwNzkxNzdlYjg3ODYyMmM1Y2U5NzdlYWI1MWQxYWVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDIwLTA5LTEwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUu Y29tPgorCisgICAgICAgIEZvbGxvd3VwIHRvIEJ1ZyAyMTUwMjc6IGFkZHJlc3MgY29tbWVudHMg dG8gaW1wcm92ZSBBUFBfQk9VTkRfRE9NQUlOUyBtYWNybyB1c2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjM3MworICAgICAgICA8cmRhcjovL3By b2JsZW0vNjg2NDU3MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAg ICAgICAgVXNlIGEgbG9jYWwgdmFyaWFibGUgdG8gYXZvaWQgYXdrd2FyZCAjaWYgRU5BQkxFKCkg bWFjcm8gcGxhY2VtZW50LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl c3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6c3dTZXJ2ZXJGb3JTZXNz aW9uKToKKwogMjAyMC0wOS0xMCAgSm9vbmdodW4gUGFyayAgPGpoNzE4LnBhcmtAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gUmVtb3ZlIHRoZSBidWlsZCB3YXJuaW5nIGJlbG93 IHNpbmNlIHIyNjY4ODUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJs ZS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGUuaAppbmRleCAzOWQwZTZkMmEzZWY1 MzU4MTJmMDQyMzBkOWU0Y2ZiNzczYmEzYTI5Li43MDBmOTBhZGM2YzM5YTc2YmFhMjdkN2M4YjMx ZmU0ZGU2Mjk1OThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZS5o CisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlLmgKQEAgLTE5MywxMCArMTkzLDYg QEAKICNkZWZpbmUgRU5BQkxFX0FQTkcgMQogI2VuZGlmCiAKLSNpZiAhZGVmaW5lZChFTkFCTEVf QVBQX0JPVU5EX0RPTUFJTlMpCi0jZGVmaW5lIEVOQUJMRV9BUFBfQk9VTkRfRE9NQUlOUyAwCi0j ZW5kaWYKLQogI2lmICFkZWZpbmVkKEVOQUJMRV9DSEFOTkVMX01FU1NBR0lORykKICNkZWZpbmUg RU5BQkxFX0NIQU5ORUxfTUVTU0FHSU5HIDEKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgKaW5kZXggNzg2 ZDkxYWMzZWMwYmQ3MzQ0M2YxZDAxZDU1MzA4MTY0YzA4MGVhZS4uMWIxNzFkMDM1NTNhYzYwOTQ3 ZTQ3NTc3ZjE1MjRjYTM2MTBlMDM5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCkBAIC0yMTIsMTEgKzIxMiwx MiBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBkaWRDb21taXRDcm9zc1NpdGVM b2FkV2l0aERhdGFUcmFuc2ZlckZyb21QcmV2YWxlbnRSZXNvdXJjZShjb25zdCBSZWdpc3RyYWJs ZURvbWFpbiYgdG9Eb21haW4sIFBhZ2VJZGVudGlmaWVyKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHJlc2V0Q3Jvc3NTaXRlTG9hZHNXaXRoTGlua0RlY29yYXRpb25Gb3JUZXN0aW5nKCk7CiAg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKFRo aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUpOworI2VuZGlmCisgICAgCiAjaWYgRU5BQkxFKEFQ UF9CT1VORF9ET01BSU5TKQogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0QXBwQm91bmREb21h aW5zKEhhc2hTZXQ8UmVnaXN0cmFibGVEb21haW4+JiYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgcmVzZXRBcHBCb3VuZERvbWFpbnMoKTsKICNlbmRpZgotI2VuZGlmCiAKIHByaXZhdGU6CiAj aWYgUExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Byb2Nlc3MuY3BwCmluZGV4IDhhYTRkZWRlZjY5MmQ1NjE5M2EwNTRmZWFhYWE1NTk5YjEz MjZiY2UuLjkwZWI2MmM2YTk3YzU3OGFkODBjYmIwY2QwMGRlNTgzMDlkMTI0ZjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0yNTA5 LDIwICsyNTA5LDIyIEBAIFNXU2VydmVyJiBOZXR3b3JrUHJvY2Vzczo6c3dTZXJ2ZXJGb3JTZXNz aW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIGFs cmVhZHkgYmUgYSByZWdpc3RlcmVkIHBhdGggZm9yIHRoaXMgUEFMOjpTZXNzaW9uSUQuCiAgICAg ICAgIC8vIElmIHRoZXJlJ3Mgbm90LCB0aGVuIHdoZXJlIGRpZCB0aGlzIFBBTDo6U2Vzc2lvbklE IGNvbWUgZnJvbT8KICAgICAgICAgQVNTRVJUKHNlc3Npb25JRC5pc0VwaGVtZXJhbCgpIHx8ICFw YXRoLmlzRW1wdHkoKSk7Ci0KLSAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8U1dTZXJ2ZXI+KG1h a2VVbmlxdWVSZWY8V2ViU1dPcmlnaW5TdG9yZT4oKSwgaW5mby5wcm9jZXNzVGVybWluYXRpb25E ZWxheUVuYWJsZWQsIFdURk1vdmUocGF0aCksIHNlc3Npb25JRCwgcGFyZW50UHJvY2Vzc0hhc1Nl cnZpY2VXb3JrZXJFbnRpdGxlbWVudCgpLCBbdGhpcywgc2Vzc2lvbklEXShhdXRvJiYgam9iRGF0 YSwgYm9vbCBzaG91bGRSZWZyZXNoQ2FjaGUsIGF1dG8mJiByZXF1ZXN0LCBhdXRvJiYgY29tcGxl dGlvbkhhbmRsZXIpIG11dGFibGUgewotICAgICAgICAgICAgU2VydmljZVdvcmtlclNvZnRVcGRh dGVMb2FkZXI6OnN0YXJ0KG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCksIFdURk1vdmUoam9iRGF0 YSksIHNob3VsZFJlZnJlc2hDYWNoZSwgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcikpOwotICAgICAgICB9LCBbdGhpcywgc2Vzc2lvbklEXShhdXRvJiByZWdpc3Ry YWJsZURvbWFpbiwgYXV0byYmIGNvbXBsZXRpb25IYW5kbGVyKSB7Ci0gICAgICAgICAgICBBU1NF UlQoIXJlZ2lzdHJhYmxlRG9tYWluLmlzRW1wdHkoKSk7Ci0gICAgICAgICAgICBwYXJlbnRQcm9j ZXNzQ29ubmVjdGlvbigpLT5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6Ok5ldHdvcmtQcm9j ZXNzUHJveHk6OkVzdGFibGlzaFdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2Vz cyB7IHJlZ2lzdHJhYmxlRG9tYWluLCBzZXNzaW9uSUQgfSwgV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlciksIDApOworICAgICAgICAKICNpZiBFTkFCTEUoQVBQX0JPVU5EX0RPTUFJTlMpCi0gICAg ICAgIH0sIFt0aGlzLCBzZXNzaW9uSURdKGF1dG8mJiBjb21wbGV0aW9uSGFuZGxlcikgeworICAg ICAgICBhdXRvIGFwcEJvdW5kRG9tYWluc0NhbGxiYWNrID0gW3RoaXMsIHNlc3Npb25JRF0oYXV0 byYmIGNvbXBsZXRpb25IYW5kbGVyKSB7CiAgICAgICAgICAgICBwYXJlbnRQcm9jZXNzQ29ubmVj dGlvbigpLT5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6 OkdldEFwcEJvdW5kRG9tYWlucyB7IHNlc3Npb25JRCB9LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSwgMCk7CisgICAgICAgIH07CiAjZWxzZQotICAgICAgICB9LCBbXSAoYXV0byYmIGNvbXBs ZXRpb25IYW5kbGVyKSB7CisgICAgICAgIGF1dG8gYXBwQm91bmREb21haW5zQ2FsbGJhY2sgPSBb XSAoYXV0byYmIGNvbXBsZXRpb25IYW5kbGVyKSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcih7IH0pOworICAgICAgICB9OwogI2VuZGlmCi0gICAgICAgIH0pOworICAgICAgICByZXR1 cm4gbWFrZVVuaXF1ZTxTV1NlcnZlcj4obWFrZVVuaXF1ZVJlZjxXZWJTV09yaWdpblN0b3JlPigp LCBpbmZvLnByb2Nlc3NUZXJtaW5hdGlvbkRlbGF5RW5hYmxlZCwgV1RGTW92ZShwYXRoKSwgc2Vz c2lvbklELCBwYXJlbnRQcm9jZXNzSGFzU2VydmljZVdvcmtlckVudGl0bGVtZW50KCksIFt0aGlz LCBzZXNzaW9uSURdKGF1dG8mJiBqb2JEYXRhLCBib29sIHNob3VsZFJlZnJlc2hDYWNoZSwgYXV0 byYmIHJlcXVlc3QsIGF1dG8mJiBjb21wbGV0aW9uSGFuZGxlcikgbXV0YWJsZSB7CisgICAgICAg ICAgICBTZXJ2aWNlV29ya2VyU29mdFVwZGF0ZUxvYWRlcjo6c3RhcnQobmV0d29ya1Nlc3Npb24o c2Vzc2lvbklEKSwgV1RGTW92ZShqb2JEYXRhKSwgc2hvdWxkUmVmcmVzaENhY2hlLCBXVEZNb3Zl KHJlcXVlc3QpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgICAgIH0sIFt0aGlz LCBzZXNzaW9uSURdKGF1dG8mIHJlZ2lzdHJhYmxlRG9tYWluLCBhdXRvJiYgY29tcGxldGlvbkhh bmRsZXIpIHsKKyAgICAgICAgICAgIEFTU0VSVCghcmVnaXN0cmFibGVEb21haW4uaXNFbXB0eSgp KTsKKyAgICAgICAgICAgIHBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmRXaXRoQXN5bmNS ZXBseShNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6RXN0YWJsaXNoV29ya2VyQ29udGV4 dENvbm5lY3Rpb25Ub05ldHdvcmtQcm9jZXNzIHsgcmVnaXN0cmFibGVEb21haW4sIHNlc3Npb25J RCB9LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgMCk7CisgICAgICAgIH0sIFdURk1vdmUo YXBwQm91bmREb21haW5zQ2FsbGJhY2spKTsKICAgICB9KTsKICAgICByZXR1cm4gKnJlc3VsdC5p dGVyYXRvci0+dmFsdWU7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDFjODY5Y2ZlODg5NmQ3Mzg3YmM2NjdmMjI2Yzcz OTA1MTU0MWQwMC4uZDNiY2E0OGNiOWMzYTBkNWNiMjU1ZTAyZjNmOTgzYzRkNzJiYmYzMiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA5LTEwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9j aGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEZvbGxvd3VwIHRvIEJ1ZyAyMTUwMjc6IGFkZHJl c3MgY29tbWVudHMgdG8gaW1wcm92ZSBBUFBfQk9VTkRfRE9NQUlOUyBtYWNybyB1c2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjM3MworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNjg2NDU3MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCisKKyAgICAgICAgU2tpcCB0ZXN0cyBpbiBwbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9ucyBmaWxlIHRvIG92ZXJ3cml0ZSB0aGUKKyAgICAgICAgZXhwZWN0YXRpb24gdGhhdCBhbGwg cmVzb3VyY2VMb2FkU3RhdGlzdGljcyB0ZXN0cyBwYXNzIG9uIHdrMi4gVGhlbgorICAgICAgICB1 bnNraXAgZm9yIHRoZSBpb3Mtd2syIHNwZWNpZmljIHBsYXRmb3JtLgorCisgICAgICAgICogcGxh dGZvcm0vaW9zLXdrMi9UZXN0RXhwZWN0YXRpb25zOgorICAgICAgICAqIHBsYXRmb3JtL21hYy13 azIvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAgKiBwbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAyMC0wOS0xMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OIChBc3luYyBvdmVyZmxvdyBzY3JvbGwpOiBNb3VzZSB3 aGVlbCBzY3JvbGxpbmcgb3ZlciBhbiAiYWx3YXlzLW9uIiBvdmVyZmxvdyBzY3JvbGxiYXIgZG9l c24ndCB3b3JrCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlv bnMKaW5kZXggZWVhMTI5MGNhYTE4ZGUwYjI0MzcxM2Q5MzMxNWEzYjIyZWM5OTBlNC4uZGRlMWJk OGMyZWFlZDgzYTY1YjIyZmI1OWI1NjMyMDEzN2IyYWMzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vaW9zLXdrMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTg4MSwzICsxODgxLDUgQEAgd2Vi a2l0Lm9yZy9iLzIwOTYxOSBjb21wb3NpdGluZy9jbGlwcGluZy9ib3JkZXItcmFkaXVzLWFzeW5j LW92ZXJmbG93LXN0YWNraW5nLmgKIAogIzxyZGFyOi8vcHJvYmxlbS82MzAyNjI4Mz4gWyBtYWNP UyBpT1MgXSBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcGxheWJhY2stc3VwcG9ydC9wbGF5 YmFjay1zdXBwb3J0LWF1dG9wbGF5Lmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlL3RpbWVvdXQKIG1l ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGF5YmFjay1zdXBwb3J0L3BsYXliYWNrLXN1cHBv cnQtYXV0b3BsYXkuaHRtbCBbIFBhc3MgVGltZW91dCBdCisKK2h0dHAvdGVzdHMvcmVzb3VyY2VM b2FkU3RhdGlzdGljcy9leGVtcHREb21haW5zLyBbIFBhc3MgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS93azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA1ZjI1MjRiNGEyNWRmNjI5MjIyYzFiYmJhNWFj MzJiYWFkNjg1ZjNhLi5mN2U5NTBhMDU5ZDEwMzlmYjdmNmNlOTYxYjUzZTU1NDZhMmNlODgwIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNzI3LDYgKzcy NywxMCBAQCB3ZWJraXQub3JnL2IvMTgwNzAzIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlz dGljcy90ZWxlbWV0cnktZ2VuZXJhdGlvbi5odG1sCiBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0 YXRpc3RpY3MvcHJ1bmUtc3RhdGlzdGljcy5odG1sIFsgUGFzcyBdCiBodHRwL3Rlc3RzL3Jlc291 cmNlTG9hZFN0YXRpc3RpY3MgWyBQYXNzIF0KIAorIyBBcHAgQm91bmQgRG9tYWlucyBpcyBmb3Ig aU9TIG9ubHksIHNvIHdlIHNob3VsZCBza2lwCisjIHRoZW0gaGVyZSBhbmQgZW5hYmxlIHRoZW0g aW4gdGhlIGlPUyBwbGF0Zm9ybSBzcGVjaWZpYyBmaWxlLgoraHR0cC90ZXN0cy9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzL2V4ZW1wdERvbWFpbnMvIFsgU2tpcCBdCisKICMgVGhlIFNhbWVTaXRlIGNv b2tpZSBBUEkgaXMgb25seSBhdmFpbGFibGUgaW4gbWFjT1MgQ2F0YWxpbmEgYW5kIGFib3ZlLgog aHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL3NldC1hbGwtY29va2llcy10by1zYW1l LXNpdGUtc3RyaWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlz dGljcy9lbmZvcmNlLXNhbWVzaXRlLXN0cmljdC1iYXNlZC1vbi10b3AtZnJhbWUtdW5pcXVlLXJl ZGlyZWN0cy10by5odG1sIFsgU2tpcCBdCg==