208723 2020-03-06 11:16:20 -0800 Add _WKResourceLoadInfo.resourceType SPI 2020-03-06 12:26:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez commit-queue ews-watchlist japhet webkit-bug-importer oldest_to_newest 1626760 0 achristensen 2020-03-06 11:16:20 -0800 Add _WKResourceLoadInfo.resourceType SPI 1626761 1 392746 achristensen 2020-03-06 11:18:48 -0800 Created attachment 392746 Patch 1626773 2 achristensen 2020-03-06 11:51:48 -0800 rdar://problem/60098650 1626791 3 392746 commit-queue 2020-03-06 12:25:30 -0800 Comment on attachment 392746 Patch Clearing flags on attachment: 392746 Committed r258017: <https://trac.webkit.org/changeset/258017> 1626792 4 commit-queue 2020-03-06 12:25:32 -0800 All reviewed patches have been landed. Closing bug. 1626796 5 webkit-bug-importer 2020-03-06 12:26:22 -0800 <rdar://problem/60166247> 392746 2020-03-06 11:18:48 -0800 2020-03-06 12:25:30 -0800 Patch bug-208723-20200306111847.patch text/plain 22831 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1ODAwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAzLTA2ICBEYXZpZCBR dWVzYWRhICA8ZGF2aWRfcXVlc2FkYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIF9XS1Jlc291 cmNlTG9hZEluZm8ucmVzb3VyY2VUeXBlIFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NzIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBD aHJpc3RlbnNlbi4KKworICAgICAgICBDb3ZlcmVkIGJ5IEFQSSB0ZXN0cy4KKworICAgICAgICAq IE1vZHVsZXMvYmVhY29uL05hdmlnYXRvckJlYWNvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpO YXZpZ2F0b3JCZWFjb246OnNlbmRCZWFjb24pOgorICAgICAgICAqIGxvYWRlci9QaW5nTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OnNlbmRQaW5nKToKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaDoKKwogMjAyMC0wMy0wNiAg S2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgcmVkdW5kYW50IGZsYWdzIGluIHNjcmlwdCBldmFsdWF0aW9uIGNoZWNrcwpJbmRleDogU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9iZWFjb24vTmF2aWdhdG9yQmVhY29uLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2JlYWNvbi9OYXZpZ2F0b3JCZWFjb24uY3BwCShy ZXZpc2lvbiAyNTgwMDEpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2JlYWNvbi9OYXZpZ2F0 b3JCZWFjb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsNiArMTIxLDcgQEAgRXhjZXB0aW9u T3I8Ym9vbD4gTmF2aWdhdG9yQmVhY29uOjpzZW5kQgogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl cXVlc3QocGFyc2VkVXJsKTsKICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QoIlBPU1QiX3MpOwor ICAgIHJlcXVlc3Quc2V0UmVxdWVzdGVyKFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdGVyOjpCZWFj b24pOwogCiAgICAgUmVzb3VyY2VMb2FkZXJPcHRpb25zIG9wdGlvbnM7CiAgICAgb3B0aW9ucy5j cmVkZW50aWFscyA9IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6OkluY2x1ZGU7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCShyZXZpc2lvbiAyNTgwMDEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSw2 ICsxMTksOCBAQCB2b2lkIFBpbmdMb2FkZXI6OnNlbmRQaW5nKEZyYW1lJiBmcmFtZSwgCiAgICAg ICAgIHJldHVybjsKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KHBpbmdVUkwpOworICAg IHJlcXVlc3Quc2V0UmVxdWVzdGVyKFJlc291cmNlUmVxdWVzdDo6UmVxdWVzdGVyOjpQaW5nKTsK KwogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCiAgICAgaWYgKHByb2Nlc3NDb250ZW50 UnVsZUxpc3RzRm9yTG9hZChmcmFtZSwgcmVxdWVzdCwgeyBDb250ZW50RXh0ZW5zaW9uczo6UmVz b3VyY2VUeXBlOjpSYXcsIENvbnRlbnRFeHRlbnNpb25zOjpSZXNvdXJjZVR5cGU6OlBpbmcgfSkp CiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VSZXF1ZXN0QmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCShyZXZpc2lvbiAyNTgwMDEpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaAkod29y a2luZyBjb3B5KQpAQCAtMTY0LDcgKzE2NCw3IEBAIHB1YmxpYzoKICAgICBib29sIGhpZGRlbkZy b21JbnNwZWN0b3IoKSBjb25zdCB7IHJldHVybiBtX2hpZGRlbkZyb21JbnNwZWN0b3I7IH0KICAg ICB2b2lkIHNldEhpZGRlbkZyb21JbnNwZWN0b3IoYm9vbCBoaWRkZW5Gcm9tSW5zcGVjdG9yKSB7 IG1faGlkZGVuRnJvbUluc3BlY3RvciA9IGhpZGRlbkZyb21JbnNwZWN0b3I7IH0KIAotICAgIGVu dW0gY2xhc3MgUmVxdWVzdGVyIDogdWludDhfdCB7IFVuc3BlY2lmaWVkLCBNYWluLCBYSFIsIEZl dGNoLCBNZWRpYSwgSW1wb3J0U2NyaXB0cyB9OworICAgIGVudW0gY2xhc3MgUmVxdWVzdGVyIDog dWludDhfdCB7IFVuc3BlY2lmaWVkLCBNYWluLCBYSFIsIEZldGNoLCBNZWRpYSwgSW1wb3J0U2Ny aXB0cywgUGluZywgQmVhY29uIH07CiAgICAgUmVxdWVzdGVyIHJlcXVlc3RlcigpIGNvbnN0IHsg cmV0dXJuIG1fcmVxdWVzdGVyOyB9CiAgICAgdm9pZCBzZXRSZXF1ZXN0ZXIoUmVxdWVzdGVyIHJl cXVlc3RlcikgeyBtX3JlcXVlc3RlciA9IHJlcXVlc3RlcjsgfQogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2 aXNpb24gMjU4MDAxKQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwyMyBAQAorMjAyMC0wMy0wNiAgRGF2aWQgUXVlc2FkYSAgPGRhdmlkX3F1ZXNh ZGFAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBfV0tSZXNvdXJjZUxvYWRJbmZvLnJlc291cmNl VHlwZSBTUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwODcyMworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJlc291cmNlTG9hZEluZm8pOgorICAgICAg ICAqIFNoYXJlZC9SZXNvdXJjZUxvYWRJbmZvLmg6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNl TG9hZEluZm86OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZElu Zm86OmRlY29kZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElSZXNvdXJjZUxvYWRJbmZv Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNvdXJjZUxvYWRJbmZvLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNvdXJjZUxvYWRJbmZvLm1tOgor ICAgICAgICAodG9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGUpOgorICAgICAgICAoLVtf V0tSZXNvdXJjZUxvYWRJbmZvIHJlc291cmNlVHlwZV0pOgorICAgICAgICAoLVtfV0tSZXNvdXJj ZUxvYWRJbmZvIGluaXRXaXRoQ29kZXI6XSk6CisgICAgICAgICgtW19XS1Jlc291cmNlTG9hZElu Zm8gZW5jb2RlV2l0aENvZGVyOl0pOgorCiAyMDIwLTAzLTA2ICBLYXRlIENoZW5leSAgPGthdGhl cmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSByZWR1bmRhbnQgZmxhZ3Mg aW4gc2NyaXB0IGV2YWx1YXRpb24gY2hlY2tzCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAy NTgwMDEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1OSw3ICszNTksNjIgQEAgUmVzb3VyY2VMb2Fk SW5mbyBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OgogICAgICAgICB9CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9OwotICAgIAorCisgICAgYXV0byByZXNvdXJjZVR5cGUgPSBbXSAoV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6UmVxdWVzdGVyIHJlcXVlc3RlciwgV2ViQ29yZTo6RmV0 Y2hPcHRpb25zOjpEZXN0aW5hdGlvbiBkZXN0aW5hdGlvbikgeworICAgICAgICBzd2l0Y2ggKHJl cXVlc3RlcikgeworICAgICAgICBjYXNlIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6OlJl cXVlc3Rlcjo6WEhSOgorICAgICAgICAgICAgcmV0dXJuIFJlc291cmNlTG9hZEluZm86OlR5cGU6 OlhNTEhUVFBSZXF1ZXN0OworICAgICAgICBjYXNlIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJh c2U6OlJlcXVlc3Rlcjo6RmV0Y2g6CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkSW5m bzo6VHlwZTo6RmV0Y2g7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFz ZTo6UmVxdWVzdGVyOjpQaW5nOgorICAgICAgICAgICAgcmV0dXJuIFJlc291cmNlTG9hZEluZm86 OlR5cGU6OlBpbmc7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6 UmVxdWVzdGVyOjpCZWFjb246CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkSW5mbzo6 VHlwZTo6QmVhY29uOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIH0KKworICAgICAgICBzd2l0Y2ggKGRlc3RpbmF0aW9uKSB7CisgICAgICAgIGNhc2UgV2Vi Q29yZTo6RmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6RW1wdHlTdHJpbmc6CisgICAgICAgICAg ICByZXR1cm4gUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6T3RoZXI7CisgICAgICAgIGNhc2UgV2Vi Q29yZTo6RmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6QXVkaW86CisgICAgICAgICAgICByZXR1 cm4gUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6TWVkaWE7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6 RmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6RG9jdW1lbnQ6CisgICAgICAgICAgICByZXR1cm4g UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6RG9jdW1lbnQ7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6 RmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6RW1iZWQ6CisgICAgICAgICAgICByZXR1cm4gUmVz b3VyY2VMb2FkSW5mbzo6VHlwZTo6T2JqZWN0OworICAgICAgICBjYXNlIFdlYkNvcmU6OkZldGNo T3B0aW9uczo6RGVzdGluYXRpb246OkZvbnQ6CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VM b2FkSW5mbzo6VHlwZTo6Rm9udDsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpGZXRjaE9wdGlvbnM6 OkRlc3RpbmF0aW9uOjpJbWFnZToKKyAgICAgICAgICAgIHJldHVybiBSZXNvdXJjZUxvYWRJbmZv OjpUeXBlOjpJbWFnZTsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpGZXRjaE9wdGlvbnM6OkRlc3Rp bmF0aW9uOjpNYW5pZmVzdDoKKyAgICAgICAgICAgIHJldHVybiBSZXNvdXJjZUxvYWRJbmZvOjpU eXBlOjpBcHBsaWNhdGlvbk1hbmlmZXN0OworICAgICAgICBjYXNlIFdlYkNvcmU6OkZldGNoT3B0 aW9uczo6RGVzdGluYXRpb246Ok9iamVjdDoKKyAgICAgICAgICAgIHJldHVybiBSZXNvdXJjZUxv YWRJbmZvOjpUeXBlOjpPYmplY3Q7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RmV0Y2hPcHRpb25z OjpEZXN0aW5hdGlvbjo6UmVwb3J0OgorICAgICAgICAgICAgcmV0dXJuIFJlc291cmNlTG9hZElu Zm86OlR5cGU6OkNTUFJlcG9ydDsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpGZXRjaE9wdGlvbnM6 OkRlc3RpbmF0aW9uOjpTY3JpcHQ6CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkSW5m bzo6VHlwZTo6U2NyaXB0OworICAgICAgICBjYXNlIFdlYkNvcmU6OkZldGNoT3B0aW9uczo6RGVz dGluYXRpb246OlNlcnZpY2V3b3JrZXI6CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2Fk SW5mbzo6VHlwZTo6T3RoZXI7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RmV0Y2hPcHRpb25zOjpE ZXN0aW5hdGlvbjo6U2hhcmVkd29ya2VyOgorICAgICAgICAgICAgcmV0dXJuIFJlc291cmNlTG9h ZEluZm86OlR5cGU6Ok90aGVyOworICAgICAgICBjYXNlIFdlYkNvcmU6OkZldGNoT3B0aW9uczo6 RGVzdGluYXRpb246OlN0eWxlOgorICAgICAgICAgICAgcmV0dXJuIFJlc291cmNlTG9hZEluZm86 OlR5cGU6OlN0eWxlc2hlZXQ7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RmV0Y2hPcHRpb25zOjpE ZXN0aW5hdGlvbjo6VHJhY2s6CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkSW5mbzo6 VHlwZTo6TWVkaWE7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RmV0Y2hPcHRpb25zOjpEZXN0aW5h dGlvbjo6VmlkZW86CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6 TWVkaWE7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6 V29ya2VyOgorICAgICAgICAgICAgcmV0dXJuIFJlc291cmNlTG9hZEluZm86OlR5cGU6Ok90aGVy OworICAgICAgICBjYXNlIFdlYkNvcmU6OkZldGNoT3B0aW9uczo6RGVzdGluYXRpb246OlhzbHQ6 CisgICAgICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6WFNMVDsKKyAgICAg ICAgfQorCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gUmVz b3VyY2VMb2FkSW5mbzo6VHlwZTo6T3RoZXI7CisgICAgfTsKKwogICAgIHJldHVybiBSZXNvdXJj ZUxvYWRJbmZvIHsKICAgICAgICAgbV9yZXNvdXJjZUxvYWRJRCwKICAgICAgICAgbV9wYXJhbWV0 ZXJzLndlYkZyYW1lSUQsCkBAIC0zNjcsNyArNDIyLDggQEAgUmVzb3VyY2VMb2FkSW5mbyBOZXR3 b3JrUmVzb3VyY2VMb2FkZXI6OgogICAgICAgICBvcmlnaW5hbFJlcXVlc3QoKS51cmwoKSwKICAg ICAgICAgb3JpZ2luYWxSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpLAogICAgICAgICBXYWxsVGltZTo6 bm93KCksCi0gICAgICAgIGxvYWRlZEZyb21DYWNoZShtX3Jlc3BvbnNlKQorICAgICAgICBsb2Fk ZWRGcm9tQ2FjaGUobV9yZXNwb25zZSksCisgICAgICAgIHJlc291cmNlVHlwZShvcmlnaW5hbFJl cXVlc3QoKS5yZXF1ZXN0ZXIoKSwgbV9wYXJhbWV0ZXJzLm9wdGlvbnMuZGVzdGluYXRpb24pCiAg ICAgfTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2FkSW5mby5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1Jlc291cmNlTG9hZEluZm8uaAko cmV2aXNpb24gMjU4MDAxKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvUmVzb3VyY2VMb2FkSW5m by5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSwyNCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsK IAogc3RydWN0IFJlc291cmNlTG9hZEluZm8gewogCisgICAgZW51bSBjbGFzcyBUeXBlIDogdWlu dDhfdCB7CisgICAgICAgIEFwcGxpY2F0aW9uTWFuaWZlc3QsCisgICAgICAgIEJlYWNvbiwKKyAg ICAgICAgQ1NQUmVwb3J0LAorICAgICAgICBEb2N1bWVudCwKKyAgICAgICAgRmV0Y2gsCisgICAg ICAgIEZvbnQsCisgICAgICAgIEltYWdlLAorICAgICAgICBNZWRpYSwKKyAgICAgICAgT2JqZWN0 LAorICAgICAgICBPdGhlciwKKyAgICAgICAgUGluZywKKyAgICAgICAgU2NyaXB0LAorICAgICAg ICBTdHlsZXNoZWV0LAorICAgICAgICBYTUxIVFRQUmVxdWVzdCwKKyAgICAgICAgWFNMVAorICAg IH07CisgICAgCiAgICAgTmV0d29ya1Jlc291cmNlTG9hZElkZW50aWZpZXIgcmVzb3VyY2VMb2Fk SUQ7CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlEOwogICAg IE9wdGlvbmFsPFdlYkNvcmU6OkZyYW1lSWRlbnRpZmllcj4gcGFyZW50RnJhbWVJRDsKQEAgLTQy LDcgKzYwLDggQEAgc3RydWN0IFJlc291cmNlTG9hZEluZm8gewogICAgIFN0cmluZyBvcmlnaW5h bEhUVFBNZXRob2Q7CiAgICAgV2FsbFRpbWUgZXZlbnRUaW1lc3RhbXA7CiAgICAgYm9vbCBsb2Fk ZWRGcm9tQ2FjaGUgeyBmYWxzZSB9OwotICAgIAorICAgIFR5cGUgdHlwZSB7IFR5cGU6Ok90aGVy IH07CisKICAgICB2b2lkIGVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAg ewogICAgICAgICBlbmNvZGVyIDw8IHJlc291cmNlTG9hZElEOwpAQCAtNTIsNiArNzEsNyBAQCBz dHJ1Y3QgUmVzb3VyY2VMb2FkSW5mbyB7CiAgICAgICAgIGVuY29kZXIgPDwgb3JpZ2luYWxIVFRQ TWV0aG9kOwogICAgICAgICBlbmNvZGVyIDw8IGV2ZW50VGltZXN0YW1wOwogICAgICAgICBlbmNv ZGVyIDw8IGxvYWRlZEZyb21DYWNoZTsKKyAgICAgICAgZW5jb2RlciA8PCB0eXBlOwogICAgIH0K IAogICAgIHN0YXRpYyBPcHRpb25hbDxSZXNvdXJjZUxvYWRJbmZvPiBkZWNvZGUoSVBDOjpEZWNv ZGVyJiBkZWNvZGVyKQpAQCAtOTEsNiArMTExLDExIEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRJbmZv IHsKICAgICAgICAgaWYgKCFsb2FkZWRGcm9tQ2FjaGUpCiAgICAgICAgICAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogCisgICAgICAgIE9wdGlvbmFsPFR5cGU+IHR5cGU7CisgICAgICAgIGRlY29k ZXIgPj4gdHlwZTsKKyAgICAgICAgaWYgKCF0eXBlKQorICAgICAgICAgICAgcmV0dXJuIFdURjo6 bnVsbG9wdDsKKwogICAgICAgICByZXR1cm4ge3sKICAgICAgICAgICAgIFdURk1vdmUoKnJlc291 cmNlTG9hZElEKSwKICAgICAgICAgICAgIFdURk1vdmUoKmZyYW1lSUQpLApAQCAtOTksOCArMTI0 LDM0IEBAIHN0cnVjdCBSZXNvdXJjZUxvYWRJbmZvIHsKICAgICAgICAgICAgIFdURk1vdmUoKm9y aWdpbmFsSFRUUE1ldGhvZCksCiAgICAgICAgICAgICBXVEZNb3ZlKCpldmVudFRpbWVzdGFtcCks CiAgICAgICAgICAgICBXVEZNb3ZlKCpsb2FkZWRGcm9tQ2FjaGUpLAorICAgICAgICAgICAgV1RG TW92ZSgqdHlwZSksCiAgICAgICAgIH19OwogICAgIH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdAorCituYW1lc3BhY2UgV1RGIHsKKwordGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxX ZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OlR5cGU+IHsKKyAgICB1c2luZyB2YWx1ZXMgPSBFbnVt VmFsdWVzPAorICAgICAgICBXZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OlR5cGUsCisgICAgICAg IFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6QXBwbGljYXRpb25NYW5pZmVzdCwKKyAg ICAgICAgV2ViS2l0OjpSZXNvdXJjZUxvYWRJbmZvOjpUeXBlOjpCZWFjb24sCisgICAgICAgIFdl YktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6Q1NQUmVwb3J0LAorICAgICAgICBXZWJLaXQ6 OlJlc291cmNlTG9hZEluZm86OlR5cGU6OkRvY3VtZW50LAorICAgICAgICBXZWJLaXQ6OlJlc291 cmNlTG9hZEluZm86OlR5cGU6OkZldGNoLAorICAgICAgICBXZWJLaXQ6OlJlc291cmNlTG9hZElu Zm86OlR5cGU6OkZvbnQsCisgICAgICAgIFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6 SW1hZ2UsCisgICAgICAgIFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6TWVkaWEsCisg ICAgICAgIFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6T2JqZWN0LAorICAgICAgICBX ZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OlR5cGU6Ok90aGVyLAorICAgICAgICBXZWJLaXQ6OlJl c291cmNlTG9hZEluZm86OlR5cGU6OlBpbmcsCisgICAgICAgIFdlYktpdDo6UmVzb3VyY2VMb2Fk SW5mbzo6VHlwZTo6U2NyaXB0LAorICAgICAgICBXZWJLaXQ6OlJlc291cmNlTG9hZEluZm86OlR5 cGU6OlN0eWxlc2hlZXQsCisgICAgICAgIFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6 WE1MSFRUUFJlcXVlc3QsCisgICAgICAgIFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6 WFNMVAorICAgID47Cit9OworCit9IC8vIG5hbWVzcGFjZSBXVEYKSW5kZXg6IFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9BUElSZXNvdXJjZUxvYWRJbmZvLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVJlc291cmNlTG9hZEluZm8uaAkocmV2aXNpb24g MjU4MDAxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVJlc291cmNlTG9hZElu Zm8uaAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAgICAgY29uc3Qg V1RGOjpTdHJpbmcmIG9yaWdpbmFsSFRUUE1ldGhvZCgpIGNvbnN0IHsgcmV0dXJuIG1faW5mby5v cmlnaW5hbEhUVFBNZXRob2Q7IH0KICAgICBXYWxsVGltZSBldmVudFRpbWVzdGFtcCgpIGNvbnN0 IHsgcmV0dXJuIG1faW5mby5ldmVudFRpbWVzdGFtcDsgfQogICAgIGJvb2wgbG9hZGVkRnJvbUNh Y2hlKCkgY29uc3QgeyByZXR1cm4gbV9pbmZvLmxvYWRlZEZyb21DYWNoZTsgfQorICAgIFdlYktp dDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZSByZXNvdXJjZUxvYWRUeXBlKCkgY29uc3QgeyByZXR1 cm4gbV9pbmZvLnR5cGU7IH0KIAogcHJpdmF0ZToKICAgICBjb25zdCBXZWJLaXQ6OlJlc291cmNl TG9hZEluZm8gbV9pbmZvOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1Jlc291cmNlTG9hZEluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLUmVzb3VyY2VMb2FkSW5mby5oCShyZXZpc2lvbiAyNTgwMDEpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUmVzb3VyY2VMb2FkSW5mby5o CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSwyNCBAQAogCiBOU19BU1NVTUVfTk9OTlVMTF9C RUdJTgogCit0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tSZXNvdXJjZUxvYWRJbmZvUmVz b3VyY2VUeXBlKSB7CisgICAgX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZUFwcGxpY2F0 aW9uTWFuaWZlc3QsCisgICAgX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZUJlYWNvbiwK KyAgICBfV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlQ1NQUmVwb3J0LAorICAgIF9XS1Jl c291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVEb2N1bWVudCwKKyAgICBfV0tSZXNvdXJjZUxvYWRJ bmZvUmVzb3VyY2VUeXBlSW1hZ2UsCisgICAgX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlw ZUZldGNoLAorICAgIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVGb250LAorICAgIF9X S1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVNZWRpYSwKKyAgICBfV0tSZXNvdXJjZUxvYWRJ bmZvUmVzb3VyY2VUeXBlT2JqZWN0LAorICAgIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5 cGVQaW5nLAorICAgIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVTY3JpcHQsCisgICAg X1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZVN0eWxlc2hlZXQsCisgICAgX1dLUmVzb3Vy Y2VMb2FkSW5mb1Jlc291cmNlVHlwZVhNTEhUVFBSZXF1ZXN0LAorICAgIF9XS1Jlc291cmNlTG9h ZEluZm9SZXNvdXJjZVR5cGVYU0xULAorICAgIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5 cGVPdGhlciA9IC0xLAorfTsKKwogV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp LCBpb3MoV0tfSU9TX1RCQSkpCiBAaW50ZXJmYWNlIF9XS1Jlc291cmNlTG9hZEluZm8gOiBOU09i amVjdCA8TlNTZWN1cmVDb2Rpbmc+CiAKQEAgLTQyLDYgKzYwLDcgQEAgV0tfQ0xBU1NfQVZBSUxB QkxFKG1hY29zKFdLX01BQ19UQkEpLCBpbwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5 KSBOU1N0cmluZyAqb3JpZ2luYWxIVFRQTWV0aG9kOwogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBOU0RhdGUgKmV2ZW50VGltZXN0YW1wOwogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBCT09MIGxvYWRlZEZyb21DYWNoZTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFk b25seSkgX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZSByZXNvdXJjZVR5cGU7CiAKIEBl bmQKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Jlc291cmNl TG9hZEluZm8ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1Jlc291cmNlTG9hZEluZm8ubW0JKHJldmlzaW9uIDI1ODAwMSkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNvdXJjZUxvYWRJbmZvLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0zMiw2ICszMiw0NyBAQAogI2ltcG9ydCAiX1dLRnJhbWVIYW5kbGVJbnRlcm5h bC5oIgogI2ltcG9ydCAiX1dLUmVzb3VyY2VMb2FkSW5mb0ludGVybmFsLmgiCiAKK3N0YXRpYyBf V0tSZXNvdXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlIHRvV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3Vy Y2VUeXBlKFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZSB0eXBlKQoreworICAgIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CisgICAgc3dpdGNoICh0eXBlKSB7CisgICAgY2FzZSBSZXNvdXJj ZUxvYWRJbmZvOjpUeXBlOjpBcHBsaWNhdGlvbk1hbmlmZXN0OgorICAgICAgICByZXR1cm4gX1dL UmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZUFwcGxpY2F0aW9uTWFuaWZlc3Q7CisgICAgY2Fz ZSBSZXNvdXJjZUxvYWRJbmZvOjpUeXBlOjpCZWFjb246CisgICAgICAgIHJldHVybiBfV0tSZXNv dXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlQmVhY29uOworICAgIGNhc2UgUmVzb3VyY2VMb2FkSW5m bzo6VHlwZTo6Q1NQUmVwb3J0OgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VMb2FkSW5mb1Jl c291cmNlVHlwZUNTUFJlcG9ydDsKKyAgICBjYXNlIFJlc291cmNlTG9hZEluZm86OlR5cGU6OkRv Y3VtZW50OgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZURv Y3VtZW50OworICAgIGNhc2UgUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6RmV0Y2g6CisgICAgICAg IHJldHVybiBfV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlRmV0Y2g7CisgICAgY2FzZSBS ZXNvdXJjZUxvYWRJbmZvOjpUeXBlOjpGb250OgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VM b2FkSW5mb1Jlc291cmNlVHlwZUZvbnQ7CisgICAgY2FzZSBSZXNvdXJjZUxvYWRJbmZvOjpUeXBl OjpJbWFnZToKKyAgICAgICAgcmV0dXJuIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVJ bWFnZTsKKyAgICBjYXNlIFJlc291cmNlTG9hZEluZm86OlR5cGU6Ok1lZGlhOgorICAgICAgICBy ZXR1cm4gX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZU1lZGlhOworICAgIGNhc2UgUmVz b3VyY2VMb2FkSW5mbzo6VHlwZTo6T2JqZWN0OgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VM b2FkSW5mb1Jlc291cmNlVHlwZU9iamVjdDsKKyAgICBjYXNlIFJlc291cmNlTG9hZEluZm86OlR5 cGU6Ok90aGVyOgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlw ZU90aGVyOworICAgIGNhc2UgUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6UGluZzoKKyAgICAgICAg cmV0dXJuIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVQaW5nOworICAgIGNhc2UgUmVz b3VyY2VMb2FkSW5mbzo6VHlwZTo6U2NyaXB0OgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VM b2FkSW5mb1Jlc291cmNlVHlwZVNjcmlwdDsKKyAgICBjYXNlIFJlc291cmNlTG9hZEluZm86OlR5 cGU6OlN0eWxlc2hlZXQ6CisgICAgICAgIHJldHVybiBfV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3Vy Y2VUeXBlU3R5bGVzaGVldDsKKyAgICBjYXNlIFJlc291cmNlTG9hZEluZm86OlR5cGU6OlhNTEhU VFBSZXF1ZXN0OgorICAgICAgICByZXR1cm4gX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlw ZVhNTEhUVFBSZXF1ZXN0OworICAgIGNhc2UgUmVzb3VyY2VMb2FkSW5mbzo6VHlwZTo6WFNMVDoK KyAgICAgICAgcmV0dXJuIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVYU0xUOworICAg IH0KKyAgICAKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gX1dLUmVzb3Vy Y2VMb2FkSW5mb1Jlc291cmNlVHlwZU90aGVyOworfQorCisKIEBpbXBsZW1lbnRhdGlvbiBfV0tS ZXNvdXJjZUxvYWRJbmZvCiAKIC0gKHZvaWQpZGVhbGxvYwpAQCAtNzksNiArMTIwLDExIEBAIC0g KEJPT0wpbG9hZGVkRnJvbUNhY2hlCiAgICAgcmV0dXJuIF9pbmZvLT5sb2FkZWRGcm9tQ2FjaGUo KTsKIH0KIAorLSAoX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZSlyZXNvdXJjZVR5cGUK K3sKKyAgICByZXR1cm4gdG9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGUoX2luZm8tPnJl c291cmNlTG9hZFR5cGUoKSk7Cit9CisKIC0gKEFQSTo6T2JqZWN0JilfYXBpT2JqZWN0CiB7CiAg ICAgcmV0dXJuICpfaW5mbzsKQEAgLTEzNiw2ICsxODIsMTIgQEAgLSAoaW5zdGFuY2V0eXBlKWlu aXRXaXRoQ29kZXI6KE5TQ29kZXIgKgogICAgICAgICByZXR1cm4gbmlsOwogICAgIH0KIAorICAg IE5TTnVtYmVyICp0eXBlID0gW2NvZGVyIGRlY29kZU9iamVjdE9mQ2xhc3M6W05TTnVtYmVyIGNs YXNzXSBmb3JLZXk6QCJ0eXBlIl07CisgICAgaWYgKCF0eXBlKSB7CisgICAgICAgIFtzZWxmIHJl bGVhc2VdOworICAgICAgICByZXR1cm4gbmlsOworICAgIH0KKwogICAgIFdlYktpdDo6UmVzb3Vy Y2VMb2FkSW5mbyBpbmZvIHsKICAgICAgICAgbWFrZU9iamVjdElkZW50aWZpZXI8V2ViS2l0OjpO ZXR3b3JrUmVzb3VyY2VMb2FkSWRlbnRpZmllclR5cGU+KHJlc291cmNlTG9hZElELnVuc2lnbmVk TG9uZ0xvbmdWYWx1ZSksCiAgICAgICAgIG1ha2VPYmplY3RJZGVudGlmaWVyPFdlYkNvcmU6OkZy YW1lSWRlbnRpZmllclR5cGU+KGZyYW1lLnVuc2lnbmVkTG9uZ0xvbmdWYWx1ZSksCkBAIC0xNDMs NyArMTk1LDggQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQ29kZXI6KE5TQ29kZXIgKgogICAg ICAgICBvcmlnaW5hbFVSTCwKICAgICAgICAgb3JpZ2luYWxIVFRQTWV0aG9kLAogICAgICAgICBX YWxsVGltZTo6ZnJvbVJhd1NlY29uZHMoZXZlbnRUaW1lc3RhbXAudGltZUludGVydmFsU2luY2Ux OTcwKSwKLSAgICAgICAgc3RhdGljX2Nhc3Q8Ym9vbD4obG9hZGVkRnJvbUNhY2hlLmJvb2xWYWx1 ZSkKKyAgICAgICAgc3RhdGljX2Nhc3Q8Ym9vbD4obG9hZGVkRnJvbUNhY2hlLmJvb2xWYWx1ZSks CisgICAgICAgIHN0YXRpY19jYXN0PFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbzo6VHlwZT4odHlw ZS51bnNpZ25lZENoYXJWYWx1ZSksCiAgICAgfTsKIAogICAgIEFQSTo6T2JqZWN0Ojpjb25zdHJ1 Y3RJbldyYXBwZXI8QVBJOjpSZXNvdXJjZUxvYWRJbmZvPihzZWxmLCBXVEZNb3ZlKGluZm8pKTsK QEAgLTE2MCw2ICsyMTMsNyBAQCAtICh2b2lkKWVuY29kZVdpdGhDb2RlcjooTlNDb2RlciAqKWNv ZGVyCiAgICAgW2NvZGVyIGVuY29kZU9iamVjdDpzZWxmLm9yaWdpbmFsSFRUUE1ldGhvZCBmb3JL ZXk6QCJvcmlnaW5hbEhUVFBNZXRob2QiXTsKICAgICBbY29kZXIgZW5jb2RlT2JqZWN0OnNlbGYu ZXZlbnRUaW1lc3RhbXAgZm9yS2V5OkAiZXZlbnRUaW1lc3RhbXAiXTsKICAgICBbY29kZXIgZW5j b2RlT2JqZWN0OkAoc2VsZi5sb2FkZWRGcm9tQ2FjaGUpIGZvcktleTpAImxvYWRlZEZyb21DYWNo ZSJdOworICAgIFtjb2RlciBlbmNvZGVPYmplY3Q6QChzdGF0aWNfY2FzdDx1bnNpZ25lZCBjaGFy PihfaW5mby0+cmVzb3VyY2VMb2FkVHlwZSgpKSkgZm9yS2V5OkAidHlwZSJdOwogfQogCiBAZW5k CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAyNTgwMTEpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxMyBAQAorMjAyMC0wMy0wNiAgRGF2aWQgUXVlc2FkYSAgPGRhdmlkX3F1ZXNhZGFAYXBw bGUuY29tPgorCisgICAgICAgIEFkZCBfV0tSZXNvdXJjZUxvYWRJbmZvLnJlc291cmNlVHlwZSBT UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODcy MworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tOgor ICAgICAgICAoVEVTVCk6CisKIDIwMjAtMDMtMDYgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBs ZS5jb20+CiAKICAgICAgICAgVUlQcm9jZXNzIGNyYXNoIGFmdGVyIHVzaW5nIF9wcmVwYXJlRm9y TW92ZVRvV2luZG93LCB0aGVuIGRlYWxsb2NhdGluZyB0aGUgV0tXZWJWaWV3IGJlZm9yZSBtb3Zp bmcgdG8gdGhlIHdpbmRvdwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tCShyZXZpc2lv biAyNTgwMDEpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291 cmNlTG9hZERlbGVnYXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTksNiArMTk5LDczIEBAIFRF U1QoUmVzb3VyY2VMb2FkRGVsZWdhdGUsIFJlZGlyZWN0KQogICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZG9uZSk7CiB9CiAKK1RFU1QoUmVzb3VyY2VMb2FkRGVsZWdhdGUsIFJlc291cmNl VHlwZSkKK3sKKyAgICBjb25zdCBjaGFyKiB0ZXN0SlMgPSBSIlRFU1RKUygKKyAgICBmdW5jdGlv biBsb2FkTW9yZVRoaW5nc0FmdGVyRmV0Y2hBbmRYSFIoKSB7CisgICAgICAgIG5hdmlnYXRvci5z ZW5kQmVhY29uKCdiZWFjb25UYXJnZXQnKTsKKworICAgICAgICB2YXIgaW1nID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgnaW1nJyk7CisgICAgICAgIGltZy5zcmMgPSAnaW1hZ2VTb3VyY2UnOwor ICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGltZyk7CisKKyAgICAgICAgdmFyIHN0 eWxlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnbGluaycpOworICAgICAgICBzdHlsZS5yZWwg PSAnc3R5bGVzaGVldCc7CisgICAgICAgIHN0eWxlLnR5cGUgPSAndGV4dC9jc3MnOworICAgICAg ICBzdHlsZS5ocmVmID0gJ3N0eWxlU291cmNlJzsKKyAgICAgICAgZG9jdW1lbnQuaGVhZC5hcHBl bmRDaGlsZChzdHlsZSk7CisgICAgfQorICAgIGZldGNoKCdmZXRjaFRhcmdldCcsIHsgYm9keTog J2E9YiZjPWQnLCBtZXRob2Q6ICdwb3N0J30pLnRoZW4oKCk9PnsKKyAgICAgICAgdmFyIHhociA9 IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworICAgICAgICB4aHIub25yZWFkeXN0YXRlY2hhbmdlID0g ZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgaWYgKHRoaXMucmVhZHlTdGF0ZSA9PSA0KQorICAg ICAgICAgICAgICAgIGxvYWRNb3JlVGhpbmdzQWZ0ZXJGZXRjaEFuZFhIUigpOworICAgICAgICB9 OworICAgICAgICB4aHIub3BlbignR0VUJywgJ3hoclRhcmdldCcpOworICAgICAgICB4aHIuc2Vu ZCgpOworICAgIH0pCisgICAgKVRFU1RKUyI7CisgICAgVGVzdFdlYktpdEFQSTo6SFRUUFNlcnZl ciBzZXJ2ZXIoeworICAgICAgICB7ICIvIiwgeyAiPHNjcmlwdCBzcmM9J3NjcmlwdFNyYyc+PC9z Y3JpcHQ+PGRpdj50ZXh0IG5lZWRpbmcgYSBmb250PC9kaXY+IiB9IH0sCisgICAgICAgIHsgIi9z Y3JpcHRTcmMiLCB7IHt7ICJDb250ZW50LVR5cGUiLCAiYXBwbGljYXRpb24vamF2YXNjcmlwdCIg fX0sIHRlc3RKUyB9IH0sCisgICAgICAgIHsgIi9mZXRjaFRhcmdldCIsIHsgImhpIiB9IH0sCisg ICAgICAgIHsgIi94aHJUYXJnZXQiLCB7IHt7ICJDb250ZW50LVR5cGUiLCAiYXBwbGljYXRpb24v b2N0ZXQtc3RyZWFtIiB9fSwgImhpIiB9IH0sCisgICAgICAgIHsgIi9iZWFjb25UYXJnZXQiLCB7 ICJoaSIgfSB9LAorICAgICAgICB7ICIvaW1hZ2VTb3VyY2UiLCB7ICJub3QgcmVhbGx5IGFuIGlt YWdlIiB9IH0sCisgICAgICAgIHsgIi9zdHlsZVNvdXJjZSIsIHsgIkBmb250LWZhY2UgeyBmb250 LWZhbWlseTogVGVzdEZvbnRGYW1pbHk7IHNyYzogdXJsKGZvbnRTb3VyY2UpIH0gZGl2IHsgZm9u dC1mYW1pbHk6IFRlc3RGb250RmFtaWx5IH0iIH0gfSwKKyAgICAgICAgeyAiL2ZvbnRTb3VyY2Ui LCB7ICJub3QgcmVhbGx5IGEgZm9udCIgfSB9LAorICAgIH0pOworCisgICAgX19ibG9jayBWZWN0 b3I8UmV0YWluUHRyPF9XS1Jlc291cmNlTG9hZEluZm8+PiBsb2FkSW5mb3M7CisKKyAgICBfX2Js b2NrIHNpemVfdCByZXF1ZXN0Q291bnQgPSAwOworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5T KFtUZXN0UmVzb3VyY2VMb2FkRGVsZWdhdGUgbmV3XSk7CisgICAgW2RlbGVnYXRlIHNldERpZFNl bmRSZXF1ZXN0Ol4oV0tXZWJWaWV3ICp3ZWJWaWV3LCBfV0tSZXNvdXJjZUxvYWRJbmZvICpsb2Fk SW5mbywgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KSB7CisgICAgICAgIGxvYWRJbmZvcy5hcHBlbmQo bG9hZEluZm8pOworICAgICAgICByZXF1ZXN0Q291bnQrKzsKKyAgICB9XTsKKworICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXddKTsKKyAgICBbd2ViVmlldyBfc2V0UmVz b3VyY2VMb2FkRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnNlcnZlci5yZXF1ZXN0KCldOworCisgICAgVmVjdG9yPF9XS1Jlc291cmNlTG9hZEluZm9S ZXNvdXJjZVR5cGU+IGV4cGVjdGVkVHlwZXMgeworICAgICAgICBfV0tSZXNvdXJjZUxvYWRJbmZv UmVzb3VyY2VUeXBlRG9jdW1lbnQsCisgICAgICAgIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJj ZVR5cGVTY3JpcHQsCisgICAgICAgIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVGZXRj aCwKKyAgICAgICAgX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZVhNTEhUVFBSZXF1ZXN0 LAorICAgICAgICBfV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlQmVhY29uLAorICAgICAg ICBfV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlSW1hZ2UsCisgICAgICAgIF9XS1Jlc291 cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVTdHlsZXNoZWV0LAorICAgICAgICBfV0tSZXNvdXJjZUxv YWRJbmZvUmVzb3VyY2VUeXBlRm9udCwKKyAgICB9OworCisgICAgd2hpbGUgKHJlcXVlc3RDb3Vu dCA8IGV4cGVjdGVkVHlwZXMuc2l6ZSgpKQorICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpz cGluUnVuTG9vcCgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZXhwZWN0ZWRUeXBlcy5z aXplKCk7ICsraSkKKyAgICAgICAgRVhQRUNUX0VRKGxvYWRJbmZvc1tpXS5nZXQoKS5yZXNvdXJj ZVR5cGUsIGV4cGVjdGVkVHlwZXNbaV0pOworfQorCiBURVNUKFJlc291cmNlTG9hZERlbGVnYXRl LCBMb2FkSW5mbykKIHsKICAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNlcnZlcih7CkBA IC0yNzQsMjcgKzM0MSwyOCBAQCBURVNUKFJlc291cmNlTG9hZERlbGVnYXRlLCBMb2FkSW5mbykK ICAgICBFWFBFQ1RfRVEobG9hZEluZm9zWzZdLmdldCgpLnJlc291cmNlTG9hZElELCBsb2FkSW5m b3NbN10uZ2V0KCkucmVzb3VyY2VMb2FkSUQpOwogICAgIEVYUEVDVF9FUShsb2FkSW5mb3NbNl0u Z2V0KCkucmVzb3VyY2VMb2FkSUQsIGxvYWRJbmZvc1s4XS5nZXQoKS5yZXNvdXJjZUxvYWRJRCk7 CiAgICAgRVhQRUNUX05FKGxvYWRJbmZvc1s2XS5nZXQoKS5yZXNvdXJjZUxvYWRJRCwgbG9hZElu Zm9zWzBdLmdldCgpLnJlc291cmNlTG9hZElEKTsKLSAgICBhdXRvIGNoZWNrRnJhbWVzID0gXihz aXplX3QgaW5kZXgsIF9XS0ZyYW1lSGFuZGxlICpleHBlY3RlZEZyYW1lLCBfV0tGcmFtZUhhbmRs ZSAqZXhwZWN0ZWRQYXJlbnQpIHsKKyAgICBhdXRvIGNoZWNrRnJhbWVzID0gXihzaXplX3QgaW5k ZXgsIF9XS0ZyYW1lSGFuZGxlICpleHBlY3RlZEZyYW1lLCBfV0tGcmFtZUhhbmRsZSAqZXhwZWN0 ZWRQYXJlbnQsIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGUgZXhwZWN0ZWRUeXBlKSB7 CiAgICAgICAgIF9XS1Jlc291cmNlTG9hZEluZm8gKmluZm8gPSBsb2FkSW5mb3NbaW5kZXhdLmdl dCgpOwogICAgICAgICBFWFBFQ1RfRVEoISFpbmZvLmZyYW1lLCAhIWV4cGVjdGVkRnJhbWUpOwog ICAgICAgICBFWFBFQ1RfRVEoISFpbmZvLnBhcmVudEZyYW1lLCAhIWV4cGVjdGVkUGFyZW50KTsK ICAgICAgICAgRVhQRUNUX0VRKGluZm8uZnJhbWUuZnJhbWVJRCwgZXhwZWN0ZWRGcmFtZS5mcmFt ZUlEKTsKICAgICAgICAgRVhQRUNUX0VRKGluZm8ucGFyZW50RnJhbWUuZnJhbWVJRCwgZXhwZWN0 ZWRQYXJlbnQuZnJhbWVJRCk7CisgICAgICAgIEVYUEVDVF9FUShpbmZvLnJlc291cmNlVHlwZSwg ZXhwZWN0ZWRUeXBlKTsKICAgICB9OwogICAgIF9XS0ZyYW1lSGFuZGxlICptYWluID0gbG9hZElu Zm9zWzBdLmdldCgpLmZyYW1lOwogICAgIF9XS0ZyYW1lSGFuZGxlICpzdWIgPSBsb2FkSW5mb3Nb OF0uZ2V0KCkuZnJhbWU7CiAgICAgRVhQRUNUX1RSVUUoISFtYWluKTsKICAgICBFWFBFQ1RfVFJV RSghIXN1Yik7CiAgICAgRVhQRUNUX1RSVUUobWFpbi5mcmFtZUlEICE9IHN1Yi5mcmFtZUlEKTsK LSAgICBjaGVja0ZyYW1lcygwLCBtYWluLCBuaWwpOwotICAgIGNoZWNrRnJhbWVzKDEsIG1haW4s IG5pbCk7Ci0gICAgY2hlY2tGcmFtZXMoMiwgbWFpbiwgbmlsKTsKLSAgICBjaGVja0ZyYW1lcygz LCBzdWIsIG1haW4pOwotICAgIGNoZWNrRnJhbWVzKDQsIHN1YiwgbWFpbik7Ci0gICAgY2hlY2tG cmFtZXMoNSwgc3ViLCBtYWluKTsKLSAgICBjaGVja0ZyYW1lcyg2LCBzdWIsIG1haW4pOwotICAg IGNoZWNrRnJhbWVzKDcsIHN1YiwgbWFpbik7Ci0gICAgY2hlY2tGcmFtZXMoOCwgc3ViLCBtYWlu KTsKKyAgICBjaGVja0ZyYW1lcygwLCBtYWluLCBuaWwsIF9XS1Jlc291cmNlTG9hZEluZm9SZXNv dXJjZVR5cGVEb2N1bWVudCk7CisgICAgY2hlY2tGcmFtZXMoMSwgbWFpbiwgbmlsLCBfV0tSZXNv dXJjZUxvYWRJbmZvUmVzb3VyY2VUeXBlRG9jdW1lbnQpOworICAgIGNoZWNrRnJhbWVzKDIsIG1h aW4sIG5pbCwgX1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZURvY3VtZW50KTsKKyAgICBj aGVja0ZyYW1lcygzLCBzdWIsIG1haW4sIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVE b2N1bWVudCk7CisgICAgY2hlY2tGcmFtZXMoNCwgc3ViLCBtYWluLCBfV0tSZXNvdXJjZUxvYWRJ bmZvUmVzb3VyY2VUeXBlRG9jdW1lbnQpOworICAgIGNoZWNrRnJhbWVzKDUsIHN1YiwgbWFpbiwg X1dLUmVzb3VyY2VMb2FkSW5mb1Jlc291cmNlVHlwZURvY3VtZW50KTsKKyAgICBjaGVja0ZyYW1l cyg2LCBzdWIsIG1haW4sIF9XS1Jlc291cmNlTG9hZEluZm9SZXNvdXJjZVR5cGVGZXRjaCk7Cisg ICAgY2hlY2tGcmFtZXMoNywgc3ViLCBtYWluLCBfV0tSZXNvdXJjZUxvYWRJbmZvUmVzb3VyY2VU eXBlRmV0Y2gpOworICAgIGNoZWNrRnJhbWVzKDgsIHN1YiwgbWFpbiwgX1dLUmVzb3VyY2VMb2Fk SW5mb1Jlc291cmNlVHlwZUZldGNoKTsKIAogICAgIEVYUEVDVF9FUShvdGhlclBhcmFtZXRlcnMu c2l6ZSgpLCAxMnVsbCk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKE5TU3RyaW5nRnJvbUNsYXNzKFtv dGhlclBhcmFtZXRlcnNbMF0gY2xhc3NdKSwgIk5TTXV0YWJsZVVSTFJlcXVlc3QiKTsKQEAgLTMy NSw3ICszOTMsNyBAQCBURVNUKFJlc291cmNlTG9hZERlbGVnYXRlLCBMb2FkSW5mbykKICAgICBf V0tSZXNvdXJjZUxvYWRJbmZvICpvcmlnaW5hbCA9IGxvYWRJbmZvc1swXS5nZXQoKTsKICAgICBO U0Vycm9yICplcnJvciA9IG5pbDsKICAgICBOU0RhdGEgKmFyY2hpdmVEYXRhID0gW05TS2V5ZWRB cmNoaXZlciBhcmNoaXZlZERhdGFXaXRoUm9vdE9iamVjdDpvcmlnaW5hbCByZXF1aXJpbmdTZWN1 cmVDb2Rpbmc6WUVTIGVycm9yOiZlcnJvcl07Ci0gICAgRVhQRUNUX0VRKGFyY2hpdmVEYXRhLmxl bmd0aCwgNTg5dWxsKTsKKyAgICBFWFBFQ1RfRVEoYXJjaGl2ZURhdGEubGVuZ3RoLCA2MDd1bGwp OwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7CiAgICAgX1dLUmVzb3VyY2VMb2FkSW5mbyAqZGVz ZXJpYWxpemVkID0gW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmplY3RPZkNsYXNzOltf V0tSZXNvdXJjZUxvYWRJbmZvIGNsYXNzXSBmcm9tRGF0YTphcmNoaXZlRGF0YSBlcnJvcjomZXJy b3JdOwogICAgIEVYUEVDVF9GQUxTRShlcnJvcik7Cg==