202603 2019-10-04 14:16:55 -0700 ServiceWorkerContainer should never prevent a page from entering the back/forward cache 2019-10-04 17:41:15 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202293 1 cdumez cdumez achristensen beidson commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1577010 0 cdumez 2019-10-04 14:16:55 -0700 ServiceWorkerContainer should never prevent a page from entering the back/forward cache. 1577034 1 380258 cdumez 2019-10-04 15:06:46 -0700 Created attachment 380258 Patch 1577038 2 380258 ggaren 2019-10-04 15:18:38 -0700 Comment on attachment 380258 Patch r=me 1577058 3 380262 cdumez 2019-10-04 16:00:31 -0700 Created attachment 380262 Patch 1577092 4 380262 commit-queue 2019-10-04 17:40:12 -0700 Comment on attachment 380262 Patch Clearing flags on attachment: 380262 Committed r250758: <https://trac.webkit.org/changeset/250758> 1577093 5 commit-queue 2019-10-04 17:40:13 -0700 All reviewed patches have been landed. Closing bug. 1577094 6 webkit-bug-importer 2019-10-04 17:41:15 -0700 <rdar://problem/56000608> 380258 2019-10-04 15:06:46 -0700 2019-10-04 16:00:29 -0700 Patch bug-202603-20191004150645.patch text/plain 14369 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJmMjg5ODhiOTIxMTFi MzJkZDhmMmNlMDI4MDIwOGEwZDI0MTdmMS4uZTFkMmRhZmZhYmRlOTQxOWNkMTdhYmFhYzMwZjI5 NDE3ZTVmMTYyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEwLTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2VydmljZVdvcmtlckNvbnRh aW5lciBzaG91bGQgbmV2ZXIgcHJldmVudCBhIHBhZ2UgZnJvbSBlbnRlcmluZyB0aGUgYmFjay9m b3J3YXJkIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDI2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIGl0IHNvIHRoYXQgU2VydmljZVdvcmtlckNvbnRhaW5lciBjYW4gc3VzcGVuZCwg ZXZlbiBpZiB0aGV5IGhhdmUgcGVuZGluZyBwcm9taXNlcy4KKyAgICAgICAgV2Ugbm93IHF1ZXVl IGFsbCBwcm9taXNlIHJlc29sdXRpb25zIHRvIGEgU3VzcGVuZGFibGVUYXNrUXVldWUgdG8gbWFr ZSBzdXJlIHRoYXQgdGhvc2UKKyAgICAgICAgcHJvbWlzZXMgZG8gbm90IGdldCByZXNvbHZlZCB3 aGlsZSBpbiB0aGUgcGFnZSBjYWNoZS4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL3dvcmtl cnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29ya2VyLXBlbmRpbmctcHJvbWlzZS5odHRw cy5odG1sCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5l ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpTZXJ2aWNl V29ya2VyQ29udGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWlu ZXI6OnJlYWR5KToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6Omdl dFJlZ2lzdHJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29udGFpbmVy OjpnZXRSZWdpc3RyYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250 YWluZXI6OmpvYkZhaWxlZFdpdGhFeGNlcHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Vydmlj ZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJlc29sdmVkV2l0aFVucmVnaXN0 cmF0aW9uUmVzdWx0KToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6 OmpvYkZhaWxlZExvYWRpbmdTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtl ckNvbnRhaW5lcjo6Y2FuU3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbiBjb25zdCk6CisgICAg ICAgICogd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuaDoKKwogMjAxOS0x MC0wNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIERPTUNhY2hl IHNob3VsZCBub3QgcHJldmVudCBwYWdlcyBmcm9tIGVudGVyaW5nIHRoZSBiYWNrL2ZvcndhcmQg Y2FjaGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNl V29ya2VyQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2 aWNlV29ya2VyQ29udGFpbmVyLmNwcAppbmRleCA3MjExZWI2ZmNiNTRmM2Y0NTcyNmNlYTM2NzMy MTJhODY1ODM3Y2M1Li45NTU5YmUzMmE2ODgwYzBlZGYyN2Q3M2Q2ZjYwMjNjYTUwNmU0OTM4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNv bnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VX b3JrZXJDb250YWluZXIuY3BwCkBAIC03MSw2ICs3MSw3IEBAIFNlcnZpY2VXb3JrZXJDb250YWlu ZXI6OlNlcnZpY2VXb3JrZXJDb250YWluZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwKICAgICA6IEFjdGl2ZURPTU9iamVjdChjb250ZXh0KQogICAgICwgbV9uYXZpZ2F0b3IobmF2 aWdhdG9yKQogICAgICwgbV9tZXNzYWdlUXVldWUoR2VuZXJpY0V2ZW50UXVldWU6OmNyZWF0ZSgq dGhpcykpCisgICAgLCBtX3Rhc2tRdWV1ZShTdXNwZW5kYWJsZVRhc2tRdWV1ZTo6Y3JlYXRlKGNv bnRleHQpKQogewogICAgIHN1c3BlbmRJZk5lZWRlZCgpOwogICAgIApAQCAtMTA2LDExICsxMDcs MTAgQEAgYXV0byBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpyZWFkeSgpIC0+IFJlYWR5UHJvbWlz ZSYKIAogICAgICAgICBhdXRvJiBjb250ZXh0ID0gKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsK ICAgICAgICAgZW5zdXJlU1dDbGllbnRDb25uZWN0aW9uKCkud2hlblJlZ2lzdHJhdGlvblJlYWR5 KGNvbnRleHQudG9wT3JpZ2luKCkuZGF0YSgpLCBjb250ZXh0LnVybCgpLCBbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXShhdXRvJiYgcmVnaXN0cmF0aW9uRGF0YSkgbXV0YWJs ZSB7Ci0gICAgICAgICAgICBpZiAobV9pc1N0b3BwZWQpCi0gICAgICAgICAgICAgICAgcmV0dXJu OwotCi0gICAgICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb246OmdldE9yQ3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0aGlzLCBXVEZN b3ZlKHJlZ2lzdHJhdGlvbkRhdGEpKTsKLSAgICAgICAgICAgIG1fcmVhZHlQcm9taXNlLT5yZXNv bHZlKFdURk1vdmUocmVnaXN0cmF0aW9uKSk7CisgICAgICAgICAgICBtX3Rhc2tRdWV1ZS0+ZW5x dWV1ZVRhc2soW3RoaXMsIHJlZ2lzdHJhdGlvbkRhdGEgPSBXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRh dGEpXSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGF1dG8gcmVnaXN0cmF0aW9uID0gU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbjo6Z2V0T3JDcmVhdGUoKnNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKSwgKnRoaXMsIFdURk1vdmUocmVnaXN0cmF0aW9uRGF0YSkpOworICAgICAgICAgICAgICAg IG1fcmVhZHlQcm9taXNlLT5yZXNvbHZlKFdURk1vdmUocmVnaXN0cmF0aW9uKSk7CisgICAgICAg ICAgICB9KTsKICAgICAgICAgfSk7CiAgICAgfQogICAgIHJldHVybiAqbV9yZWFkeVByb21pc2U7 CkBAIC0yNjksMTQgKzI2OSwxMyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmdldFJl Z2lzdHJhdGlvbihjb25zdCBTdHJpbmcmIGNsaWVudFVSTCwgUmVmPERlZmVycgogICAgIH0KIAog ICAgIGVuc3VyZVNXQ2xpZW50Q29ubmVjdGlvbigpLm1hdGNoUmVnaXN0cmF0aW9uKFNlY3VyaXR5 T3JpZ2luRGF0YSB7IGNvbnRleHQudG9wT3JpZ2luKCkuZGF0YSgpIH0sIHBhcnNlZFVSTCwgW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJv bWlzZSldKGF1dG8mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBpZiAobV9pc1N0b3BwZWQp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKCFyZXN1bHQpIHsKLSAgICAgICAg ICAgIHByb21pc2UtPnJlc29sdmUoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot ICAgICAgICBwcm9taXNlLT5yZXNvbHZlPElETEludGVyZmFjZTxTZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uPj4oU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbjo6Z2V0T3JDcmVhdGUoKnNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQoKSwgKnRoaXMsIFdURk1vdmUocmVzdWx0LnZhbHVlKCkpKSk7CisgICAg ICAgIG1fdGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbdGhpcywgcHJvbWlzZSA9IFdURk1vdmUocHJv bWlzZSksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAg IGlmICghcmVzdWx0KSB7CisgICAgICAgICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOworICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHByb21pc2Ut PnJlc29sdmU8SURMSW50ZXJmYWNlPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24+PihTZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uOjpnZXRPckNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp LCAqdGhpcywgV1RGTW92ZShyZXN1bHQudmFsdWUoKSkpKTsKKyAgICAgICAgfSk7CiAgICAgfSk7 CiB9CiAKQEAgLTMwMiwxMyArMzAxLDEyIEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6 Z2V0UmVnaXN0cmF0aW9ucyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAKICAgICBh dXRvJiBjb250ZXh0ID0gKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKICAgICBlbnN1cmVTV0Ns aWVudENvbm5lY3Rpb24oKS5nZXRSZWdpc3RyYXRpb25zKFNlY3VyaXR5T3JpZ2luRGF0YSB7IGNv bnRleHQudG9wT3JpZ2luKCkuZGF0YSgpIH0sIGNvbnRleHQudXJsKCksIFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoYXV0 byYmIHJlZ2lzdHJhdGlvbkRhdGFzKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKG1faXNTdG9wcGVk KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGF1dG8gcmVnaXN0cmF0aW9ucyA9IFdU Rjo6bWFwKFdURk1vdmUocmVnaXN0cmF0aW9uRGF0YXMpLCBbJl0oYXV0byYmIHJlZ2lzdHJhdGlv bkRhdGEpIHsKLSAgICAgICAgICAgIHJldHVybiBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uOjpn ZXRPckNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCAqdGhpcywgV1RGTW92ZShyZWdp c3RyYXRpb25EYXRhKSk7CisgICAgICAgIG1fdGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbdGhpcywg cHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlZ2lzdHJhdGlvbkRhdGFzID0gV1RGTW92ZShy ZWdpc3RyYXRpb25EYXRhcyldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBhdXRvIHJlZ2lzdHJh dGlvbnMgPSBXVEY6Om1hcChXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGFzKSwgWyZdKGF1dG8mJiBy ZWdpc3RyYXRpb25EYXRhKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb246OmdldE9yQ3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0aGlz LCBXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGEpKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAg ICAgcHJvbWlzZS0+cmVzb2x2ZTxJRExTZXF1ZW5jZTxJRExJbnRlcmZhY2U8U2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbj4+PihXVEZNb3ZlKHJlZ2lzdHJhdGlvbnMpKTsKICAgICAgICAgfSk7Ci0g ICAgICAgIHByb21pc2UtPnJlc29sdmU8SURMU2VxdWVuY2U8SURMSW50ZXJmYWNlPFNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb24+Pj4oV1RGTW92ZShyZWdpc3RyYXRpb25zKSk7CiAgICAgfSk7CiB9 CiAKQEAgLTMzNSwxMSArMzMzLDkgQEAgdm9pZCBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpqb2JG YWlsZWRXaXRoRXhjZXB0aW9uKFNlcnZpY2VXb3JrZXJKb2ImIGpvYiwgY29uc3QKICAgICBpZiAo IXByb21pc2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChhdXRvKiBjb250ZXh0ID0gc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpKSB7Ci0gICAgICAgIGNvbnRleHQtPnBvc3RUYXNrKFtwcm9t aXNlID0gV1RGTW92ZShwcm9taXNlKSwgZXhjZXB0aW9uXShhdXRvJikgbXV0YWJsZSB7Ci0gICAg ICAgICAgICBwcm9taXNlLT5yZWplY3QoZXhjZXB0aW9uKTsKLSAgICAgICAgfSk7Ci0gICAgfQor ICAgIG1fdGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSks IGV4Y2VwdGlvbl0oKSBtdXRhYmxlIHsKKyAgICAgICAgcHJvbWlzZS0+cmVqZWN0KGV4Y2VwdGlv bik7CisgICAgfSk7CiB9CiAKIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6ZmlyZVVwZGF0 ZUZvdW5kRXZlbnQoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIgaWRlbnRpZmll cikKQEAgLTM3MCw3ICszNjYsNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJl c29sdmVkV2l0aFJlZ2lzdHJhdGlvbihTZXJ2aWNlV29ya2VySm9iJiBqb2IsCiAgICAgICAgIGRl c3Ryb3lKb2Ioam9iKTsKICAgICB9KTsKIAotICAgIGF1dG8gbm90aWZ5SWZFeGl0RWFybHkgPSBX VEY6Om1ha2VTY29wZUV4aXQoW3RoaXMsICZkYXRhLCAmc2hvdWxkTm90aWZ5V2hlblJlc29sdmVk XSB7CisgICAgYXV0byBub3RpZnlJZkV4aXRFYXJseSA9IFdURjo6bWFrZVNjb3BlRXhpdChbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCAmZGF0YSwgJnNob3VsZE5vdGlmeVdo ZW5SZXNvbHZlZF0gewogICAgICAgICBpZiAoc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNo b3VsZE5vdGlmeVdoZW5SZXNvbHZlZDo6WWVzKQogICAgICAgICAgICAgbm90aWZ5UmVnaXN0cmF0 aW9uSXNTZXR0bGVkKGRhdGEua2V5KTsKICAgICB9KTsKQEAgLTM4MiwyMiArMzc4LDE2IEBAIHZv aWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uKFNl cnZpY2VXb3JrZXJKb2ImIGpvYiwKICAgICBpZiAoIXByb21pc2UpCiAgICAgICAgIHJldHVybjsK IAotICAgIG5vdGlmeUlmRXhpdEVhcmx5LnJlbGVhc2UoKTsKKyAgICBtX3Rhc2tRdWV1ZS0+ZW5x dWV1ZVRhc2soW3RoaXMsIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCBqb2JJZGVudGlmaWVy ID0gam9iLmlkZW50aWZpZXIoKSwgZGF0YSA9IFdURk1vdmUoZGF0YSksIHNob3VsZE5vdGlmeVdo ZW5SZXNvbHZlZCwgbm90aWZ5SWZFeGl0RWFybHkgPSBXVEZNb3ZlKG5vdGlmeUlmRXhpdEVhcmx5 KV0oKSBtdXRhYmxlIHsKKyAgICAgICAgbm90aWZ5SWZFeGl0RWFybHkucmVsZWFzZSgpOwogCi0g ICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5wb3N0VGFzayhbdGhpcywgcHJvdGVjdGVkVGhp cyA9IFJlZlB0cjxTZXJ2aWNlV29ya2VyQ29udGFpbmVyPih0aGlzKSwgcHJvbWlzZSA9IFdURk1v dmUocHJvbWlzZSksIGpvYklkZW50aWZpZXIgPSBqb2IuaWRlbnRpZmllcigpLCBkYXRhID0gV1RG TW92ZShkYXRhKSwgc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkXShTY3JpcHRFeGVjdXRpb25Db250 ZXh0JiBjb250ZXh0KSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKGlzU3RvcHBlZCgpKSB7Ci0gICAg ICAgICAgICBpZiAoc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNob3VsZE5vdGlmeVdoZW5S ZXNvbHZlZDo6WWVzKQotICAgICAgICAgICAgICAgIG5vdGlmeVJlZ2lzdHJhdGlvbklzU2V0dGxl ZChkYXRhLmtleSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBh dXRvIHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb246OmdldE9yQ3JlYXRl KGNvbnRleHQsICp0aGlzLCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgYXV0byByZWdpc3RyYXRp b24gPSBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uOjpnZXRPckNyZWF0ZSgqc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLCAqdGhpcywgV1RGTW92ZShkYXRhKSk7CiAKICAgICAgICAgQ09OVEFJTkVS X1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImpvYlJlc29sdmVkV2l0aFJlZ2lzdHJhdGlvbjogUmVz b2x2aW5nIHByb21pc2UgZm9yIGpvYiAlIiBQUkl1NjQgIi4gUmVnaXN0cmF0aW9uIElEOiAlIiBQ Ukl1NjQsIGpvYklkZW50aWZpZXIudG9VSW50NjQoKSwgcmVnaXN0cmF0aW9uLT5pZGVudGlmaWVy KCkudG9VSW50NjQoKSk7CiAKICAgICAgICAgaWYgKHNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZCA9 PSBTaG91bGROb3RpZnlXaGVuUmVzb2x2ZWQ6OlllcykgewogICAgICAgICAgICAgbV9vbmdvaW5n U2V0dGxlZFJlZ2lzdHJhdGlvbnMuYWRkKCsrbV9sYXN0T25nb2luZ1NldHRsZWRSZWdpc3RyYXRp b25JZGVudGlmaWVyLCByZWdpc3RyYXRpb24tPmRhdGEoKS5rZXkpOwotICAgICAgICAgICAgcHJv bWlzZS0+d2hlblNldHRsZWQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3Rl ZFRoaXMpLCBpZGVudGlmaWVyID0gbV9sYXN0T25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25JZGVu dGlmaWVyXSB7CisgICAgICAgICAgICBwcm9taXNlLT53aGVuU2V0dGxlZChbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBpZGVudGlmaWVyID0gbV9sYXN0T25nb2luZ1NldHRs ZWRSZWdpc3RyYXRpb25JZGVudGlmaWVyXSB7CiAgICAgICAgICAgICAgICAgbm90aWZ5UmVnaXN0 cmF0aW9uSXNTZXR0bGVkKG1fb25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25zLnRha2UoaWRlbnRp ZmllcikpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KQEAgLTQ0Myw3ICs0MzMsNyBAQCB2 b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJlc29sdmVkV2l0aFVucmVnaXN0cmF0aW9u UmVzdWx0KFNlcnZpY2VXb3JrZXJKbwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY29u dGV4dC0+cG9zdFRhc2soW3Byb21pc2UgPSBqb2IudGFrZVByb21pc2UoKSwgdW5yZWdpc3RyYXRp b25SZXN1bHRdKGF1dG8mKSBtdXRhYmxlIHsKKyAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1ZVRhc2so W3Byb21pc2UgPSBqb2IudGFrZVByb21pc2UoKSwgdW5yZWdpc3RyYXRpb25SZXN1bHRdKCkgbXV0 YWJsZSB7CiAgICAgICAgIHByb21pc2UtPnJlc29sdmU8SURMQm9vbGVhbj4odW5yZWdpc3RyYXRp b25SZXN1bHQpOwogICAgIH0pOwogfQpAQCAtNDg5LDggKzQ3OSwxMSBAQCB2b2lkIFNlcnZpY2VX b3JrZXJDb250YWluZXI6OmpvYkZhaWxlZExvYWRpbmdTY3JpcHQoU2VydmljZVdvcmtlckpvYiYg am9iLCBjb25zdAogCiAgICAgQ09OVEFJTkVSX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQo ImpvYkZpbmlzaGVkTG9hZGluZ1NjcmlwdDogRmFpbGVkIHRvIGZldGNoIHNjcmlwdCBmb3Igam9i ICUiIFBSSXU2NCAiLCBlcnJvcjogJXMiLCBqb2IuaWRlbnRpZmllcigpLnRvVUludDY0KCksIGVy cm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkudXRmOCgpLmRhdGEoKSk7CiAKLSAgICBpZiAoYXV0 byBwcm9taXNlID0gam9iLnRha2VQcm9taXNlKCkpCi0gICAgICAgIHByb21pc2UtPnJlamVjdChX VEZNb3ZlKGV4Y2VwdGlvbikpOworICAgIGlmIChhdXRvIHByb21pc2UgPSBqb2IudGFrZVByb21p c2UoKSkgeworICAgICAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1ZVRhc2soW3Byb21pc2UgPSBXVEZN b3ZlKHByb21pc2UpLCBleGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkgbXV0YWJsZSB7 CisgICAgICAgICAgICBwcm9taXNlLT5yZWplY3QoV1RGTW92ZShleGNlcHRpb24pKTsKKyAgICAg ICAgfSk7CisgICAgfQogCiAgICAgbm90aWZ5RmFpbGVkRmV0Y2hpbmdTY3JpcHQoam9iLCBlcnJv cik7CiAgICAgZGVzdHJveUpvYihqb2IpOwpAQCAtNTIwLDcgKzUxMyw3IEBAIGNvbnN0IGNoYXIq IFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdAogCiBi b29sIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmNhblN1c3BlbmRGb3JEb2N1bWVudFN1c3BlbnNp b24oKSBjb25zdAogewotICAgIHJldHVybiAhaGFzUGVuZGluZ0FjdGl2aXR5KCk7CisgICAgcmV0 dXJuIHRydWU7CiB9CiAKIFNXQ2xpZW50Q29ubmVjdGlvbiYgU2VydmljZVdvcmtlckNvbnRhaW5l cjo6ZW5zdXJlU1dDbGllbnRDb25uZWN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5oCmluZGV4IDc1ZWE5NTMy MTkwZjBjNjZjNjYwYmJlOWIyNWQ0YmNkN2M5MWQ5YzMuLmY1MDYyNjI5YjE1OGJkNDkyMGY3M2Nj MjIwYmFhZjE3ZjI5ZjNkOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuaApAQCAtMzYsNiArMzYsNyBAQAogI2lu Y2x1ZGUgIlNlcnZpY2VXb3JrZXJKb2JDbGllbnQuaCIKICNpbmNsdWRlICJTZXJ2aWNlV29ya2Vy UmVnaXN0cmF0aW9uLmgiCiAjaW5jbHVkZSAiU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbk9wdGlv bnMuaCIKKyNpbmNsdWRlICJTdXNwZW5kYWJsZVRhc2tRdWV1ZS5oIgogI2luY2x1ZGUgIldvcmtl clR5cGUuaCIKICNpbmNsdWRlIDx3dGYvVGhyZWFkaW5nLmg+CiAKQEAgLTE0Miw2ICsxNDMsNyBA QCBwcml2YXRlOgogICAgIHVpbnQ2NF90IG1fbGFzdE9uZ29pbmdTZXR0bGVkUmVnaXN0cmF0aW9u SWRlbnRpZmllciB7IDAgfTsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBTZXJ2aWNlV29ya2VyUmVn aXN0cmF0aW9uS2V5PiBtX29uZ29pbmdTZXR0bGVkUmVnaXN0cmF0aW9uczsKICAgICBVbmlxdWVS ZWY8R2VuZXJpY0V2ZW50UXVldWU+IG1fbWVzc2FnZVF1ZXVlOworICAgIFVuaXF1ZVJlZjxTdXNw ZW5kYWJsZVRhc2tRdWV1ZT4gbV90YXNrUXVldWU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggODU2MTY2OGE0OTk5NjNmZmVkZGU2Y2E5NWU2MGRlMDk0ZmQ4MWNiYy4uNTRh MzZmY2UyNTA3MDkzOTQ0YjZmMmU1NzM3NzJkMjFiODUzOTEzZCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTEwLTA0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgU2VydmljZVdvcmtlckNvbnRhaW5lciBzaG91bGQgbmV2ZXIgcHJldmVudCBhIHBhZ2UgZnJv bSBlbnRlcmluZyB0aGUgYmFjay9mb3J3YXJkIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDI2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3QgY292ZXJhZ2UuCisKKyAg ICAgICAgKiBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29y a2VyLXBlbmRpbmctcHJvbWlzZS5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IGh0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3BhZ2UtY2FjaGUtc2VydmljZS13b3JrZXItcGVu ZGluZy1wcm9taXNlLmh0dHBzLmh0bWw6IEFkZGVkLgorCiAyMDE5LTEwLTA0ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRE9NQ2FjaGUgc2hvdWxkIG5vdCBwcmV2 ZW50IHBhZ2VzIGZyb20gZW50ZXJpbmcgdGhlIGJhY2svZm9yd2FyZCBjYWNoZQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcGFnZS1jYWNoZS1zZXJ2 aWNlLXdvcmtlci1wZW5kaW5nLXByb21pc2UuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcGFnZS1jYWNoZS1zZXJ2aWNlLXdvcmtlci1w ZW5kaW5nLXByb21pc2UuaHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE0NTBiMjA2ZDNk NTUyMGRjMmMzMTA4ZmZiNGNlZjYwNWE3NTQwMTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29ya2Vy LXBlbmRpbmctcHJvbWlzZS5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorVGVz dHMgdGhhdCBhIHBhZ2Ugd2l0aCBhIHBlbmRpbmcgc2VydmljZSB3b3JrZXIgcHJvbWlzZSBpcyBh YmxlIHRvIGVudGVyIHRoZSBwYWdlIGNhY2hlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKworcGFnZXNob3cgLSBub3QgZnJvbSBjYWNoZQorcGFnZWhpZGUgLSBlbnRlcmluZyBjYWNo ZQorcGFnZXNob3cgLSBmcm9tIGNhY2hlCitQQVNTIFBhZ2Ugd2FzIHJlc3RvcmVkIGZyb20gUGFn ZSBDYWNoZQorUEFTUyBVbnJlZ2lzdGVyZWQgc3VjY2Vzc2Z1bHkKK1BBU1MgISFyZXN0b3JlZEZy b21QYWdlQ2FjaGUgaXMgdHJ1ZQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitU RVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vy cy9zZXJ2aWNlL3BhZ2UtY2FjaGUtc2VydmljZS13b3JrZXItcGVuZGluZy1wcm9taXNlLmh0dHBz Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hl LXNlcnZpY2Utd29ya2VyLXBlbmRpbmctcHJvbWlzZS5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA5 ZjA1NjgzZjdhOWFjNzVjZWNiZWQxZWVmYTczY2I4OGE3MjA3NTEKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZp Y2Utd29ya2VyLXBlbmRpbmctcHJvbWlzZS5odHRwcy5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwh LS0gd2Via2l0LXRlc3QtcnVubmVyIFsgZW5hYmxlUGFnZUNhY2hlPXRydWUgXSAtLT4KKzwhRE9D VFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxzY3JpcHQgc3JjPSIvanMtdGVzdC1yZXNvdXJj ZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHRo YXQgYSBwYWdlIHdpdGggYSBwZW5kaW5nIHNlcnZpY2Ugd29ya2VyIHByb21pc2UgaXMgYWJsZSB0 byBlbnRlciB0aGUgcGFnZSBjYWNoZS4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCitsZXQg cmVzdG9yZWRGcm9tUGFnZUNhY2hlID0gZmFsc2U7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVy KCJwYWdlc2hvdyIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgZGVidWcoInBhZ2VzaG93IC0gIiAr IChldmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZnJvbSBjYWNoZSIpOworICAgIGlm IChldmVudC5wZXJzaXN0ZWQpIHsKKyAgICAgICAgdGVzdFBhc3NlZCgiUGFnZSB3YXMgcmVzdG9y ZWQgZnJvbSBQYWdlIENhY2hlIik7CisgICAgICAgIHJlc3RvcmVkRnJvbVBhZ2VDYWNoZSA9IHRy dWU7CisgICAgfQorfSk7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJwYWdlaGlkZSIsIGZ1 bmN0aW9uKGV2ZW50KSB7CisgICAgZGVidWcoInBhZ2VoaWRlIC0gIiArIChldmVudC5wZXJzaXN0 ZWQgPyAiIiA6ICJub3QgIikgKyAiZW50ZXJpbmcgY2FjaGUiKTsKKyAgICBpZiAoIWV2ZW50LnBl cnNpc3RlZCkgeworICAgICAgICB0ZXN0RmFpbGVkKCJQYWdlIGZhaWxlZCB0byBlbnRlciB0aGUg UGFnZSBDYWNoZSIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9CisKKyAgICByZWdp c3RyYXRpb24udW5yZWdpc3RlcigpLnRoZW4oKCkgPT4geworICAgICAgICB0ZXN0UGFzc2VkKCJV bnJlZ2lzdGVyZWQgc3VjY2Vzc2Z1bHkiKTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCIhIXJlc3Rv cmVkRnJvbVBhZ2VDYWNoZSIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9LCAoKSA9 PiB7CisgICAgICAgIHRlc3RGYWlsZWQoIkZhaWxlZCB0byB1bnJlZ2lzdGVyIik7CisgICAgICAg IGZpbmlzaEpTVGVzdCgpOworICAgIH0pOworfSk7CisKK29ubG9hZCA9ICgpID0+IHsKKyAgICBu YXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdpc3RlcigicmVzb3VyY2VzL2Jhc2ljLWZldGNoLXdv cmtlci5qcyIsIHsgc2NvcGU6ICIvd29ya2Vycy9zZXJ2aWNlL3Jlc291cmNlcy8iIH0pLnRoZW4o KF9yZWdpc3RyYXRpb24pID0+IHsKKyAgICAgICAgcmVnaXN0cmF0aW9uID0gX3JlZ2lzdHJhdGlv bjsKKyAgICAgICAgd2luZG93LmxvY2F0aW9uID0gIi9uYXZpZ2F0aW9uL3Jlc291cmNlcy9wYWdl LWNhY2hlLWhlbHBlci5odG1sIjsKKyAgICB9KTsKK30KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgo= 380262 2019-10-04 16:00:31 -0700 2019-10-04 17:40:12 -0700 Patch bug-202603-20191004160030.patch text/plain 15315 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJmMjg5ODhiOTIxMTFi MzJkZDhmMmNlMDI4MDIwOGEwZDI0MTdmMS4uYmI5NzEzMzQ2MmQzYWM5ZDBlZWE0ZDczODcwMWI0 MzcwNTZkMjVmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEwLTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2VydmljZVdvcmtlckNvbnRh aW5lciBzaG91bGQgbmV2ZXIgcHJldmVudCBhIHBhZ2UgZnJvbSBlbnRlcmluZyB0aGUgYmFjay9m b3J3YXJkIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDI2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAg ICBNYWtlIGl0IHNvIHRoYXQgU2VydmljZVdvcmtlckNvbnRhaW5lciBjYW4gc3VzcGVuZCwgZXZl biBpZiB0aGV5IGhhdmUgcGVuZGluZyBwcm9taXNlcy4KKyAgICAgICAgV2Ugbm93IHF1ZXVlIGFs bCBwcm9taXNlIHJlc29sdXRpb25zIHRvIGEgU3VzcGVuZGFibGVUYXNrUXVldWUgdG8gbWFrZSBz dXJlIHRoYXQgdGhvc2UKKyAgICAgICAgcHJvbWlzZXMgZG8gbm90IGdldCByZXNvbHZlZCB3aGls ZSBpbiB0aGUgcGFnZSBjYWNoZS4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL3dvcmtlcnMv c2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29ya2VyLXBlbmRpbmctcHJvbWlzZS5odHRwcy5o dG1sCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpTZXJ2aWNlV29y a2VyQ29udGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6 OnJlYWR5KToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6OmdldFJl Z2lzdHJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpn ZXRSZWdpc3RyYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWlu ZXI6OmpvYkZhaWxlZFdpdGhFeGNlcHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdv cmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJlc29sdmVkV2l0aFVucmVnaXN0cmF0 aW9uUmVzdWx0KToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6Ompv YkZhaWxlZExvYWRpbmdTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckNv bnRhaW5lcjo6Y2FuU3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbiBjb25zdCk6CisgICAgICAg ICogd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuaDoKKwogMjAxOS0xMC0w NCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIERPTUNhY2hlIHNo b3VsZCBub3QgcHJldmVudCBwYWdlcyBmcm9tIGVudGVyaW5nIHRoZSBiYWNrL2ZvcndhcmQgY2Fj aGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29y a2VyQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNl V29ya2VyQ29udGFpbmVyLmNwcAppbmRleCA3MjExZWI2ZmNiNTRmM2Y0NTcyNmNlYTM2NzMyMTJh ODY1ODM3Y2M1Li45NTU5YmUzMmE2ODgwYzBlZGYyN2Q3M2Q2ZjYwMjNjYTUwNmU0OTM4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRh aW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3Jr ZXJDb250YWluZXIuY3BwCkBAIC03MSw2ICs3MSw3IEBAIFNlcnZpY2VXb3JrZXJDb250YWluZXI6 OlNlcnZpY2VXb3JrZXJDb250YWluZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwK ICAgICA6IEFjdGl2ZURPTU9iamVjdChjb250ZXh0KQogICAgICwgbV9uYXZpZ2F0b3IobmF2aWdh dG9yKQogICAgICwgbV9tZXNzYWdlUXVldWUoR2VuZXJpY0V2ZW50UXVldWU6OmNyZWF0ZSgqdGhp cykpCisgICAgLCBtX3Rhc2tRdWV1ZShTdXNwZW5kYWJsZVRhc2tRdWV1ZTo6Y3JlYXRlKGNvbnRl eHQpKQogewogICAgIHN1c3BlbmRJZk5lZWRlZCgpOwogICAgIApAQCAtMTA2LDExICsxMDcsMTAg QEAgYXV0byBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpyZWFkeSgpIC0+IFJlYWR5UHJvbWlzZSYK IAogICAgICAgICBhdXRvJiBjb250ZXh0ID0gKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKICAg ICAgICAgZW5zdXJlU1dDbGllbnRDb25uZWN0aW9uKCkud2hlblJlZ2lzdHJhdGlvblJlYWR5KGNv bnRleHQudG9wT3JpZ2luKCkuZGF0YSgpLCBjb250ZXh0LnVybCgpLCBbdGhpcywgcHJvdGVjdGVk VGhpcyA9IG1ha2VSZWYoKnRoaXMpXShhdXRvJiYgcmVnaXN0cmF0aW9uRGF0YSkgbXV0YWJsZSB7 Ci0gICAgICAgICAgICBpZiAobV9pc1N0b3BwZWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b246OmdldE9yQ3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0aGlzLCBXVEZNb3Zl KHJlZ2lzdHJhdGlvbkRhdGEpKTsKLSAgICAgICAgICAgIG1fcmVhZHlQcm9taXNlLT5yZXNvbHZl KFdURk1vdmUocmVnaXN0cmF0aW9uKSk7CisgICAgICAgICAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1 ZVRhc2soW3RoaXMsIHJlZ2lzdHJhdGlvbkRhdGEgPSBXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGEp XSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGF1dG8gcmVnaXN0cmF0aW9uID0gU2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbjo6Z2V0T3JDcmVhdGUoKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KSwgKnRoaXMsIFdURk1vdmUocmVnaXN0cmF0aW9uRGF0YSkpOworICAgICAgICAgICAgICAgIG1f cmVhZHlQcm9taXNlLT5yZXNvbHZlKFdURk1vdmUocmVnaXN0cmF0aW9uKSk7CisgICAgICAgICAg ICB9KTsKICAgICAgICAgfSk7CiAgICAgfQogICAgIHJldHVybiAqbV9yZWFkeVByb21pc2U7CkBA IC0yNjksMTQgKzI2OSwxMyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmdldFJlZ2lz dHJhdGlvbihjb25zdCBTdHJpbmcmIGNsaWVudFVSTCwgUmVmPERlZmVycgogICAgIH0KIAogICAg IGVuc3VyZVNXQ2xpZW50Q29ubmVjdGlvbigpLm1hdGNoUmVnaXN0cmF0aW9uKFNlY3VyaXR5T3Jp Z2luRGF0YSB7IGNvbnRleHQudG9wT3JpZ2luKCkuZGF0YSgpIH0sIHBhcnNlZFVSTCwgW3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlz ZSldKGF1dG8mJiByZXN1bHQpIG11dGFibGUgewotICAgICAgICBpZiAobV9pc1N0b3BwZWQpCi0g ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKCFyZXN1bHQpIHsKLSAgICAgICAgICAg IHByb21pc2UtPnJlc29sdmUoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAg ICAgICBwcm9taXNlLT5yZXNvbHZlPElETEludGVyZmFjZTxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uPj4oU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbjo6Z2V0T3JDcmVhdGUoKnNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSwgKnRoaXMsIFdURk1vdmUocmVzdWx0LnZhbHVlKCkpKSk7CisgICAgICAg IG1fdGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbdGhpcywgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlz ZSksIHJlc3VsdCA9IFdURk1vdmUocmVzdWx0KV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGlm ICghcmVzdWx0KSB7CisgICAgICAgICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZSgpOworICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHByb21pc2UtPnJl c29sdmU8SURMSW50ZXJmYWNlPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24+PihTZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uOjpnZXRPckNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCAq dGhpcywgV1RGTW92ZShyZXN1bHQudmFsdWUoKSkpKTsKKyAgICAgICAgfSk7CiAgICAgfSk7CiB9 CiAKQEAgLTMwMiwxMyArMzAxLDEyIEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6Z2V0 UmVnaXN0cmF0aW9ucyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAKICAgICBhdXRv JiBjb250ZXh0ID0gKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKICAgICBlbnN1cmVTV0NsaWVu dENvbm5lY3Rpb24oKS5nZXRSZWdpc3RyYXRpb25zKFNlY3VyaXR5T3JpZ2luRGF0YSB7IGNvbnRl eHQudG9wT3JpZ2luKCkuZGF0YSgpIH0sIGNvbnRleHQudXJsKCksIFt0aGlzLCBwcm90ZWN0ZWRU aGlzID0gbWFrZVJlZigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoYXV0byYm IHJlZ2lzdHJhdGlvbkRhdGFzKSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKG1faXNTdG9wcGVkKQot ICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGF1dG8gcmVnaXN0cmF0aW9ucyA9IFdURjo6 bWFwKFdURk1vdmUocmVnaXN0cmF0aW9uRGF0YXMpLCBbJl0oYXV0byYmIHJlZ2lzdHJhdGlvbkRh dGEpIHsKLSAgICAgICAgICAgIHJldHVybiBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uOjpnZXRP ckNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCAqdGhpcywgV1RGTW92ZShyZWdpc3Ry YXRpb25EYXRhKSk7CisgICAgICAgIG1fdGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbdGhpcywgcHJv bWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHJlZ2lzdHJhdGlvbkRhdGFzID0gV1RGTW92ZShyZWdp c3RyYXRpb25EYXRhcyldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBhdXRvIHJlZ2lzdHJhdGlv bnMgPSBXVEY6Om1hcChXVEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGFzKSwgWyZdKGF1dG8mJiByZWdp c3RyYXRpb25EYXRhKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb246OmdldE9yQ3JlYXRlKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICp0aGlzLCBX VEZNb3ZlKHJlZ2lzdHJhdGlvbkRhdGEpKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAg cHJvbWlzZS0+cmVzb2x2ZTxJRExTZXF1ZW5jZTxJRExJbnRlcmZhY2U8U2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbj4+PihXVEZNb3ZlKHJlZ2lzdHJhdGlvbnMpKTsKICAgICAgICAgfSk7Ci0gICAg ICAgIHByb21pc2UtPnJlc29sdmU8SURMU2VxdWVuY2U8SURMSW50ZXJmYWNlPFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb24+Pj4oV1RGTW92ZShyZWdpc3RyYXRpb25zKSk7CiAgICAgfSk7CiB9CiAK QEAgLTMzNSwxMSArMzMzLDkgQEAgdm9pZCBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpqb2JGYWls ZWRXaXRoRXhjZXB0aW9uKFNlcnZpY2VXb3JrZXJKb2ImIGpvYiwgY29uc3QKICAgICBpZiAoIXBy b21pc2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChhdXRvKiBjb250ZXh0ID0gc2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpKSB7Ci0gICAgICAgIGNvbnRleHQtPnBvc3RUYXNrKFtwcm9taXNl ID0gV1RGTW92ZShwcm9taXNlKSwgZXhjZXB0aW9uXShhdXRvJikgbXV0YWJsZSB7Ci0gICAgICAg ICAgICBwcm9taXNlLT5yZWplY3QoZXhjZXB0aW9uKTsKLSAgICAgICAgfSk7Ci0gICAgfQorICAg IG1fdGFza1F1ZXVlLT5lbnF1ZXVlVGFzayhbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIGV4 Y2VwdGlvbl0oKSBtdXRhYmxlIHsKKyAgICAgICAgcHJvbWlzZS0+cmVqZWN0KGV4Y2VwdGlvbik7 CisgICAgfSk7CiB9CiAKIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6ZmlyZVVwZGF0ZUZv dW5kRXZlbnQoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIgaWRlbnRpZmllcikK QEAgLTM3MCw3ICszNjYsNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJlc29s dmVkV2l0aFJlZ2lzdHJhdGlvbihTZXJ2aWNlV29ya2VySm9iJiBqb2IsCiAgICAgICAgIGRlc3Ry b3lKb2Ioam9iKTsKICAgICB9KTsKIAotICAgIGF1dG8gbm90aWZ5SWZFeGl0RWFybHkgPSBXVEY6 Om1ha2VTY29wZUV4aXQoW3RoaXMsICZkYXRhLCAmc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkXSB7 CisgICAgYXV0byBub3RpZnlJZkV4aXRFYXJseSA9IFdURjo6bWFrZVNjb3BlRXhpdChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCAmZGF0YSwgJnNob3VsZE5vdGlmeVdoZW5S ZXNvbHZlZF0gewogICAgICAgICBpZiAoc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNob3Vs ZE5vdGlmeVdoZW5SZXNvbHZlZDo6WWVzKQogICAgICAgICAgICAgbm90aWZ5UmVnaXN0cmF0aW9u SXNTZXR0bGVkKGRhdGEua2V5KTsKICAgICB9KTsKQEAgLTM4MiwyMiArMzc4LDE2IEBAIHZvaWQg U2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uKFNlcnZp Y2VXb3JrZXJKb2ImIGpvYiwKICAgICBpZiAoIXByb21pc2UpCiAgICAgICAgIHJldHVybjsKIAot ICAgIG5vdGlmeUlmRXhpdEVhcmx5LnJlbGVhc2UoKTsKKyAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1 ZVRhc2soW3RoaXMsIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCBqb2JJZGVudGlmaWVyID0g am9iLmlkZW50aWZpZXIoKSwgZGF0YSA9IFdURk1vdmUoZGF0YSksIHNob3VsZE5vdGlmeVdoZW5S ZXNvbHZlZCwgbm90aWZ5SWZFeGl0RWFybHkgPSBXVEZNb3ZlKG5vdGlmeUlmRXhpdEVhcmx5KV0o KSBtdXRhYmxlIHsKKyAgICAgICAgbm90aWZ5SWZFeGl0RWFybHkucmVsZWFzZSgpOwogCi0gICAg c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5wb3N0VGFzayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IFJlZlB0cjxTZXJ2aWNlV29ya2VyQ29udGFpbmVyPih0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUo cHJvbWlzZSksIGpvYklkZW50aWZpZXIgPSBqb2IuaWRlbnRpZmllcigpLCBkYXRhID0gV1RGTW92 ZShkYXRhKSwgc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkXShTY3JpcHRFeGVjdXRpb25Db250ZXh0 JiBjb250ZXh0KSBtdXRhYmxlIHsKLSAgICAgICAgaWYgKGlzU3RvcHBlZCgpKSB7Ci0gICAgICAg ICAgICBpZiAoc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNob3VsZE5vdGlmeVdoZW5SZXNv bHZlZDo6WWVzKQotICAgICAgICAgICAgICAgIG5vdGlmeVJlZ2lzdHJhdGlvbklzU2V0dGxlZChk YXRhLmtleSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBhdXRv IHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb246OmdldE9yQ3JlYXRlKGNv bnRleHQsICp0aGlzLCBXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgYXV0byByZWdpc3RyYXRpb24g PSBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uOjpnZXRPckNyZWF0ZSgqc2NyaXB0RXhlY3V0aW9u Q29udGV4dCgpLCAqdGhpcywgV1RGTW92ZShkYXRhKSk7CiAKICAgICAgICAgQ09OVEFJTkVSX1JF TEVBU0VfTE9HX0lGX0FMTE9XRUQoImpvYlJlc29sdmVkV2l0aFJlZ2lzdHJhdGlvbjogUmVzb2x2 aW5nIHByb21pc2UgZm9yIGpvYiAlIiBQUkl1NjQgIi4gUmVnaXN0cmF0aW9uIElEOiAlIiBQUkl1 NjQsIGpvYklkZW50aWZpZXIudG9VSW50NjQoKSwgcmVnaXN0cmF0aW9uLT5pZGVudGlmaWVyKCku dG9VSW50NjQoKSk7CiAKICAgICAgICAgaWYgKHNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZCA9PSBT aG91bGROb3RpZnlXaGVuUmVzb2x2ZWQ6OlllcykgewogICAgICAgICAgICAgbV9vbmdvaW5nU2V0 dGxlZFJlZ2lzdHJhdGlvbnMuYWRkKCsrbV9sYXN0T25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25J ZGVudGlmaWVyLCByZWdpc3RyYXRpb24tPmRhdGEoKS5rZXkpOwotICAgICAgICAgICAgcHJvbWlz ZS0+d2hlblNldHRsZWQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpLCBpZGVudGlmaWVyID0gbV9sYXN0T25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25JZGVudGlm aWVyXSB7CisgICAgICAgICAgICBwcm9taXNlLT53aGVuU2V0dGxlZChbdGhpcywgcHJvdGVjdGVk VGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBpZGVudGlmaWVyID0gbV9sYXN0T25nb2luZ1NldHRsZWRS ZWdpc3RyYXRpb25JZGVudGlmaWVyXSB7CiAgICAgICAgICAgICAgICAgbm90aWZ5UmVnaXN0cmF0 aW9uSXNTZXR0bGVkKG1fb25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25zLnRha2UoaWRlbnRpZmll cikpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KQEAgLTQ0Myw3ICs0MzMsNyBAQCB2b2lk IFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJlc29sdmVkV2l0aFVucmVnaXN0cmF0aW9uUmVz dWx0KFNlcnZpY2VXb3JrZXJKbwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY29udGV4 dC0+cG9zdFRhc2soW3Byb21pc2UgPSBqb2IudGFrZVByb21pc2UoKSwgdW5yZWdpc3RyYXRpb25S ZXN1bHRdKGF1dG8mKSBtdXRhYmxlIHsKKyAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1ZVRhc2soW3By b21pc2UgPSBqb2IudGFrZVByb21pc2UoKSwgdW5yZWdpc3RyYXRpb25SZXN1bHRdKCkgbXV0YWJs ZSB7CiAgICAgICAgIHByb21pc2UtPnJlc29sdmU8SURMQm9vbGVhbj4odW5yZWdpc3RyYXRpb25S ZXN1bHQpOwogICAgIH0pOwogfQpAQCAtNDg5LDggKzQ3OSwxMSBAQCB2b2lkIFNlcnZpY2VXb3Jr ZXJDb250YWluZXI6OmpvYkZhaWxlZExvYWRpbmdTY3JpcHQoU2VydmljZVdvcmtlckpvYiYgam9i LCBjb25zdAogCiAgICAgQ09OVEFJTkVSX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImpv YkZpbmlzaGVkTG9hZGluZ1NjcmlwdDogRmFpbGVkIHRvIGZldGNoIHNjcmlwdCBmb3Igam9iICUi IFBSSXU2NCAiLCBlcnJvcjogJXMiLCBqb2IuaWRlbnRpZmllcigpLnRvVUludDY0KCksIGVycm9y LmxvY2FsaXplZERlc2NyaXB0aW9uKCkudXRmOCgpLmRhdGEoKSk7CiAKLSAgICBpZiAoYXV0byBw cm9taXNlID0gam9iLnRha2VQcm9taXNlKCkpCi0gICAgICAgIHByb21pc2UtPnJlamVjdChXVEZN b3ZlKGV4Y2VwdGlvbikpOworICAgIGlmIChhdXRvIHByb21pc2UgPSBqb2IudGFrZVByb21pc2Uo KSkgeworICAgICAgICBtX3Rhc2tRdWV1ZS0+ZW5xdWV1ZVRhc2soW3Byb21pc2UgPSBXVEZNb3Zl KHByb21pc2UpLCBleGNlcHRpb24gPSBXVEZNb3ZlKGV4Y2VwdGlvbildKCkgbXV0YWJsZSB7Cisg ICAgICAgICAgICBwcm9taXNlLT5yZWplY3QoV1RGTW92ZShleGNlcHRpb24pKTsKKyAgICAgICAg fSk7CisgICAgfQogCiAgICAgbm90aWZ5RmFpbGVkRmV0Y2hpbmdTY3JpcHQoam9iLCBlcnJvcik7 CiAgICAgZGVzdHJveUpvYihqb2IpOwpAQCAtNTIwLDcgKzUxMyw3IEBAIGNvbnN0IGNoYXIqIFNl cnZpY2VXb3JrZXJDb250YWluZXI6OmFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdAogCiBib29s IFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmNhblN1c3BlbmRGb3JEb2N1bWVudFN1c3BlbnNpb24o KSBjb25zdAogewotICAgIHJldHVybiAhaGFzUGVuZGluZ0FjdGl2aXR5KCk7CisgICAgcmV0dXJu IHRydWU7CiB9CiAKIFNXQ2xpZW50Q29ubmVjdGlvbiYgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6 ZW5zdXJlU1dDbGllbnRDb25uZWN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5oCmluZGV4IDc1ZWE5NTMyMTkw ZjBjNjZjNjYwYmJlOWIyNWQ0YmNkN2M5MWQ5YzMuLmY1MDYyNjI5YjE1OGJkNDkyMGY3M2NjMjIw YmFhZjE3ZjI5ZjNkOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vydmlj ZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuaApAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1 ZGUgIlNlcnZpY2VXb3JrZXJKb2JDbGllbnQuaCIKICNpbmNsdWRlICJTZXJ2aWNlV29ya2VyUmVn aXN0cmF0aW9uLmgiCiAjaW5jbHVkZSAiU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbk9wdGlvbnMu aCIKKyNpbmNsdWRlICJTdXNwZW5kYWJsZVRhc2tRdWV1ZS5oIgogI2luY2x1ZGUgIldvcmtlclR5 cGUuaCIKICNpbmNsdWRlIDx3dGYvVGhyZWFkaW5nLmg+CiAKQEAgLTE0Miw2ICsxNDMsNyBAQCBw cml2YXRlOgogICAgIHVpbnQ2NF90IG1fbGFzdE9uZ29pbmdTZXR0bGVkUmVnaXN0cmF0aW9uSWRl bnRpZmllciB7IDAgfTsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBTZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uS2V5PiBtX29uZ29pbmdTZXR0bGVkUmVnaXN0cmF0aW9uczsKICAgICBVbmlxdWVSZWY8 R2VuZXJpY0V2ZW50UXVldWU+IG1fbWVzc2FnZVF1ZXVlOworICAgIFVuaXF1ZVJlZjxTdXNwZW5k YWJsZVRhc2tRdWV1ZT4gbV90YXNrUXVldWU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggODU2MTY2OGE0OTk5NjNmZmVkZGU2Y2E5NWU2MGRlMDk0ZmQ4MWNiYy4uNzFlN2U3 MzQ0MDI0MDEwYmNjM2JmYjQxZTEyZTkxMDgzY2Q2NGMwYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDE5LTEwLTA0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAg U2VydmljZVdvcmtlckNvbnRhaW5lciBzaG91bGQgbmV2ZXIgcHJldmVudCBhIHBhZ2UgZnJvbSBl bnRlcmluZyB0aGUgYmFjay9mb3J3YXJkIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDI2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9m ZiBHYXJlbi4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAg KiBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29ya2VyLXBl bmRpbmctcHJvbWlzZS5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAv dGVzdHMvd29ya2Vycy9zZXJ2aWNlL3BhZ2UtY2FjaGUtc2VydmljZS13b3JrZXItcGVuZGluZy1w cm9taXNlLmh0dHBzLmh0bWw6IEFkZGVkLgorCiAyMDE5LTEwLTA0ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRE9NQ2FjaGUgc2hvdWxkIG5vdCBwcmV2ZW50IHBh Z2VzIGZyb20gZW50ZXJpbmcgdGhlIGJhY2svZm9yd2FyZCBjYWNoZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcGFnZS1jYWNoZS1zZXJ2aWNlLXdv cmtlci1wZW5kaW5nLXByb21pc2UuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcGFnZS1jYWNoZS1zZXJ2aWNlLXdvcmtlci1wZW5kaW5n LXByb21pc2UuaHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE0NTBiMjA2ZDNkNTUyMGRj MmMzMTA4ZmZiNGNlZjYwNWE3NTQwMTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29ya2VyLXBlbmRp bmctcHJvbWlzZS5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorVGVzdHMgdGhh dCBhIHBhZ2Ugd2l0aCBhIHBlbmRpbmcgc2VydmljZSB3b3JrZXIgcHJvbWlzZSBpcyBhYmxlIHRv IGVudGVyIHRoZSBwYWdlIGNhY2hlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKwor cGFnZXNob3cgLSBub3QgZnJvbSBjYWNoZQorcGFnZWhpZGUgLSBlbnRlcmluZyBjYWNoZQorcGFn ZXNob3cgLSBmcm9tIGNhY2hlCitQQVNTIFBhZ2Ugd2FzIHJlc3RvcmVkIGZyb20gUGFnZSBDYWNo ZQorUEFTUyBVbnJlZ2lzdGVyZWQgc3VjY2Vzc2Z1bHkKK1BBU1MgISFyZXN0b3JlZEZyb21QYWdl Q2FjaGUgaXMgdHJ1ZQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENP TVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2 aWNlL3BhZ2UtY2FjaGUtc2VydmljZS13b3JrZXItcGVuZGluZy1wcm9taXNlLmh0dHBzLmh0bWwg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZp Y2Utd29ya2VyLXBlbmRpbmctcHJvbWlzZS5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA5ZjA1Njgz ZjdhOWFjNzVjZWNiZWQxZWVmYTczY2I4OGE3MjA3NTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wYWdlLWNhY2hlLXNlcnZpY2Utd29y a2VyLXBlbmRpbmctcHJvbWlzZS5odHRwcy5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwhLS0gd2Vi a2l0LXRlc3QtcnVubmVyIFsgZW5hYmxlUGFnZUNhY2hlPXRydWUgXSAtLT4KKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8Ym9keT4KKzxzY3JpcHQgc3JjPSIvanMtdGVzdC1yZXNvdXJjZXMvanMt dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHRoYXQgYSBw YWdlIHdpdGggYSBwZW5kaW5nIHNlcnZpY2Ugd29ya2VyIHByb21pc2UgaXMgYWJsZSB0byBlbnRl ciB0aGUgcGFnZSBjYWNoZS4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCitsZXQgcmVzdG9y ZWRGcm9tUGFnZUNhY2hlID0gZmFsc2U7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJwYWdl c2hvdyIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgZGVidWcoInBhZ2VzaG93IC0gIiArIChldmVu dC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZnJvbSBjYWNoZSIpOworICAgIGlmIChldmVu dC5wZXJzaXN0ZWQpIHsKKyAgICAgICAgdGVzdFBhc3NlZCgiUGFnZSB3YXMgcmVzdG9yZWQgZnJv bSBQYWdlIENhY2hlIik7CisgICAgICAgIHJlc3RvcmVkRnJvbVBhZ2VDYWNoZSA9IHRydWU7Cisg ICAgfQorfSk7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJwYWdlaGlkZSIsIGZ1bmN0aW9u KGV2ZW50KSB7CisgICAgZGVidWcoInBhZ2VoaWRlIC0gIiArIChldmVudC5wZXJzaXN0ZWQgPyAi IiA6ICJub3QgIikgKyAiZW50ZXJpbmcgY2FjaGUiKTsKKyAgICBpZiAoIWV2ZW50LnBlcnNpc3Rl ZCkgeworICAgICAgICB0ZXN0RmFpbGVkKCJQYWdlIGZhaWxlZCB0byBlbnRlciB0aGUgUGFnZSBD YWNoZSIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9CisKKyAgICByZWdpc3RyYXRp b24udW5yZWdpc3RlcigpLnRoZW4oKCkgPT4geworICAgICAgICB0ZXN0UGFzc2VkKCJVbnJlZ2lz dGVyZWQgc3VjY2Vzc2Z1bHkiKTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCIhIXJlc3RvcmVkRnJv bVBhZ2VDYWNoZSIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9LCAoKSA9PiB7Cisg ICAgICAgIHRlc3RGYWlsZWQoIkZhaWxlZCB0byB1bnJlZ2lzdGVyIik7CisgICAgICAgIGZpbmlz aEpTVGVzdCgpOworICAgIH0pOworfSk7CisKK29ubG9hZCA9ICgpID0+IHsKKyAgICBuYXZpZ2F0 b3Iuc2VydmljZVdvcmtlci5yZWdpc3RlcigicmVzb3VyY2VzL2Jhc2ljLWZldGNoLXdvcmtlci5q cyIsIHsgc2NvcGU6ICIvd29ya2Vycy9zZXJ2aWNlL3Jlc291cmNlcy8iIH0pLnRoZW4oKF9yZWdp c3RyYXRpb24pID0+IHsKKyAgICAgICAgcmVnaXN0cmF0aW9uID0gX3JlZ2lzdHJhdGlvbjsKKyAg ICAgICAgd2luZG93LmxvY2F0aW9uID0gIi9uYXZpZ2F0aW9uL3Jlc291cmNlcy9wYWdlLWNhY2hl LWhlbHBlci5odG1sIjsKKyAgICB9KTsKK30KKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9z ZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3JrZXIvc2tpcC13YWl0aW5nLXdpdGhvdXQtdXNpbmct cmVnaXN0cmF0aW9uLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3NraXAt d2FpdGluZy13aXRob3V0LXVzaW5nLXJlZ2lzdHJhdGlvbi5odHRwcy1leHBlY3RlZC50eHQKaW5k ZXggODEyYWRjMjRjNWI3ZTNmYjUyNGI4NTM4NWRhN2NhMzZkNDBmMTgzOS4uMGVhOWQ1ODc1Nzg2 YTgyOWEzNjI4NTA3OTQ1MmNjZGRmMDVlYTQ3NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3Jr ZXIvc2tpcC13YWl0aW5nLXdpdGhvdXQtdXNpbmctcmVnaXN0cmF0aW9uLmh0dHBzLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Nl cnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9za2lwLXdhaXRpbmctd2l0aG91dC11c2luZy1y ZWdpc3RyYXRpb24uaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0xLDMgKzEsNCBAQAogCi1GQUlMIFRl c3Qgc2tpcFdhaXRpbmcgd2hpbGUgYSBjbGllbnQgaXMgbm90IGJlaW5nIGNvbnRyb2xsZWQgcHJv bWlzZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGggdmFsdWU6IG9iamVjdCAiVHlwZUVy cm9yOiBudWxsIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcgJ2RvY3VtZW50LmJvZHkuYXBw ZW5kQ2hpbGQnKSIKK1BBU1MgVGVzdCBza2lwV2FpdGluZyB3aGlsZSBhIGNsaWVudCBpcyBub3Qg YmVpbmcgY29udHJvbGxlZCAKK1BBU1Mgc2tpcFdhaXRpbmcgCiAK