238062 2022-03-17 18:08:24 -0700 hasExplicitlySetBorderRadius logic is broken 2022-03-19 19:20:17 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 212476 236199 1 obrufau obrufau aestes changseok darin esprehn+autocc ews-watchlist glenn gyuyoung.kim joepeck koivisto kondapallykalyan macpherson menard pdr simon.fraser webkit-bug-importer oldest_to_newest 1852586 0 obrufau 2022-03-17 18:08:24 -0700 Bug 212476 added a hasExplicitlySetBorderRadius flag that tracks whether the radius is a non initial value. It doesn't work well, because border-radius is a shorthand with multiple longhands. <style> .apple-pay-button { -webkit-appearance: -apple-pay-button; } .square-corners { border-radius: 0px; } </style> <div class=container> <button class='apple-pay-button square-corners' style='border-bottom-left-radius: inherit'></button> <button class='apple-pay-button square-corners' style='border-bottom-right-radius: inherit'></button> <button class='apple-pay-button square-corners' style='border-top-left-radius: inherit'></button> <button class='apple-pay-button square-corners' style='border-top-right-radius: inherit'></button> </div> Result: all buttons have square corners, except the last one. Why? Because all the border-*-radius share the same flag, and the properties are applied in alphabetical order. So e.g. for the first button: 1. Applying border-bottom-left-radius:inherit sets the flag to the parent value, which is false. 2. Applying border-bottom-right-radius:0px sets the flag to true. 3. Applying border-top-left-radius:0px sets the flag to true. 4. Applying border-top-right-radius:0px sets the flag to true. The flag ends up being true. So e.g. for the first button: 1. Applying border-bottom-left-radius:0px sets the flag to true. 2. Applying border-bottom-right-radius:0px sets the flag to true. 3. Applying border-top-left-radius:0px sets the flag to true. 4. Applying border-top-right-radius:inherit sets the flag to the parent value, which is false. The flag ends up being false! Also, only BuilderCustom::applyInheritBorder*Radius and BuilderCustom::applyValueBorder*Radius set the flag. But BuilderFunctions::applyInitialBorder*Radius doesn't set it. This makes the test appearance-apple-pay-button-border-radius.html fail with my patch for bug 236199. IMO this flag doesn't make much sense, as mentioned in bug 212476 it should probably be about cascade origins. Or rather than being a separate flag, it would probably be better to store it as an auto radius Length? But given the current state, and since I don't want to refactor the entire thing, as a band-aid I think it makes more sense to: - Have one flag for each longhand. - Let 'inherit' set it to true. 1852589 1 455055 obrufau 2022-03-17 18:36:33 -0700 Created attachment 455055 Patch 1852595 2 455059 obrufau 2022-03-17 19:30:17 -0700 Created attachment 455059 Patch 1852716 3 obrufau 2022-03-18 08:01:13 -0700 PTAL. 1853024 4 ews-feeder 2022-03-19 19:19:13 -0700 Committed r291536 (248642@main): <https://commits.webkit.org/248642@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455059. 1853025 5 webkit-bug-importer 2022-03-19 19:20:17 -0700 <rdar://problem/90531307> 455055 2022-03-17 18:36:33 -0700 2022-03-17 19:30:10 -0700 Patch bug-238062-20220318023632.patch text/plain 23375 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZhZGIxNWJiMzNlZTc0 OWVjOTkzMjI4ZjBlMGM3MjUzZTljNjI4Ni4uNDZkZTI1ZDEwNDU1NjBhMTM3YTJlZDg4NWZiNjlk OTU1NTczYjAxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDIyLTAzLTE3ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGhhc0V4cGxpY2l0 bHlTZXRCb3JkZXJSYWRpdXMgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM4MDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIGZvdXIgYm9yZGVyLSotcmFkaXVzIGxvbmdoYW5kcyB3ZXJlIHNo YXJpbmcgdGhlIHNhbWUgZmxhZywgc28gdGhlCisgICAgICAgIGJlaGF2aW9yIHdhcyBicm9rZW4g d2hlbiBzZXR0aW5nIGxvbmdoYW5kcyBpbmRpdmlkdWFsbHkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBzcGxpdHMgdGhlIGZsYWcgaW50byA0IGRpZmZlcmVudCBvbmVzLCBvbmUgZm9yIGVhY2ggbG9u Z2hhbmQuCisgICAgICAgIEFsc28gbWFrZXMgc3VyZSB0byBzZXQgaXQgcHJvcGVybHkgd2hlbiBh IGxvbmdoYW5kIGlzIHNldCB0byAnaW5pdGlhbCcuCisKKyAgICAgICAgSXQncyB1Z2x5IHRvIGhh dmUgYWxsIHRoaXMgYm9pbGVycGxhdGUgY29kZSBmb3IgdGhlIGZsYWdzLCBidXQKKyAgICAgICAg aHR0cHM6Ly93ZWJraXQub3JnL2IvMjEyNTA2IHdpbGwgbWFrZSBpdCBhdXRvbWF0aWNhbGx5IGdl bmVyYXRlZC4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1i dXR0b24tYm9yZGVyLXJhZGl1cy1sb25naGFuZHMuaHRtbAorCisgICAgICAgICogY3NzL0NTU1By b3BlcnRpZXMuanNvbjoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OlJlbmRlclN0eWxlKToKKyAgICAgICAg KiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clN0eWxlOjpoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6aGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRv bVJpZ2h0UmFkaXVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpoYXNF eHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJTdHlsZTo6aGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpoYXNFeHBsaWNpdGx5U2V0Qm9yZGVy UmFkaXVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRIYXNFeHBs aWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6c2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRIYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9w TGVmdFJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6c2V0SGFzRXhwbGlj aXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpOb25Jbmhlcml0ZWRGbGFnczo6b3BlcmF0b3I9PSBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVkRmxhZ3M6OmNvcHlOb25Jbmhlcml0ZWRGcm9t KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRIYXNFeHBsaWNpdGx5U2V0Qm9y ZGVyUmFkaXVzKTogRGVsZXRlZC4KKyAgICAgICAgKiBzdHlsZS9TdHlsZUJ1aWxkZXJDdXN0b20u aDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxC b3JkZXJCb3R0b21MZWZ0UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVy Q3VzdG9tOjphcHBseUluaGVyaXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQm9yZGVyQm90dG9tTGVmdFJh ZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QnVpbGRlckN1c3RvbTo6YXBwbHlJbml0 aWFsQm9yZGVyQm90dG9tUmlnaHRSYWRpdXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkJ1 aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKToKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQm9yZGVyQm90dG9t UmlnaHRSYWRpdXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJDdXN0b206OmFw cGx5SW5pdGlhbEJvcmRlclRvcExlZnRSYWRpdXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OkJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRlclRvcExlZnRSYWRpdXMpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVCb3JkZXJUb3BMZWZ0 UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseUlu aXRpYWxCb3JkZXJUb3BSaWdodFJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QnVp bGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Qm9yZGVyVG9wUmlnaHRSYWRpdXMpOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVCb3JkZXJUb3BSaWdodFJh ZGl1cyk6CisKIDIwMjItMDMtMTUgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjkxMjgyLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbiBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcm9wZXJ0aWVzLmpzb24KaW5kZXggZWQ0MDI4Mzk2NTA1NWRkZTQ4YjE2OWM0MWM1 ZTg5ODQzYWQ0Y2YwZS4uNzk2OWUyYmUxMThkOWU1NDY4ZjYzNjM5OWExMjk1ZjAxNjNjNjdiZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCkBAIC0xNTU2LDggKzE1NTYsNyBA QAogICAgICAgICAgICAgICAgICJhbGlhc2VzIjogWwogICAgICAgICAgICAgICAgICAgICAiLXdl YmtpdC1ib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzIgogICAgICAgICAgICAgICAgIF0sCi0gICAg ICAgICAgICAgICAgImluaXRpYWwiOiAiaW5pdGlhbEJvcmRlclJhZGl1cyIsCi0gICAgICAgICAg ICAgICAgImN1c3RvbSI6ICJJbmhlcml0fFZhbHVlIiwKKyAgICAgICAgICAgICAgICAiY3VzdG9t IjogIkFsbCIsCiAgICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7CiAg ICAgICAgICAgICAgICAgICAgICJuYW1lIjogImJvcmRlci1yYWRpdXMiLAogICAgICAgICAgICAg ICAgICAgICAicmVzb2x2ZXIiOiAiYm90dG9tLWxlZnQiCkBAIC0xNTczLDggKzE1NzIsNyBAQAog ICAgICAgICAgICAgICAgICJhbGlhc2VzIjogWwogICAgICAgICAgICAgICAgICAgICAiLXdlYmtp dC1ib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1cyIKICAgICAgICAgICAgICAgICBdLAotICAgICAg ICAgICAgICAgICJpbml0aWFsIjogImluaXRpYWxCb3JkZXJSYWRpdXMiLAotICAgICAgICAgICAg ICAgICJjdXN0b20iOiAiSW5oZXJpdHxWYWx1ZSIsCisgICAgICAgICAgICAgICAgImN1c3RvbSI6 ICJBbGwiLAogICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewogICAg ICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXItcmFkaXVzIiwKICAgICAgICAgICAgICAg ICAgICAgInJlc29sdmVyIjogImJvdHRvbS1yaWdodCIKQEAgLTIxOTUsOCArMjE5Myw3IEBACiAg ICAgICAgICAgICAgICAgImFsaWFzZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgICItd2Via2l0 LWJvcmRlci10b3AtbGVmdC1yYWRpdXMiCiAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAg ICAgICAiaW5pdGlhbCI6ICJpbml0aWFsQm9yZGVyUmFkaXVzIiwKLSAgICAgICAgICAgICAgICAi Y3VzdG9tIjogIkluaGVyaXR8VmFsdWUiLAorICAgICAgICAgICAgICAgICJjdXN0b20iOiAiQWxs IiwKICAgICAgICAgICAgICAgICAibG9naWNhbC1wcm9wZXJ0eS1ncm91cCI6IHsKICAgICAgICAg ICAgICAgICAgICAgIm5hbWUiOiAiYm9yZGVyLXJhZGl1cyIsCiAgICAgICAgICAgICAgICAgICAg ICJyZXNvbHZlciI6ICJ0b3AtbGVmdCIKQEAgLTIyMTIsOCArMjIwOSw3IEBACiAgICAgICAgICAg ICAgICAgImFsaWFzZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgICItd2Via2l0LWJvcmRlci10 b3AtcmlnaHQtcmFkaXVzIgogICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImlu aXRpYWwiOiAiaW5pdGlhbEJvcmRlclJhZGl1cyIsCi0gICAgICAgICAgICAgICAgImN1c3RvbSI6 ICJJbmhlcml0fFZhbHVlIiwKKyAgICAgICAgICAgICAgICAiY3VzdG9tIjogIkFsbCIsCiAgICAg ICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7CiAgICAgICAgICAgICAgICAg ICAgICJuYW1lIjogImJvcmRlci1yYWRpdXMiLAogICAgICAgICAgICAgICAgICAgICAicmVzb2x2 ZXIiOiAidG9wLXJpZ2h0IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5jcHAKaW5kZXggY2M4MGU1NzYzMDdlMjZkOTNlZjJkYTg4MWQ1MWYwOTMyNTBiZjgz Ny4uMWZmZTczMDY4ZDVmNTYwMjA5YzNkMmRlOGQ4YjJjYjA4OTJmNDMyNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC0xOTcsNyArMTk3 LDEwIEBAIFJlbmRlclN0eWxlOjpSZW5kZXJTdHlsZShDcmVhdGVEZWZhdWx0U3R5bGVUYWcpCiAg ICAgbV9ub25Jbmhlcml0ZWRGbGFncy51bmljb2RlQmlkaSA9IHN0YXRpY19jYXN0PHVuc2lnbmVk Pihpbml0aWFsVW5pY29kZUJpZGkoKSk7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5mbG9hdGlu ZyA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihpbml0aWFsRmxvYXRpbmcoKSk7CiAgICAgbV9ub25J bmhlcml0ZWRGbGFncy50YWJsZUxheW91dCA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihpbml0aWFs VGFibGVMYXlvdXQoKSk7Ci0gICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyUmFkaXVzID0gZmFsc2U7CisgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNp dGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyA9IGZhbHNlOworICAgIG1fbm9uSW5oZXJpdGVk RmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzID0gZmFsc2U7Cisg ICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1 cyA9IGZhbHNlOworICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRl clRvcFJpZ2h0UmFkaXVzID0gZmFsc2U7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBs aWNpdGx5U2V0RGlyZWN0aW9uID0gZmFsc2U7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNF eHBsaWNpdGx5U2V0V3JpdGluZ01vZGUgPSBmYWxzZTsKICAgICBtX25vbkluaGVyaXRlZEZsYWdz Lmhhc0V4cGxpY2l0bHlTZXRUZXh0QWxpZ24gPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggZWM5NWI1YTczMzRkNDdhOTg1M2FkZDE3 YTYyOTE4OTlkYjdhNGYyZi4uZDRkNDYxY2EyOGIwZmRlYWUwYmU1MDBlNzQzNjBiMTE2NWU3Njll MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAg LTMwNSw3ICszMDUsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IExlbmd0aFNpemUmIGJvcmRlckJv dHRvbUxlZnRSYWRpdXMoKSBjb25zdCB7IHJldHVybiBtX3N1cnJvdW5kRGF0YS0+Ym9yZGVyLmJv dHRvbUxlZnRSYWRpdXMoKTsgfQogICAgIGNvbnN0IExlbmd0aFNpemUmIGJvcmRlckJvdHRvbVJp Z2h0UmFkaXVzKCkgY29uc3QgeyByZXR1cm4gbV9zdXJyb3VuZERhdGEtPmJvcmRlci5ib3R0b21S aWdodFJhZGl1cygpOyB9CiAgICAgYm9vbCBoYXNCb3JkZXJSYWRpdXMoKSBjb25zdCB7IHJldHVy biBtX3N1cnJvdW5kRGF0YS0+Ym9yZGVyLmhhc0JvcmRlclJhZGl1cygpOyB9Ci0gICAgYm9vbCBo YXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzKCkgY29uc3QgeyByZXR1cm4gbV9ub25Jbmhlcml0 ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzOyB9CisgICAgYm9vbCBoYXNFeHBs aWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5o ZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbUxlZnRSYWRpdXM7IH0KKyAg ICBib29sIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cygpIGNvbnN0IHsg cmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJp Z2h0UmFkaXVzOyB9CisgICAgYm9vbCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1 cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJv cmRlclRvcExlZnRSYWRpdXM7IH0KKyAgICBib29sIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BS aWdodFJhZGl1cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGlj aXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzOyB9CisgICAgYm9vbCBoYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyUmFkaXVzKCkgY29uc3QgeyByZXR1cm4gaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRv bUxlZnRSYWRpdXMoKSB8fCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMo KSB8fCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cygpIHx8IGhhc0V4cGxpY2l0 bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1cygpOyB9CiAKICAgICBmbG9hdCBib3JkZXJMZWZ0V2lk dGgoKSBjb25zdCB7IHJldHVybiBtX3N1cnJvdW5kRGF0YS0+Ym9yZGVyLmJvcmRlckxlZnRXaWR0 aCgpOyB9CiAgICAgQm9yZGVyU3R5bGUgYm9yZGVyTGVmdFN0eWxlKCkgY29uc3QgeyByZXR1cm4g bV9zdXJyb3VuZERhdGEtPmJvcmRlci5sZWZ0KCkuc3R5bGUoKTsgfQpAQCAtOTM0LDcgKzkzOCwx MCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldEJvcmRlclJhZGl1cyhMZW5ndGhTaXplJiYpOwog ICAgIHZvaWQgc2V0Qm9yZGVyUmFkaXVzKGNvbnN0IEludFNpemUmKTsKLSAgICB2b2lkIHNldEhh c0V4cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXMoYm9vbCB2KSB7IG1fbm9uSW5oZXJpdGVkRmxhZ3Mu aGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1cyA9IHY7IH0KKyAgICB2b2lkIHNldEhhc0V4cGxp Y2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKGJvb2wgdikgeyBtX25vbkluaGVyaXRlZEZs YWdzLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzID0gdjsgfQorICAgIHZv aWQgc2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKGJvb2wgdikgeyBt X25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1 cyA9IHY7IH0KKyAgICB2b2lkIHNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BMZWZ0UmFkaXVz KGJvb2wgdikgeyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BM ZWZ0UmFkaXVzID0gdjsgfQorICAgIHZvaWQgc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJp Z2h0UmFkaXVzKGJvb2wgdikgeyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRC b3JkZXJUb3BSaWdodFJhZGl1cyA9IHY7IH0KIAogICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRC b3JkZXJGb3IoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgYm9vbCBpbmNsdWRlTG9naWNh bExlZnRFZGdlID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpIGNv bnN0OwogICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRlckZvcihjb25zdCBMYXlv dXRSZWN0JiBib3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBi b29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CkBAIC0xOTQ3LDcgKzE5 NTQsMTAgQEAgcHJpdmF0ZToKICAgICAgICAgdW5zaWduZWQgZmxvYXRpbmcgOiAzOyAvLyBGbG9h dAogICAgICAgICB1bnNpZ25lZCB0YWJsZUxheW91dCA6IDE7IC8vIFRhYmxlTGF5b3V0VHlwZQog Ci0gICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXMgOiAxOworICAg ICAgICB1bnNpZ25lZCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyA6IDE7 CisgICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1 cyA6IDE7CisgICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BMZWZ0UmFk aXVzIDogMTsKKyAgICAgICAgdW5zaWduZWQgaGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0 UmFkaXVzIDogMTsKICAgICAgICAgdW5zaWduZWQgaGFzRXhwbGljaXRseVNldERpcmVjdGlvbiA6 IDE7CiAgICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRXcml0aW5nTW9kZSA6IDE7CiAg ICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRUZXh0QWxpZ24gOiAxOwpAQCAtMjA4NCw3 ICsyMDk0LDEwIEBAIGlubGluZSBib29sIFJlbmRlclN0eWxlOjpOb25Jbmhlcml0ZWRGbGFnczo6 b3BlcmF0b3I9PShjb25zdCBOb25Jbmhlcml0ZWRGbGFncyYKICAgICAgICAgJiYgdW5pY29kZUJp ZGkgPT0gb3RoZXIudW5pY29kZUJpZGkKICAgICAgICAgJiYgZmxvYXRpbmcgPT0gb3RoZXIuZmxv YXRpbmcKICAgICAgICAgJiYgdGFibGVMYXlvdXQgPT0gb3RoZXIudGFibGVMYXlvdXQKLSAgICAg ICAgJiYgaGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1cyA9PSBvdGhlci5oYXNFeHBsaWNpdGx5 U2V0Qm9yZGVyUmFkaXVzCisgICAgICAgICYmIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21M ZWZ0UmFkaXVzID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVz CisgICAgICAgICYmIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyA9PSBv dGhlci5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMKKyAgICAgICAgJiYg aGFzRXhwbGljaXRseVNldEJvcmRlclRvcExlZnRSYWRpdXMgPT0gb3RoZXIuaGFzRXhwbGljaXRs eVNldEJvcmRlclRvcExlZnRSYWRpdXMKKyAgICAgICAgJiYgaGFzRXhwbGljaXRseVNldEJvcmRl clRvcFJpZ2h0UmFkaXVzID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJh ZGl1cwogICAgICAgICAmJiBoYXNFeHBsaWNpdGx5U2V0RGlyZWN0aW9uID09IG90aGVyLmhhc0V4 cGxpY2l0bHlTZXREaXJlY3Rpb24KICAgICAgICAgJiYgaGFzRXhwbGljaXRseVNldFdyaXRpbmdN b2RlID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRXcml0aW5nTW9kZQogICAgICAgICAmJiBoYXNF eHBsaWNpdGx5U2V0VGV4dEFsaWduID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRUZXh0QWxpZ24K QEAgLTIxMjEsNyArMjEzNCwxMCBAQCBpbmxpbmUgdm9pZCBSZW5kZXJTdHlsZTo6Tm9uSW5oZXJp dGVkRmxhZ3M6OmNvcHlOb25Jbmhlcml0ZWRGcm9tKGNvbnN0IE5vbkluaGVyaQogCiAgICAgLy8g VW5saWtlIHByb3BlcnRpZXMgdHJhY2tlZCBieSB0aGUgb3RoZXIgaGFzRXhwbGljaXRseVNldCog ZmxhZ3MsIGJvcmRlci1yYWRpdXMgaXMgbm9uLWluaGVyaXRlZAogICAgIC8vIGFuZCB3ZSBuZWVk IHRvIHJlbWVtYmVyIHdoZXRoZXIgaXQncyBiZWVuIGV4cGxpY2l0bHkgc2V0IHdoZW4gY29weWlu ZyBtX3N1cnJvdW5kRGF0YS4KLSAgICBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzID0gb3Ro ZXIuaGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1czsKKyAgICBoYXNFeHBsaWNpdGx5U2V0Qm9y ZGVyQm90dG9tTGVmdFJhZGl1cyA9IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21M ZWZ0UmFkaXVzOworICAgIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyA9 IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1czsKKyAgICBoYXNF eHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cyA9IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRC b3JkZXJUb3BMZWZ0UmFkaXVzOworICAgIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJh ZGl1cyA9IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1czsKIH0KIAog aW5saW5lIGJvb2wgUmVuZGVyU3R5bGU6Ok5vbkluaGVyaXRlZEZsYWdzOjpoYXNQc2V1ZG9TdHls ZShQc2V1ZG9JZCBwc2V1ZG8pIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRl ckN1c3RvbS5oCmluZGV4IGU4ODRlNWJjZmFjNWRkNDg1MDlkZWQyMzllZTJlZjY2YWYzZTE0ZWQu Ljk4ODM2YmVhZjVkMjg3M2UyODM0M2FjZGVhMTY4YTBlNjEzMmEwNDQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0xMjcsMTIgKzEyNywxNiBAQCBwdWJs aWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0RGlzcGxheShCdWlsZGVyU3RhdGUmKTsK ICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlRGlzcGxheShCdWlsZGVyU3RhdGUmLCBDU1NWYWx1 ZSYpOwogICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjEyNTA2PiBUZWFjaCBt YWtlcHJvcC5wbCB0byBnZW5lcmF0ZSBzZXR0ZXJzIGZvciBoYXNFeHBsaWNpdGx5U2V0KiBmbGFn cworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbEJvcmRlckJvdHRvbUxlZnRSYWRpdXMoQnVp bGRlclN0YXRlJik7CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Qm9yZGVyQm90dG9tTGVm dFJhZGl1cyhCdWlsZGVyU3RhdGUmKTsKICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlQm9yZGVy Qm90dG9tTGVmdFJhZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOworICAgIHN0YXRpYyB2 b2lkIGFwcGx5SW5pdGlhbEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYpOwog ICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1aWxk ZXJTdGF0ZSYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVCb3JkZXJCb3R0b21SaWdodFJh ZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5p dGlhbEJvcmRlclRvcExlZnRSYWRpdXMoQnVpbGRlclN0YXRlJik7CiAgICAgc3RhdGljIHZvaWQg YXBwbHlJbmhlcml0Qm9yZGVyVG9wTGVmdFJhZGl1cyhCdWlsZGVyU3RhdGUmKTsKICAgICBzdGF0 aWMgdm9pZCBhcHBseVZhbHVlQm9yZGVyVG9wTGVmdFJhZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NW YWx1ZSYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbEJvcmRlclRvcFJpZ2h0UmFkaXVz KEJ1aWxkZXJTdGF0ZSYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdEJvcmRlclRvcFJp Z2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVCb3Jk ZXJUb3BSaWdodFJhZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOwogCkBAIC0xMDg0LDUy ICsxMDg4LDc2IEBAIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVGb250RmFt aWx5KEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlLCBDU1NWCiAgICAgYnVpbGRlclN0YXRlLnNl dEZvbnREZXNjcmlwdGlvbihXVEZNb3ZlKGZvbnREZXNjcmlwdGlvbikpOwogfQogCitpbmxpbmUg dm9pZCBCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKEJ1 aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNl dEJvcmRlckJvdHRvbUxlZnRSYWRpdXMoUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJSYWRpdXMo KSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJv dHRvbUxlZnRSYWRpdXMoZmFsc2UpOworfQorCiBpbmxpbmUgdm9pZCBCdWlsZGVyQ3VzdG9tOjph cHBseUluaGVyaXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0 YXRlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlckJvdHRvbUxlZnRSYWRp dXMoZm9yd2FyZEluaGVyaXRlZFZhbHVlKGJ1aWxkZXJTdGF0ZS5wYXJlbnRTdHlsZSgpLmJvcmRl ckJvdHRvbUxlZnRSYWRpdXMoKSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4 cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXMoYnVpbGRlclN0YXRlLnBhcmVudFN0eWxlKCkuaGFzRXhw bGljaXRseVNldEJvcmRlclJhZGl1cygpKTsKKyAgICBidWlsZGVyU3RhdGUuc3R5bGUoKS5zZXRI YXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50 U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cygpKTsKIH0KIAog aW5saW5lIHZvaWQgQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUJvcmRlckJvdHRvbUxlZnRSYWRp dXMoQnVpbGRlclN0YXRlJiBidWlsZGVyU3RhdGUsIENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBi dWlsZGVyU3RhdGUuc3R5bGUoKS5zZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKEJ1aWxkZXJDb252 ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMoYnVpbGRlclN0YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJT dGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAg YnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbUxlZnRS YWRpdXModHJ1ZSk7Cit9CisKK2lubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5pdGlh bEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQorewor ICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKFJlbmRl clN0eWxlOjppbml0aWFsQm9yZGVyUmFkaXVzKCkpOworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgp LnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyhmYWxzZSk7CiB9CiAK IGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRlckJvdHRvbVJpZ2h0 UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5z dHlsZSgpLnNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKGZvcndhcmRJbmhlcml0ZWRWYWx1ZShi dWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5ib3JkZXJCb3R0b21SaWdodFJhZGl1cygpKSk7Ci0g ICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1cyhi dWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzKCkp OworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0 b21SaWdodFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMoKSk7CiB9CiAKIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0 b206OmFwcGx5VmFsdWVCb3JkZXJCb3R0b21SaWdodFJhZGl1cyhCdWlsZGVyU3RhdGUmIGJ1aWxk ZXJTdGF0ZSwgQ1NTVmFsdWUmIHZhbHVlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNl dEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMo YnVpbGRlclN0YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4 cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCku c2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKHRydWUpOworfQorCitp bmxpbmUgdm9pZCBCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxCb3JkZXJUb3BMZWZ0UmFkaXVz KEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgp LnNldEJvcmRlclRvcExlZnRSYWRpdXMoUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJSYWRpdXMo KSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclRv cExlZnRSYWRpdXMoZmFsc2UpOwogfQogCiBpbmxpbmUgdm9pZCBCdWlsZGVyQ3VzdG9tOjphcHBs eUluaGVyaXRCb3JkZXJUb3BMZWZ0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQog ewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlclRvcExlZnRSYWRpdXMoZm9yd2Fy ZEluaGVyaXRlZFZhbHVlKGJ1aWxkZXJTdGF0ZS5wYXJlbnRTdHlsZSgpLmJvcmRlclRvcExlZnRS YWRpdXMoKSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRC b3JkZXJSYWRpdXMoYnVpbGRlclN0YXRlLnBhcmVudFN0eWxlKCkuaGFzRXhwbGljaXRseVNldEJv cmRlclJhZGl1cygpKTsKKyAgICBidWlsZGVyU3RhdGUuc3R5bGUoKS5zZXRIYXNFeHBsaWNpdGx5 U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBs aWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cygpKTsKIH0KIAogaW5saW5lIHZvaWQgQnVpbGRl ckN1c3RvbTo6YXBwbHlWYWx1ZUJvcmRlclRvcExlZnRSYWRpdXMoQnVpbGRlclN0YXRlJiBidWls ZGVyU3RhdGUsIENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBidWlsZGVyU3RhdGUuc3R5bGUoKS5z ZXRCb3JkZXJUb3BMZWZ0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMoYnVp bGRlclN0YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxp Y2l0bHlTZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0 SGFzRXhwbGljaXRseVNldEJvcmRlclRvcExlZnRSYWRpdXModHJ1ZSk7Cit9CisKK2lubGluZSB2 b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5pdGlhbEJvcmRlclRvcFJpZ2h0UmFkaXVzKEJ1aWxk ZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJv cmRlclRvcFJpZ2h0UmFkaXVzKFJlbmRlclN0eWxlOjppbml0aWFsQm9yZGVyUmFkaXVzKCkpOwor ICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdo dFJhZGl1cyhmYWxzZSk7CiB9CiAKIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5o ZXJpdEJvcmRlclRvcFJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQogewog ICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKGZvcndhcmRJ bmhlcml0ZWRWYWx1ZShidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5ib3JkZXJUb3BSaWdodFJh ZGl1cygpKSk7Ci0gICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJv cmRlclJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0Qm9y ZGVyUmFkaXVzKCkpOworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlT ZXRCb3JkZXJUb3BSaWdodFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBs aWNpdGx5U2V0Qm9yZGVyVG9wUmlnaHRSYWRpdXMoKSk7CiB9CiAKIGlubGluZSB2b2lkIEJ1aWxk ZXJDdXN0b206OmFwcGx5VmFsdWVCb3JkZXJUb3BSaWdodFJhZGl1cyhCdWlsZGVyU3RhdGUmIGJ1 aWxkZXJTdGF0ZSwgQ1NTVmFsdWUmIHZhbHVlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgp LnNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMo YnVpbGRlclN0YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4 cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCku c2V0SGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKHRydWUpOwogfQogCiBpbmxp bmUgYm9vbCBCdWlsZGVyQ3VzdG9tOjppc1ZhbGlkRGlzcGxheVZhbHVlKEJ1aWxkZXJTdGF0ZSYg YnVpbGRlclN0YXRlLCBEaXNwbGF5VHlwZSBkaXNwbGF5KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDAzYzExMDc0ZDMwZGZl OGM3MTE0YmYyOTA2MTE0OWQxNDFkMjkxY2UuLjFhN2RmNjQ3MWUzYTA1YmMxNWQ5ZWJkNTAyZTk5 MmM4MzE1NmNiODcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMi0wMy0xNyAgT3Jpb2wgQnJ1 ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBoYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyUmFkaXVzIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzODA2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCB0ZXN0LgorCisgICAgICAgICogZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBs ZS1wYXktYnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvY3NzL2FwcGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi1ib3JkZXIt cmFkaXVzLWxvbmdoYW5kcy5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xNSAgSmVhbi1ZdmVzIEF2 ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI4NzI0OSk6IFsg TW9udGVyZXkgd2syIF0gbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXdlYm0tdm9yYmlzLXBhcnRp YWwuaHRtbCBpcyBhIGNvbnN0YW50IHRleHQgZmFpbHVyZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXktYnV0dG9uLWJvcmRlci1yYWRpdXMtbG9u Z2hhbmRzLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9hcHBlYXJhbmNlLWFw cGxlLXBheS1idXR0b24tYm9yZGVyLXJhZGl1cy1sb25naGFuZHMtZXhwZWN0ZWQuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4xY2RkMzkyZDc1NDRkZDI5NTMwNzg1YzMwNjRmYjc1ODJjMzExMmQwCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXktYnV0 dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw1NSBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAg LmNvbnRhaW5lciB7CisgICAgICAgICAgICBwYWRkaW5nOiAyNXB4OworICAgICAgICAgICAgd2lk dGg6IDUwMHB4OworICAgICAgICB9CisKKyAgICAgICAgLmFwcGxlLXBheS1idXR0b24geworICAg ICAgICAgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiAtYXBwbGUtcGF5LWJ1dHRvbjsKKyAgICAgICAg fQorCisgICAgICAgIC5zcXVhcmUtY29ybmVycyB7CisgICAgICAgICAgICBib3JkZXItcmFkaXVz OiAwcHg7CisgICAgICAgIH0KKworICAgICAgICAudmVyeS1yb3VuZC1jb3JuZXJzIHsKKyAgICAg ICAgICAgIGJvcmRlci1yYWRpdXM6IDE1cHg7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9o ZWFkPgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRv biBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBzcXVhcmUtY29ybmVycyc+PC9idXR0b24+CisgICAg ICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24gc3F1YXJlLWNvcm5lcnMnPjwvYnV0 dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHNxdWFyZS1jb3Ju ZXJzJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBz cXVhcmUtY29ybmVycyc+PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29u dGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBzcXVhcmUt Y29ybmVycyc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0 b24gc3F1YXJlLWNvcm5lcnMnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBs ZS1wYXktYnV0dG9uIHNxdWFyZS1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBj bGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBzcXVhcmUtY29ybmVycyc+PC9idXR0b24+CisgICAgPC9k aXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0n YXBwbGUtcGF5LWJ1dHRvbic+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxl LXBheS1idXR0b24nPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXkt YnV0dG9uJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRv bic+PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAg ICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMn PjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHZlcnkt cm91bmQtY29ybmVycyc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBh eS1idXR0b24gdmVyeS1yb3VuZC1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBj bGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnPjwvYnV0dG9uPgorICAg IDwvZGl2PgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+CisgICAgICAgIDxidXR0b24gY2xh c3M9J2FwcGxlLXBheS1idXR0b24gdmVyeS1yb3VuZC1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICAg ICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnPjwv YnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHZlcnktcm91 bmQtY29ybmVycyc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1i dXR0b24gdmVyeS1yb3VuZC1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICA8L2Rpdj4KKzwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2FwcGVhcmFuY2UtYXBw bGUtcGF5LWJ1dHRvbi1ib3JkZXItcmFkaXVzLWxvbmdoYW5kcy5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXktYnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hh bmRzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uOTZlMTQ4ODRlMGYzNmVlNTUzNjIxNWUxN2ZiMTdhZWJhZDVl ZjlmMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2FwcGVhcmFuY2Ut YXBwbGUtcGF5LWJ1dHRvbi1ib3JkZXItcmFkaXVzLWxvbmdoYW5kcy5odG1sCkBAIC0wLDAgKzEs NTUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAg ICAgIC5jb250YWluZXIgeworICAgICAgICAgICAgcGFkZGluZzogMjVweDsKKyAgICAgICAgICAg IHdpZHRoOiA1MDBweDsKKyAgICAgICAgfQorCisgICAgICAgIC5hcHBsZS1wYXktYnV0dG9uIHsK KyAgICAgICAgICAgIC13ZWJraXQtYXBwZWFyYW5jZTogLWFwcGxlLXBheS1idXR0b247CisgICAg ICAgIH0KKworICAgICAgICAuc3F1YXJlLWNvcm5lcnMgeworICAgICAgICAgICAgYm9yZGVyLXJh ZGl1czogMHB4OworICAgICAgICB9CisKKyAgICAgICAgLnZlcnktcm91bmQtY29ybmVycyB7Cisg ICAgICAgICAgICBib3JkZXItcmFkaXVzOiAxNXB4OworICAgICAgICB9CisgICAgPC9zdHlsZT4K KzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+CisgICAgICAgIDxi dXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24nIHN0eWxlPSdib3JkZXItYm90dG9tLWxlZnQt cmFkaXVzOiAwcHgnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXkt YnV0dG9uJyBzdHlsZT0nYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXM6IDBweCc+PC9idXR0b24+ CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24nIHN0eWxlPSdib3JkZXIt dG9wLWxlZnQtcmFkaXVzOiAwcHgnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdh cHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IDBweCc+PC9i dXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAg PGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBzcXVhcmUtY29ybmVycycgc3R5bGU9J2Jv cmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0 dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHNxdWFyZS1jb3JuZXJzJyBzdHlsZT0nYm9yZGVy LWJvdHRvbS1yaWdodC1yYWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9u IGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHNxdWFyZS1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLXRv cC1sZWZ0LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9 J2FwcGxlLXBheS1idXR0b24gc3F1YXJlLWNvcm5lcnMnIHN0eWxlPSdib3JkZXItdG9wLXJpZ2h0 LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0n Y29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbicgc3R5 bGU9J2JvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAg ICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLWJvdHRvbS1y aWdodC1yYWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdh cHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogaW5oZXJpdCc+ PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24nIHN0eWxl PSdib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgPC9kaXY+ CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBw bGUtcGF5LWJ1dHRvbicgc3R5bGU9J2JvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IDE1cHgnPjwv YnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBzdHlsZT0n Ym9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXM6IDE1cHgnPjwvYnV0dG9uPgorICAgICAgICA8YnV0 dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLXRvcC1sZWZ0LXJhZGl1 czogMTVweCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0 b24nIHN0eWxlPSdib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogMTVweCc+PC9idXR0b24+CisgICAg PC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFz cz0nYXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnIHN0eWxlPSdib3JkZXItYm90 dG9tLWxlZnQtcmFkaXVzOiBpbmhlcml0Jz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFz cz0nYXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnIHN0eWxlPSdib3JkZXItYm90 dG9tLXJpZ2h0LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xh c3M9J2FwcGxlLXBheS1idXR0b24gdmVyeS1yb3VuZC1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLXRv cC1sZWZ0LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9 J2FwcGxlLXBheS1idXR0b24gdmVyeS1yb3VuZC1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLXRvcC1y aWdodC1yYWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgo= 455059 2022-03-17 19:30:17 -0700 2022-03-19 19:19:16 -0700 Patch bug-238062-20220318033016.patch text/plain 25919 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwOWQ4ZDgzZTEyOTZj YWVkNTdhNWJhZWNjZjFmOTdhMzA4MDRjMy4uNmE1NzBmZDgxM2FjMWEzMmUzMzlkYjc2ZDFjMDU4 MTg4NjVlMzdhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDIyLTAzLTE3ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGhhc0V4cGxpY2l0 bHlTZXRCb3JkZXJSYWRpdXMgZmxhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM4MDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIGZvdXIgYm9yZGVyLSotcmFkaXVzIGxvbmdoYW5kcyB3ZXJlIHNo YXJpbmcgdGhlIHNhbWUgZmxhZywgc28gdGhlCisgICAgICAgIGJlaGF2aW9yIHdhcyBicm9rZW4g d2hlbiBzZXR0aW5nIGxvbmdoYW5kcyBpbmRpdmlkdWFsbHkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBzcGxpdHMgdGhlIGZsYWcgaW50byA0IGRpZmZlcmVudCBvbmVzLCBvbmUgZm9yIGVhY2ggbG9u Z2hhbmQuCisgICAgICAgIEFsc28gbWFrZXMgc3VyZSB0byBzZXQgaXQgcHJvcGVybHkgd2hlbiBh IGxvbmdoYW5kIGlzIHNldCB0byAnaW5pdGlhbCcuCisKKyAgICAgICAgSXQncyB1Z2x5IHRvIGhh dmUgYWxsIHRoaXMgYm9pbGVycGxhdGUgY29kZSBmb3IgdGhlIGZsYWdzLCBidXQKKyAgICAgICAg aHR0cHM6Ly93ZWJraXQub3JnL2IvMjEyNTA2IHdpbGwgbWFrZSBpdCBhdXRvbWF0aWNhbGx5IGdl bmVyYXRlZC4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1i dXR0b24tYm9yZGVyLXJhZGl1cy1sb25naGFuZHMuaHRtbAorCisgICAgICAgICogY3NzL0NTU1By b3BlcnRpZXMuanNvbjoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OlJlbmRlclN0eWxlKToKKyAgICAgICAg KiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clN0eWxlOjpoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6aGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRv bVJpZ2h0UmFkaXVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpoYXNF eHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJTdHlsZTo6aGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpoYXNFeHBsaWNpdGx5U2V0Qm9yZGVy UmFkaXVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRIYXNFeHBs aWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6c2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRIYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9w TGVmdFJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6c2V0SGFzRXhwbGlj aXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpOb25Jbmhlcml0ZWRGbGFnczo6b3BlcmF0b3I9PSBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVkRmxhZ3M6OmNvcHlOb25Jbmhlcml0ZWRGcm9t KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRIYXNFeHBsaWNpdGx5U2V0Qm9y ZGVyUmFkaXVzKTogRGVsZXRlZC4KKyAgICAgICAgKiBzdHlsZS9TdHlsZUJ1aWxkZXJDdXN0b20u aDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxC b3JkZXJCb3R0b21MZWZ0UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVy Q3VzdG9tOjphcHBseUluaGVyaXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQm9yZGVyQm90dG9tTGVmdFJh ZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QnVpbGRlckN1c3RvbTo6YXBwbHlJbml0 aWFsQm9yZGVyQm90dG9tUmlnaHRSYWRpdXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkJ1 aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKToKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQm9yZGVyQm90dG9t UmlnaHRSYWRpdXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJDdXN0b206OmFw cGx5SW5pdGlhbEJvcmRlclRvcExlZnRSYWRpdXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OkJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRlclRvcExlZnRSYWRpdXMpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVCb3JkZXJUb3BMZWZ0 UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyQ3VzdG9tOjphcHBseUlu aXRpYWxCb3JkZXJUb3BSaWdodFJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QnVp bGRlckN1c3RvbTo6YXBwbHlJbmhlcml0Qm9yZGVyVG9wUmlnaHRSYWRpdXMpOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVCb3JkZXJUb3BSaWdodFJh ZGl1cyk6CisKIDIwMjItMDMtMTYgIE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4K IAogICAgICAgICBDbGFyaWZ5IGNvZGUgZm9yIGxvZ2ljYWwtdG8tcGh5c2ljYWwgbWFwcGluZ3Ms IGFuZCBhZGQgcGh5c2ljYWwtdG8tbG9naWNhbCBtYXBwaW5ncwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0aWVzLmpzb24KaW5kZXggZWQ0MDI4Mzk2NTA1NWRkZTQ4YjE2OWM0MWM1ZTg5ODQzYWQ0 Y2YwZS4uNzk2OWUyYmUxMThkOWU1NDY4ZjYzNjM5OWExMjk1ZjAxNjNjNjdiZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCkBAIC0xNTU2LDggKzE1NTYsNyBAQAogICAgICAg ICAgICAgICAgICJhbGlhc2VzIjogWwogICAgICAgICAgICAgICAgICAgICAiLXdlYmtpdC1ib3Jk ZXItYm90dG9tLWxlZnQtcmFkaXVzIgogICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAg ICAgImluaXRpYWwiOiAiaW5pdGlhbEJvcmRlclJhZGl1cyIsCi0gICAgICAgICAgICAgICAgImN1 c3RvbSI6ICJJbmhlcml0fFZhbHVlIiwKKyAgICAgICAgICAgICAgICAiY3VzdG9tIjogIkFsbCIs CiAgICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7CiAgICAgICAgICAg ICAgICAgICAgICJuYW1lIjogImJvcmRlci1yYWRpdXMiLAogICAgICAgICAgICAgICAgICAgICAi cmVzb2x2ZXIiOiAiYm90dG9tLWxlZnQiCkBAIC0xNTczLDggKzE1NzIsNyBAQAogICAgICAgICAg ICAgICAgICJhbGlhc2VzIjogWwogICAgICAgICAgICAgICAgICAgICAiLXdlYmtpdC1ib3JkZXIt Ym90dG9tLXJpZ2h0LXJhZGl1cyIKICAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAg ICJpbml0aWFsIjogImluaXRpYWxCb3JkZXJSYWRpdXMiLAotICAgICAgICAgICAgICAgICJjdXN0 b20iOiAiSW5oZXJpdHxWYWx1ZSIsCisgICAgICAgICAgICAgICAgImN1c3RvbSI6ICJBbGwiLAog ICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewogICAgICAgICAgICAg ICAgICAgICAibmFtZSI6ICJib3JkZXItcmFkaXVzIiwKICAgICAgICAgICAgICAgICAgICAgInJl c29sdmVyIjogImJvdHRvbS1yaWdodCIKQEAgLTIxOTUsOCArMjE5Myw3IEBACiAgICAgICAgICAg ICAgICAgImFsaWFzZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgICItd2Via2l0LWJvcmRlci10 b3AtbGVmdC1yYWRpdXMiCiAgICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAiaW5p dGlhbCI6ICJpbml0aWFsQm9yZGVyUmFkaXVzIiwKLSAgICAgICAgICAgICAgICAiY3VzdG9tIjog IkluaGVyaXR8VmFsdWUiLAorICAgICAgICAgICAgICAgICJjdXN0b20iOiAiQWxsIiwKICAgICAg ICAgICAgICAgICAibG9naWNhbC1wcm9wZXJ0eS1ncm91cCI6IHsKICAgICAgICAgICAgICAgICAg ICAgIm5hbWUiOiAiYm9yZGVyLXJhZGl1cyIsCiAgICAgICAgICAgICAgICAgICAgICJyZXNvbHZl ciI6ICJ0b3AtbGVmdCIKQEAgLTIyMTIsOCArMjIwOSw3IEBACiAgICAgICAgICAgICAgICAgImFs aWFzZXMiOiBbCiAgICAgICAgICAgICAgICAgICAgICItd2Via2l0LWJvcmRlci10b3AtcmlnaHQt cmFkaXVzIgogICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImluaXRpYWwiOiAi aW5pdGlhbEJvcmRlclJhZGl1cyIsCi0gICAgICAgICAgICAgICAgImN1c3RvbSI6ICJJbmhlcml0 fFZhbHVlIiwKKyAgICAgICAgICAgICAgICAiY3VzdG9tIjogIkFsbCIsCiAgICAgICAgICAgICAg ICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7CiAgICAgICAgICAgICAgICAgICAgICJuYW1l IjogImJvcmRlci1yYWRpdXMiLAogICAgICAgICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAidG9w LXJpZ2h0IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5j cHAKaW5kZXggY2M4MGU1NzYzMDdlMjZkOTNlZjJkYTg4MWQ1MWYwOTMyNTBiZjgzNy4uMWZmZTcz MDY4ZDVmNTYwMjA5YzNkMmRlOGQ4YjJjYjA4OTJmNDMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC0xOTcsNyArMTk3LDEwIEBAIFJl bmRlclN0eWxlOjpSZW5kZXJTdHlsZShDcmVhdGVEZWZhdWx0U3R5bGVUYWcpCiAgICAgbV9ub25J bmhlcml0ZWRGbGFncy51bmljb2RlQmlkaSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihpbml0aWFs VW5pY29kZUJpZGkoKSk7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5mbG9hdGluZyA9IHN0YXRp Y19jYXN0PHVuc2lnbmVkPihpbml0aWFsRmxvYXRpbmcoKSk7CiAgICAgbV9ub25Jbmhlcml0ZWRG bGFncy50YWJsZUxheW91dCA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihpbml0aWFsVGFibGVMYXlv dXQoKSk7Ci0gICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFk aXVzID0gZmFsc2U7CisgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0Qm9y ZGVyQm90dG9tTGVmdFJhZGl1cyA9IGZhbHNlOworICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFz RXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzID0gZmFsc2U7CisgICAgbV9ub25J bmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cyA9IGZhbHNl OworICAgIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0 UmFkaXVzID0gZmFsc2U7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5U2V0 RGlyZWN0aW9uID0gZmFsc2U7CiAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5oYXNFeHBsaWNpdGx5 U2V0V3JpdGluZ01vZGUgPSBmYWxzZTsKICAgICBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxp Y2l0bHlTZXRUZXh0QWxpZ24gPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggZWM5NWI1YTczMzRkNDdhOTg1M2FkZDE3YTYyOTE4OTlk YjdhNGYyZi4uZDRkNDYxY2EyOGIwZmRlYWUwYmU1MDBlNzQzNjBiMTE2NWU3NjllMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTMwNSw3ICsz MDUsMTEgQEAgcHVibGljOgogICAgIGNvbnN0IExlbmd0aFNpemUmIGJvcmRlckJvdHRvbUxlZnRS YWRpdXMoKSBjb25zdCB7IHJldHVybiBtX3N1cnJvdW5kRGF0YS0+Ym9yZGVyLmJvdHRvbUxlZnRS YWRpdXMoKTsgfQogICAgIGNvbnN0IExlbmd0aFNpemUmIGJvcmRlckJvdHRvbVJpZ2h0UmFkaXVz KCkgY29uc3QgeyByZXR1cm4gbV9zdXJyb3VuZERhdGEtPmJvcmRlci5ib3R0b21SaWdodFJhZGl1 cygpOyB9CiAgICAgYm9vbCBoYXNCb3JkZXJSYWRpdXMoKSBjb25zdCB7IHJldHVybiBtX3N1cnJv dW5kRGF0YS0+Ym9yZGVyLmhhc0JvcmRlclJhZGl1cygpOyB9Ci0gICAgYm9vbCBoYXNFeHBsaWNp dGx5U2V0Qm9yZGVyUmFkaXVzKCkgY29uc3QgeyByZXR1cm4gbV9ub25Jbmhlcml0ZWRGbGFncy5o YXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzOyB9CisgICAgYm9vbCBoYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyQm90dG9tTGVmdFJhZGl1cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxh Z3MuaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbUxlZnRSYWRpdXM7IH0KKyAgICBib29sIGhh c0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cygpIGNvbnN0IHsgcmV0dXJuIG1f bm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVz OyB9CisgICAgYm9vbCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cygpIGNvbnN0 IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJvcmRlclRvcExl ZnRSYWRpdXM7IH0KKyAgICBib29sIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1 cygpIGNvbnN0IHsgcmV0dXJuIG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGljaXRseVNldEJv cmRlclRvcFJpZ2h0UmFkaXVzOyB9CisgICAgYm9vbCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFk aXVzKCkgY29uc3QgeyByZXR1cm4gaGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbUxlZnRSYWRp dXMoKSB8fCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMoKSB8fCBoYXNF eHBsaWNpdGx5U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cygpIHx8IGhhc0V4cGxpY2l0bHlTZXRCb3Jk ZXJUb3BSaWdodFJhZGl1cygpOyB9CiAKICAgICBmbG9hdCBib3JkZXJMZWZ0V2lkdGgoKSBjb25z dCB7IHJldHVybiBtX3N1cnJvdW5kRGF0YS0+Ym9yZGVyLmJvcmRlckxlZnRXaWR0aCgpOyB9CiAg ICAgQm9yZGVyU3R5bGUgYm9yZGVyTGVmdFN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9zdXJyb3Vu ZERhdGEtPmJvcmRlci5sZWZ0KCkuc3R5bGUoKTsgfQpAQCAtOTM0LDcgKzkzOCwxMCBAQCBwdWJs aWM6CiAKICAgICB2b2lkIHNldEJvcmRlclJhZGl1cyhMZW5ndGhTaXplJiYpOwogICAgIHZvaWQg c2V0Qm9yZGVyUmFkaXVzKGNvbnN0IEludFNpemUmKTsKLSAgICB2b2lkIHNldEhhc0V4cGxpY2l0 bHlTZXRCb3JkZXJSYWRpdXMoYm9vbCB2KSB7IG1fbm9uSW5oZXJpdGVkRmxhZ3MuaGFzRXhwbGlj aXRseVNldEJvcmRlclJhZGl1cyA9IHY7IH0KKyAgICB2b2lkIHNldEhhc0V4cGxpY2l0bHlTZXRC b3JkZXJCb3R0b21MZWZ0UmFkaXVzKGJvb2wgdikgeyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4 cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzID0gdjsgfQorICAgIHZvaWQgc2V0SGFz RXhwbGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKGJvb2wgdikgeyBtX25vbkluaGVy aXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyA9IHY7IH0K KyAgICB2b2lkIHNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BMZWZ0UmFkaXVzKGJvb2wgdikg eyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BMZWZ0UmFkaXVz ID0gdjsgfQorICAgIHZvaWQgc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVz KGJvb2wgdikgeyBtX25vbkluaGVyaXRlZEZsYWdzLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BS aWdodFJhZGl1cyA9IHY7IH0KIAogICAgIFJvdW5kZWRSZWN0IGdldFJvdW5kZWRCb3JkZXJGb3Io Y29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdl ID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpIGNvbnN0OwogICAg IFJvdW5kZWRSZWN0IGdldFJvdW5kZWRJbm5lckJvcmRlckZvcihjb25zdCBMYXlvdXRSZWN0JiBi b3JkZXJSZWN0LCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UgPSB0cnVlLCBib29sIGluY2x1 ZGVMb2dpY2FsUmlnaHRFZGdlID0gdHJ1ZSkgY29uc3Q7CkBAIC0xOTQ3LDcgKzE5NTQsMTAgQEAg cHJpdmF0ZToKICAgICAgICAgdW5zaWduZWQgZmxvYXRpbmcgOiAzOyAvLyBGbG9hdAogICAgICAg ICB1bnNpZ25lZCB0YWJsZUxheW91dCA6IDE7IC8vIFRhYmxlTGF5b3V0VHlwZQogCi0gICAgICAg IHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXMgOiAxOworICAgICAgICB1bnNp Z25lZCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyA6IDE7CisgICAgICAg IHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyA6IDE7Cisg ICAgICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BMZWZ0UmFkaXVzIDogMTsK KyAgICAgICAgdW5zaWduZWQgaGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzIDog MTsKICAgICAgICAgdW5zaWduZWQgaGFzRXhwbGljaXRseVNldERpcmVjdGlvbiA6IDE7CiAgICAg ICAgIHVuc2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRXcml0aW5nTW9kZSA6IDE7CiAgICAgICAgIHVu c2lnbmVkIGhhc0V4cGxpY2l0bHlTZXRUZXh0QWxpZ24gOiAxOwpAQCAtMjA4NCw3ICsyMDk0LDEw IEBAIGlubGluZSBib29sIFJlbmRlclN0eWxlOjpOb25Jbmhlcml0ZWRGbGFnczo6b3BlcmF0b3I9 PShjb25zdCBOb25Jbmhlcml0ZWRGbGFncyYKICAgICAgICAgJiYgdW5pY29kZUJpZGkgPT0gb3Ro ZXIudW5pY29kZUJpZGkKICAgICAgICAgJiYgZmxvYXRpbmcgPT0gb3RoZXIuZmxvYXRpbmcKICAg ICAgICAgJiYgdGFibGVMYXlvdXQgPT0gb3RoZXIudGFibGVMYXlvdXQKLSAgICAgICAgJiYgaGFz RXhwbGljaXRseVNldEJvcmRlclJhZGl1cyA9PSBvdGhlci5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVy UmFkaXVzCisgICAgICAgICYmIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVz ID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzCisgICAgICAg ICYmIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyA9PSBvdGhlci5oYXNF eHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tUmlnaHRSYWRpdXMKKyAgICAgICAgJiYgaGFzRXhwbGlj aXRseVNldEJvcmRlclRvcExlZnRSYWRpdXMgPT0gb3RoZXIuaGFzRXhwbGljaXRseVNldEJvcmRl clRvcExlZnRSYWRpdXMKKyAgICAgICAgJiYgaGFzRXhwbGljaXRseVNldEJvcmRlclRvcFJpZ2h0 UmFkaXVzID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1cwogICAg ICAgICAmJiBoYXNFeHBsaWNpdGx5U2V0RGlyZWN0aW9uID09IG90aGVyLmhhc0V4cGxpY2l0bHlT ZXREaXJlY3Rpb24KICAgICAgICAgJiYgaGFzRXhwbGljaXRseVNldFdyaXRpbmdNb2RlID09IG90 aGVyLmhhc0V4cGxpY2l0bHlTZXRXcml0aW5nTW9kZQogICAgICAgICAmJiBoYXNFeHBsaWNpdGx5 U2V0VGV4dEFsaWduID09IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRUZXh0QWxpZ24KQEAgLTIxMjEs NyArMjEzNCwxMCBAQCBpbmxpbmUgdm9pZCBSZW5kZXJTdHlsZTo6Tm9uSW5oZXJpdGVkRmxhZ3M6 OmNvcHlOb25Jbmhlcml0ZWRGcm9tKGNvbnN0IE5vbkluaGVyaQogCiAgICAgLy8gVW5saWtlIHBy b3BlcnRpZXMgdHJhY2tlZCBieSB0aGUgb3RoZXIgaGFzRXhwbGljaXRseVNldCogZmxhZ3MsIGJv cmRlci1yYWRpdXMgaXMgbm9uLWluaGVyaXRlZAogICAgIC8vIGFuZCB3ZSBuZWVkIHRvIHJlbWVt YmVyIHdoZXRoZXIgaXQncyBiZWVuIGV4cGxpY2l0bHkgc2V0IHdoZW4gY29weWluZyBtX3N1cnJv dW5kRGF0YS4KLSAgICBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzID0gb3RoZXIuaGFzRXhw bGljaXRseVNldEJvcmRlclJhZGl1czsKKyAgICBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9t TGVmdFJhZGl1cyA9IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVz OworICAgIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyA9IG90aGVyLmhh c0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1czsKKyAgICBoYXNFeHBsaWNpdGx5 U2V0Qm9yZGVyVG9wTGVmdFJhZGl1cyA9IG90aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BM ZWZ0UmFkaXVzOworICAgIGhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1cyA9IG90 aGVyLmhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1czsKIH0KIAogaW5saW5lIGJv b2wgUmVuZGVyU3R5bGU6Ok5vbkluaGVyaXRlZEZsYWdzOjpoYXNQc2V1ZG9TdHlsZShQc2V1ZG9J ZCBwc2V1ZG8pIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1 aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlckN1c3RvbS5o CmluZGV4IGU4ODRlNWJjZmFjNWRkNDg1MDlkZWQyMzllZTJlZjY2YWYzZTE0ZWQuLjk4ODM2YmVh ZjVkMjg3M2UyODM0M2FjZGVhMTY4YTBlNjEzMmEwNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlQnVpbGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0xMjcsMTIgKzEyNywxNiBAQCBwdWJsaWM6CiAgICAg c3RhdGljIHZvaWQgYXBwbHlJbmhlcml0RGlzcGxheShCdWlsZGVyU3RhdGUmKTsKICAgICBzdGF0 aWMgdm9pZCBhcHBseVZhbHVlRGlzcGxheShCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOwogICAg IC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjEyNTA2PiBUZWFjaCBtYWtlcHJvcC5w bCB0byBnZW5lcmF0ZSBzZXR0ZXJzIGZvciBoYXNFeHBsaWNpdGx5U2V0KiBmbGFncworICAgIHN0 YXRpYyB2b2lkIGFwcGx5SW5pdGlhbEJvcmRlckJvdHRvbUxlZnRSYWRpdXMoQnVpbGRlclN0YXRl Jik7CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyhC dWlsZGVyU3RhdGUmKTsKICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlQm9yZGVyQm90dG9tTGVm dFJhZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5 SW5pdGlhbEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYpOwogICAgIHN0YXRp YyB2b2lkIGFwcGx5SW5oZXJpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYp OwogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVCb3JkZXJCb3R0b21SaWdodFJhZGl1cyhCdWls ZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbEJvcmRl clRvcExlZnRSYWRpdXMoQnVpbGRlclN0YXRlJik7CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhl cml0Qm9yZGVyVG9wTGVmdFJhZGl1cyhCdWlsZGVyU3RhdGUmKTsKICAgICBzdGF0aWMgdm9pZCBh cHBseVZhbHVlQm9yZGVyVG9wTGVmdFJhZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOwor ICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbEJvcmRlclRvcFJpZ2h0UmFkaXVzKEJ1aWxkZXJT dGF0ZSYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdEJvcmRlclRvcFJpZ2h0UmFkaXVz KEJ1aWxkZXJTdGF0ZSYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVCb3JkZXJUb3BSaWdo dFJhZGl1cyhCdWlsZGVyU3RhdGUmLCBDU1NWYWx1ZSYpOwogCkBAIC0xMDg0LDUyICsxMDg4LDc2 IEBAIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVGb250RmFtaWx5KEJ1aWxk ZXJTdGF0ZSYgYnVpbGRlclN0YXRlLCBDU1NWCiAgICAgYnVpbGRlclN0YXRlLnNldEZvbnREZXNj cmlwdGlvbihXVEZNb3ZlKGZvbnREZXNjcmlwdGlvbikpOwogfQogCitpbmxpbmUgdm9pZCBCdWls ZGVyQ3VzdG9tOjphcHBseUluaXRpYWxCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKEJ1aWxkZXJTdGF0 ZSYgYnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlckJv dHRvbUxlZnRSYWRpdXMoUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJSYWRpdXMoKSk7CisgICAg YnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbUxlZnRS YWRpdXMoZmFsc2UpOworfQorCiBpbmxpbmUgdm9pZCBCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVy aXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQogewog ICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlckJvdHRvbUxlZnRSYWRpdXMoZm9yd2Fy ZEluaGVyaXRlZFZhbHVlKGJ1aWxkZXJTdGF0ZS5wYXJlbnRTdHlsZSgpLmJvcmRlckJvdHRvbUxl ZnRSYWRpdXMoKSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlT ZXRCb3JkZXJSYWRpdXMoYnVpbGRlclN0YXRlLnBhcmVudFN0eWxlKCkuaGFzRXhwbGljaXRseVNl dEJvcmRlclJhZGl1cygpKTsKKyAgICBidWlsZGVyU3RhdGUuc3R5bGUoKS5zZXRIYXNFeHBsaWNp dGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5o YXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cygpKTsKIH0KIAogaW5saW5lIHZv aWQgQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUJvcmRlckJvdHRvbUxlZnRSYWRpdXMoQnVpbGRl clN0YXRlJiBidWlsZGVyU3RhdGUsIENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBidWlsZGVyU3Rh dGUuc3R5bGUoKS5zZXRCb3JkZXJCb3R0b21MZWZ0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNv bnZlcnRSYWRpdXMoYnVpbGRlclN0YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHls ZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0 YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlckJvdHRvbUxlZnRSYWRpdXModHJ1 ZSk7Cit9CisKK2lubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5pdGlhbEJvcmRlckJv dHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxk ZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKFJlbmRlclN0eWxlOjpp bml0aWFsQm9yZGVyUmFkaXVzKCkpOworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4 cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJhZGl1cyhmYWxzZSk7CiB9CiAKIGlubGluZSB2 b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKEJ1 aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNl dEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKGZvcndhcmRJbmhlcml0ZWRWYWx1ZShidWlsZGVyU3Rh dGUucGFyZW50U3R5bGUoKS5ib3JkZXJCb3R0b21SaWdodFJhZGl1cygpKSk7Ci0gICAgYnVpbGRl clN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1cyhidWlsZGVyU3Rh dGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVzKCkpOworICAgIGJ1 aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJCb3R0b21SaWdodFJh ZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyQm90 dG9tUmlnaHRSYWRpdXMoKSk7CiB9CiAKIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5 VmFsdWVCb3JkZXJCb3R0b21SaWdodFJhZGl1cyhCdWlsZGVyU3RhdGUmIGJ1aWxkZXJTdGF0ZSwg Q1NTVmFsdWUmIHZhbHVlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlckJv dHRvbVJpZ2h0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMoYnVpbGRlclN0 YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlT ZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhw bGljaXRseVNldEJvcmRlckJvdHRvbVJpZ2h0UmFkaXVzKHRydWUpOworfQorCitpbmxpbmUgdm9p ZCBCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxCb3JkZXJUb3BMZWZ0UmFkaXVzKEJ1aWxkZXJT dGF0ZSYgYnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRl clRvcExlZnRSYWRpdXMoUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJSYWRpdXMoKSk7CisgICAg YnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclRvcExlZnRSYWRp dXMoZmFsc2UpOwogfQogCiBpbmxpbmUgdm9pZCBCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVyaXRC b3JkZXJUb3BMZWZ0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQogewogICAgIGJ1 aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlclRvcExlZnRSYWRpdXMoZm9yd2FyZEluaGVyaXRl ZFZhbHVlKGJ1aWxkZXJTdGF0ZS5wYXJlbnRTdHlsZSgpLmJvcmRlclRvcExlZnRSYWRpdXMoKSkp OwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJSYWRp dXMoYnVpbGRlclN0YXRlLnBhcmVudFN0eWxlKCkuaGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1 cygpKTsKKyAgICBidWlsZGVyU3RhdGUuc3R5bGUoKS5zZXRIYXNFeHBsaWNpdGx5U2V0Qm9yZGVy VG9wTGVmdFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyVG9wTGVmdFJhZGl1cygpKTsKIH0KIAogaW5saW5lIHZvaWQgQnVpbGRlckN1c3RvbTo6 YXBwbHlWYWx1ZUJvcmRlclRvcExlZnRSYWRpdXMoQnVpbGRlclN0YXRlJiBidWlsZGVyU3RhdGUs IENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBidWlsZGVyU3RhdGUuc3R5bGUoKS5zZXRCb3JkZXJU b3BMZWZ0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMoYnVpbGRlclN0YXRl LCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRC b3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGlj aXRseVNldEJvcmRlclRvcExlZnRSYWRpdXModHJ1ZSk7Cit9CisKK2lubGluZSB2b2lkIEJ1aWxk ZXJDdXN0b206OmFwcGx5SW5pdGlhbEJvcmRlclRvcFJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYg YnVpbGRlclN0YXRlKQoreworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlclRvcFJp Z2h0UmFkaXVzKFJlbmRlclN0eWxlOjppbml0aWFsQm9yZGVyUmFkaXVzKCkpOworICAgIGJ1aWxk ZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJUb3BSaWdodFJhZGl1cyhm YWxzZSk7CiB9CiAKIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEJvcmRl clRvcFJpZ2h0UmFkaXVzKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0YXRlKQogewogICAgIGJ1aWxk ZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKGZvcndhcmRJbmhlcml0ZWRW YWx1ZShidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5ib3JkZXJUb3BSaWdodFJhZGl1cygpKSk7 Ci0gICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhwbGljaXRseVNldEJvcmRlclJhZGl1 cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFkaXVz KCkpOworICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlTZXRCb3JkZXJU b3BSaWdodFJhZGl1cyhidWlsZGVyU3RhdGUucGFyZW50U3R5bGUoKS5oYXNFeHBsaWNpdGx5U2V0 Qm9yZGVyVG9wUmlnaHRSYWRpdXMoKSk7CiB9CiAKIGlubGluZSB2b2lkIEJ1aWxkZXJDdXN0b206 OmFwcGx5VmFsdWVCb3JkZXJUb3BSaWdodFJhZGl1cyhCdWlsZGVyU3RhdGUmIGJ1aWxkZXJTdGF0 ZSwgQ1NTVmFsdWUmIHZhbHVlKQogewogICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEJvcmRl clRvcFJpZ2h0UmFkaXVzKEJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSYWRpdXMoYnVpbGRlclN0 YXRlLCB2YWx1ZSkpOwotICAgIGJ1aWxkZXJTdGF0ZS5zdHlsZSgpLnNldEhhc0V4cGxpY2l0bHlT ZXRCb3JkZXJSYWRpdXModHJ1ZSk7CisgICAgYnVpbGRlclN0YXRlLnN0eWxlKCkuc2V0SGFzRXhw bGljaXRseVNldEJvcmRlclRvcFJpZ2h0UmFkaXVzKHRydWUpOwogfQogCiBpbmxpbmUgYm9vbCBC dWlsZGVyQ3VzdG9tOjppc1ZhbGlkRGlzcGxheVZhbHVlKEJ1aWxkZXJTdGF0ZSYgYnVpbGRlclN0 YXRlLCBEaXNwbGF5VHlwZSBkaXNwbGF5KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDAzYzExMDc0ZDMwZGZlOGM3MTE0YmYy OTA2MTE0OWQxNDFkMjkxY2UuLjY4YTIzMzY3YzlkNTA4MTdiYTBmY2U5MzkwOGZmMDY4NDJkMTlk NTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMi0wMy0xNyAgT3Jpb2wgQnJ1ZmF1ICA8b2Jy dWZhdUBpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBoYXNFeHBsaWNpdGx5U2V0Qm9yZGVyUmFk aXVzIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzODA2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCB0ZXN0LCBza2lwIGl0IGV4Y2VwdCBpbiBpT1MgYW5kIE1hYy4KKworICAgICAgICAqIFRl c3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXkt YnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvY3NzL2FwcGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi1ib3JkZXItcmFkaXVz LWxvbmdoYW5kcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVGVzdEV4cGVj dGF0aW9uczoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAy Mi0wMy0xNSAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIFJF R1JFU1NJT04ocjI4NzI0OSk6IFsgTW9udGVyZXkgd2syIF0gbWVkaWEvbWVkaWEtc291cmNlL21l ZGlhLXdlYm0tdm9yYmlzLXBhcnRpYWwuaHRtbCBpcyBhIGNvbnN0YW50IHRleHQgZmFpbHVyZQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMKaW5kZXggY2I0NzM0NDExODA5YzVmZWIwN2QwMjFhMmEzNjZiOWViOGQ1 M2ZmNC4uZTRiYWY4YWZmYjQ0NzY2NzliNTgzNmMwYzg2NGRhYjljZGY4YjA3OSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhw ZWN0YXRpb25zCkBAIC0yNzgsNiArMjc4LDcgQEAgbWVkaWEvZGVhY3RpdmF0ZS1hdWRpby1zZXNz aW9uLmh0bWwgWyBTa2lwIF0KICMgQXBwbGVQYXkgaXMgb25seSBhdmFpbGFibGUgb24gaU9TIChn cmVhdGVyIHRoYW4gaU9TIDEwKSBhbmQgbWFjT1MgKGdyZWF0ZXIgdGhhbiBtYWNPUyAxMC4xMikg YW5kIG9ubHkgZm9yIFdlYktpdDIuCiBmYXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1idXR0 b24uaHRtbCBbIFNraXAgXQogZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXktYnV0dG9uLWJv cmRlci1yYWRpdXMuaHRtbCBbIFNraXAgXQorZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXkt YnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLmh0bWwgWyBTa2lwIF0KIGZhc3QvY3NzL2Fw cGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi1kZWZhdWx0LWNvcm5lcnMuaHRtbCBbIFNraXAgXQog ZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1hcHBsZS1wYXktYnV0dG9u Lmh0bWwgWyBTa2lwIF0KIGZhc3QvY3NzL3dlYmtpdC1uYW1lZC1pbWFnZS9hcHBsZS1wYXktbG9n by1ibGFjayBbIFNraXAgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYXBwZWFy YW5jZS1hcHBsZS1wYXktYnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1idXR0b24tYm9y ZGVyLXJhZGl1cy1sb25naGFuZHMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xY2RkMzkyZDc1 NDRkZDI5NTMwNzg1YzMwNjRmYjc1ODJjMzExMmQwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXktYnV0dG9uLWJvcmRlci1yYWRpdXMt bG9uZ2hhbmRzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw1NSBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAg ICAgICAgICBwYWRkaW5nOiAyNXB4OworICAgICAgICAgICAgd2lkdGg6IDUwMHB4OworICAgICAg ICB9CisKKyAgICAgICAgLmFwcGxlLXBheS1idXR0b24geworICAgICAgICAgICAgLXdlYmtpdC1h cHBlYXJhbmNlOiAtYXBwbGUtcGF5LWJ1dHRvbjsKKyAgICAgICAgfQorCisgICAgICAgIC5zcXVh cmUtY29ybmVycyB7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiAwcHg7CisgICAgICAgIH0K KworICAgICAgICAudmVyeS1yb3VuZC1jb3JuZXJzIHsKKyAgICAgICAgICAgIGJvcmRlci1yYWRp dXM6IDE1cHg7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAg PGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5 LWJ1dHRvbiBzcXVhcmUtY29ybmVycyc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9 J2FwcGxlLXBheS1idXR0b24gc3F1YXJlLWNvcm5lcnMnPjwvYnV0dG9uPgorICAgICAgICA8YnV0 dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHNxdWFyZS1jb3JuZXJzJz48L2J1dHRvbj4KKyAg ICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBzcXVhcmUtY29ybmVycyc+PC9i dXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAg PGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbiBzcXVhcmUtY29ybmVycyc+PC9idXR0b24+ CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24gc3F1YXJlLWNvcm5lcnMn PjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHNxdWFy ZS1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1 dHRvbiBzcXVhcmUtY29ybmVycyc+PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFz cz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbic+ PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24nPjwvYnV0 dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJz48L2J1dHRvbj4K KyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbic+PC9idXR0b24+CisgICAg PC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFz cz0nYXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnPjwvYnV0dG9uPgorICAgICAg ICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHZlcnktcm91bmQtY29ybmVycyc+PC9i dXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24gdmVyeS1yb3Vu ZC1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1 dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnPjwvYnV0dG9uPgorICAgIDwvZGl2PgorICAgIDxkaXYg Y2xhc3M9J2NvbnRhaW5lcic+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0 b24gdmVyeS1yb3VuZC1jb3JuZXJzJz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0n YXBwbGUtcGF5LWJ1dHRvbiB2ZXJ5LXJvdW5kLWNvcm5lcnMnPjwvYnV0dG9uPgorICAgICAgICA8 YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uIHZlcnktcm91bmQtY29ybmVycyc+PC9idXR0 b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24gdmVyeS1yb3VuZC1j b3JuZXJzJz48L2J1dHRvbj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2FwcGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi1ib3Jk ZXItcmFkaXVzLWxvbmdoYW5kcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYXBwZWFyYW5j ZS1hcHBsZS1wYXktYnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uOTZlMTQ4ODRlMGYzNmVlNTUzNjIxNWUxN2ZiMTdhZWJhZDVlZjlmMwotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2FwcGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi1i b3JkZXItcmFkaXVzLWxvbmdoYW5kcy5odG1sCkBAIC0wLDAgKzEsNTUgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIC5jb250YWluZXIgewor ICAgICAgICAgICAgcGFkZGluZzogMjVweDsKKyAgICAgICAgICAgIHdpZHRoOiA1MDBweDsKKyAg ICAgICAgfQorCisgICAgICAgIC5hcHBsZS1wYXktYnV0dG9uIHsKKyAgICAgICAgICAgIC13ZWJr aXQtYXBwZWFyYW5jZTogLWFwcGxlLXBheS1idXR0b247CisgICAgICAgIH0KKworICAgICAgICAu c3F1YXJlLWNvcm5lcnMgeworICAgICAgICAgICAgYm9yZGVyLXJhZGl1czogMHB4OworICAgICAg ICB9CisKKyAgICAgICAgLnZlcnktcm91bmQtY29ybmVycyB7CisgICAgICAgICAgICBib3JkZXIt cmFkaXVzOiAxNXB4OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5Pgor ICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxl LXBheS1idXR0b24nIHN0eWxlPSdib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzOiAwcHgnPjwvYnV0 dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9y ZGVyLWJvdHRvbS1yaWdodC1yYWRpdXM6IDBweCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24g Y2xhc3M9J2FwcGxlLXBheS1idXR0b24nIHN0eWxlPSdib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAw cHgnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBz dHlsZT0nYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IDBweCc+PC9idXR0b24+CisgICAgPC9kaXY+ CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBw bGUtcGF5LWJ1dHRvbiBzcXVhcmUtY29ybmVycycgc3R5bGU9J2JvcmRlci1ib3R0b20tbGVmdC1y YWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1w YXktYnV0dG9uIHNxdWFyZS1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRp dXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXkt YnV0dG9uIHNxdWFyZS1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogaW5o ZXJpdCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24g c3F1YXJlLWNvcm5lcnMnIHN0eWxlPSdib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogaW5oZXJpdCc+ PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAg ICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbicgc3R5bGU9J2JvcmRlci1ib3R0b20t bGVmdC1yYWRpdXM6IGluaGVyaXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdh cHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLWJvdHRvbS1yaWdodC1yYWRpdXM6IGluaGVy aXQnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBz dHlsZT0nYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgICAg IDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24nIHN0eWxlPSdib3JkZXItdG9wLXJpZ2h0 LXJhZGl1czogaW5oZXJpdCc+PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0n Y29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRvbicgc3R5 bGU9J2JvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IDE1cHgnPjwvYnV0dG9uPgorICAgICAgICA8 YnV0dG9uIGNsYXNzPSdhcHBsZS1wYXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLWJvdHRvbS1yaWdo dC1yYWRpdXM6IDE1cHgnPjwvYnV0dG9uPgorICAgICAgICA8YnV0dG9uIGNsYXNzPSdhcHBsZS1w YXktYnV0dG9uJyBzdHlsZT0nYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogMTVweCc+PC9idXR0b24+ CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24nIHN0eWxlPSdib3JkZXIt dG9wLXJpZ2h0LXJhZGl1czogMTVweCc+PC9idXR0b24+CisgICAgPC9kaXY+CisgICAgPGRpdiBj bGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRv biB2ZXJ5LXJvdW5kLWNvcm5lcnMnIHN0eWxlPSdib3JkZXItYm90dG9tLWxlZnQtcmFkaXVzOiBp bmhlcml0Jz48L2J1dHRvbj4KKyAgICAgICAgPGJ1dHRvbiBjbGFzcz0nYXBwbGUtcGF5LWJ1dHRv biB2ZXJ5LXJvdW5kLWNvcm5lcnMnIHN0eWxlPSdib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1czog aW5oZXJpdCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0 b24gdmVyeS1yb3VuZC1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLXRvcC1sZWZ0LXJhZGl1czogaW5o ZXJpdCc+PC9idXR0b24+CisgICAgICAgIDxidXR0b24gY2xhc3M9J2FwcGxlLXBheS1idXR0b24g dmVyeS1yb3VuZC1jb3JuZXJzJyBzdHlsZT0nYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IGluaGVy aXQnPjwvYnV0dG9uPgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxNTNlNThhNTViZGViZjkwODU0OTQz MzUxNGNjYzAwODAyODFlY2U5Li4zOTVhZjhmODI2OWVjNDdkN2E5YmY1NTYyOWE3MjQyMDlmOWRm MTg4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMzgs NiArMzgsNyBAQCBmYXN0L2Zvcm1zL2lvcy9pcGFkL29wZW4tcGlja2VyLXVzaW5nLWtleWJvYXJk Lmh0bWwgWyBQYXNzIFRpbWVvdXQgXQogCiBmYXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1i dXR0b24uaHRtbCBbIFBhc3MgXQogZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXktYnV0dG9u LWJvcmRlci1yYWRpdXMuaHRtbCBbIFBhc3MgXQorZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1w YXktYnV0dG9uLWJvcmRlci1yYWRpdXMtbG9uZ2hhbmRzLmh0bWwgWyBQYXNzIF0KIGZhc3QvY3Nz L2FwcGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi1kZWZhdWx0LWNvcm5lcnMuaHRtbCBbIFBhc3Mg XQogZmFzdC9jc3Mvd2Via2l0LW5hbWVkLWltYWdlL2FwcGxlLXBheS1sb2dvLWJsYWNrIFsgUGFz cyBdCiBmYXN0L2Nzcy93ZWJraXQtbmFtZWQtaW1hZ2UvYXBwbGUtcGF5LWxvZ28td2hpdGUgWyBQ YXNzIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzZj Zjg1MWI0NTllNTczN2U4NWRmNzRkNjM4YmI5MDU4ZTdlZjE4MS4uYjUyMzdmZGFmNmJmZmJjZmE2 YTZmYzU1ODlmZDdmMmYyZGJiNWYzNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTEwNDUsNiArMTA0NSw3IEBAIHdlYmtpdC5vcmcvYi8xNTg2NDkgZmFz dC90ZXh0L2NoaW5lc2UtZm9udC1uYW1lLWFsaWFzZXMtMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy CiAKIGZhc3QvY3NzL2FwcGVhcmFuY2UtYXBwbGUtcGF5LWJ1dHRvbi5odG1sIFsgUGFzcyBdCiBm YXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1idXR0b24tYm9yZGVyLXJhZGl1cy5odG1sIFsg UGFzcyBdCitmYXN0L2Nzcy9hcHBlYXJhbmNlLWFwcGxlLXBheS1idXR0b24tYm9yZGVyLXJhZGl1 cy1sb25naGFuZHMuaHRtbCBbIFBhc3MgXQogZmFzdC9jc3MvYXBwZWFyYW5jZS1hcHBsZS1wYXkt YnV0dG9uLWRlZmF1bHQtY29ybmVycy5odG1sIFsgUGFzcyBdCiBmYXN0L2Nzcy93ZWJraXQtbmFt ZWQtaW1hZ2UvYXBwbGUtcGF5LWxvZ28tYmxhY2sgWyBQYXNzIF0KIGZhc3QvY3NzL3dlYmtpdC1u YW1lZC1pbWFnZS9hcHBsZS1wYXktbG9nby13aGl0ZSBbIFBhc3MgXQo=