133033 2014-05-17 14:52:02 -0700 Replace WKContextSetDatabaseDirectory with two WKContextConfiguration parameters 2014-11-27 13:47:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 139080 1 andersca andersca oldest_to_newest 1009998 0 andersca 2014-05-17 14:52:02 -0700 Replace WKContextSetDatabaseDirectory with two WKContextConfiguration parameters 1009999 1 231638 andersca 2014-05-17 14:58:59 -0700 Created attachment 231638 Patch 1010004 2 andersca 2014-05-17 15:31:28 -0700 Committed r168999: <http://trac.webkit.org/changeset/168999> 231638 2014-05-17 14:58:59 -0700 2014-05-17 15:08:47 -0700 Patch bug-133033-20140517215836.patch text/plain 25209 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDA3Zjg1ZTAwZTRmZDNm NGFlYTljNDVlYmViZmRiNGY5YmMxMTBjMi4uZjg2MGU3NDJkOGJkMDQ1MzBmYjc3NjE5NDk5ZTQy ZmU2MjgyZGZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDczIEBACiAyMDE0LTA1LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVwbGFjZSBXS0Nv bnRleHRTZXREYXRhYmFzZURpcmVjdG9yeSB3aXRoIHR3byBXS0NvbnRleHRDb25maWd1cmF0aW9u IHBhcmFtZXRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzMzAzMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTY4MzAxNDM+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgUmVuYW1lIGRhdGFiYXNlRGlyZWN0b3J5IHRvIHdl YlNRTERhdGFiYXNlRGlyZWN0b3J5IHRvIGJldHRlciBpbmRpY2F0ZSB0aGUgZGlyZWN0b3J5IHR5 cGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcDoKKyAgICAgICAg KFdLQ29udGV4dFNldERhdGFiYXNlRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgVGhpcyBp cyBubyBsb25nZXIgbmVlZGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4 dENvbmZpZ3VyYXRpb25SZWYuY3BwOgorICAgICAgICAoV0tDb250ZXh0Q29uZmlndXJhdGlvbkNv cHlJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSk6CisgICAgICAgIChXS0NvbnRleHRDb25maWd1 cmF0aW9uU2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkpOgorICAgICAgICAoV0tDb250ZXh0 Q29uZmlndXJhdGlvbkNvcHlXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSk6CisgICAgICAgIChXS0Nv bnRleHRDb25maWd1cmF0aW9uU2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmg6CisgICAgICAgIEFk ZCBzZXR0ZXJzIGFuZCBnZXR0ZXJzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29u dGV4dFByaXZhdGUuaDoKKyAgICAgICAgUmVtb3ZlIFdLQ29udGV4dFNldERhdGFiYXNlRGlyZWN0 b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSUNvbnRleHRDb25maWd1cmF0aW9uLmNwcDoK KyAgICAgICAgKEFQSTo6Q29udGV4dENvbmZpZ3VyYXRpb246OndlYkNvbnRleHRDb25maWd1cmF0 aW9uKToKKyAgICAgICAgU2V0IG1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgYW5kIG1fd2Vi U1FMRGF0YWJhc2VEaXJlY3Rvcnkgb24gdGhlIGNvbmZpZ3VyYXRpb24uCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJQ29udGV4dENvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKEFQSTo6Q29udGV4 dENvbmZpZ3VyYXRpb246OmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KToKKyAgICAgICAgKEFQ STo6Q29udGV4dENvbmZpZ3VyYXRpb246OnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KToK KyAgICAgICAgKEFQSTo6Q29udGV4dENvbmZpZ3VyYXRpb246OndlYlNRTERhdGFiYXNlRGlyZWN0 b3J5KToKKyAgICAgICAgKEFQSTo6Q29udGV4dENvbmZpZ3VyYXRpb246OnNldFdlYlNRTERhdGFi YXNlRGlyZWN0b3J5KToKKyAgICAgICAgQWRkIGdldHRlcnMgYW5kIHNldHRlcnMgdG8gdGhlIEMr KyBwYXJ0IG9mIFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmFwcGx5UGxh dGZvcm1TcGVjaWZpY0NvbmZpZ3VyYXRpb25EZWZhdWx0cyk6CisgICAgICAgIFNldCB3ZWJTUUxE YXRhYmFzZURpcmVjdG9yeSBhbmQgaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkuCisKKyAgICAg ICAgKFdlYktpdDo6V2ViQ29udGV4dDo6V2ViQ29udGV4dCk6CisgICAgICAgIEluaXRpYWxpemUg bV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSBhbmQgbV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9y eS4KKworICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjplbnN1cmVEYXRhYmFzZVByb2Nlc3Mp OgorICAgICAgICBTZXQgcGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkgZnJvbSBt X2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5LgorCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHQ6OmNyZWF0ZU5ld1dlYlByb2Nlc3MpOgorICAgICAgICBTZXQgcGFyYW1ldGVycy53ZWJTUUxE YXRhYmFzZURpcmVjdG9yeSBmcm9tIG1fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KToKKyAgICAg ICAgUmVuYW1lIHRoaXMgdG8gaW5kaWNhdGUgdGhhdCBpdCdzIGFib3V0IFdlYlNRTCBkYXRhYmFz ZXMuCisKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0SW5kZXhl ZERCRGF0YWJhc2VEaXJlY3RvcnkpOgorICAgICAgICBBZGQgdGhpcy4KKworICAgICAgICAqIFdl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRGF0YWJhc2VNYW5hZ2VyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyOjppbml0aWFsaXplKToKKyAgICAgICAgVXBkYXRl IGZvciBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHJlbmFtZS4KKworICAgICAgICAqIFdl YlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgVXBkYXRlIGZv ciBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHJlbmFtZS4KKworMjAxNC0wNS0xNyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIC1bV0tXZWJWaWV3 IGRlYWxsb2NdIHNob3VsZCBjbG9zZSB0aGUgcGFnZQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMDMxCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x NjkyOTgxNT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCAxYTIxMjA4NGU2YzlkZWQ5YTBiMDNkNTA2NjE4ZmQy Yjc5YzcyY2NmLi41YjAyY2FjZTU0OTRmMDAzZDk2NjY1NDJmYzVkNzg5YWNhNDU0MDI4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnMuY3BwCkBAIC02MCw4ICs2MCw4IEBAIHZvaWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVyczo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVu Y29kZXIgPDwgaW5qZWN0ZWRCdW5kbGVQYXRoRXh0ZW5zaW9uSGFuZGxlOwogICAgIGVuY29kZXIg PDwgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeTsKICAgICBlbmNvZGVyIDw8IGFwcGxpY2F0aW9u Q2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7Ci0gICAgZW5jb2RlciA8PCBkYXRhYmFzZURp cmVjdG9yeTsKLSAgICBlbmNvZGVyIDw8IGRhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxl OworICAgIGVuY29kZXIgPDwgd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CisgICAgZW5jb2RlciA8 PCB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8 IGRpc2tDYWNoZURpcmVjdG9yeTsKICAgICBlbmNvZGVyIDw8IGRpc2tDYWNoZURpcmVjdG9yeUV4 dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8IGNvb2tpZVN0b3JhZ2VEaXJlY3Rvcnk7CkBA IC0xNDYsOSArMTQ2LDkgQEAgYm9vbCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNv ZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFdlYlByb2MKICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5kYXRhYmFzZURpcmVjdG9yeSkpCisgICAg aWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5KSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVy cy5kYXRhYmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSkpCisgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShwYXJhbWV0ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVy cy5kaXNrQ2FjaGVEaXJlY3RvcnkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRl eCBhZTk2NmY1MmQ0ODE5MTJmYjllZGE2ZGEzNDRjMTA5NGZlNDA3MzM3Li5jMjJmZTNmMTdiNDY1 ZmRhMTI1ZjgzMmU5ZmVkYWM0Y2QzZWY2OGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTY2LDggKzY2LDggQEAg c3RydWN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgewogCiAgICAgU3RyaW5nIGFwcGxp Y2F0aW9uQ2FjaGVEaXJlY3Rvcnk7ICAgIAogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBh cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwotICAgIFN0cmluZyBkYXRh YmFzZURpcmVjdG9yeTsKLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgZGF0YWJhc2VEaXJl Y3RvcnlFeHRlbnNpb25IYW5kbGU7CisgICAgU3RyaW5nIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5 OworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeUV4 dGVuc2lvbkhhbmRsZTsKICAgICBTdHJpbmcgZGlza0NhY2hlRGlyZWN0b3J5OwogICAgIFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSBkaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiAg ICAgU3RyaW5nIGNvb2tpZVN0b3JhZ2VEaXJlY3Rvcnk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCmluZGV4IDQwZWU2NzExMTI5MjAwNDA2ODQxNTQwMTlk ZjVlNmI4ODg1NjM4YmEuLjcyODdkZmMyYzUwMmQ4ZGFiOTY0ODVhZjQwMjQ3YTljNWVmYWIyYmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCkBAIC00 ODcsMTEgKzQ4Nyw2IEBAIFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dFNldEFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3RvcnkoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLCiAgICAgdG9JbXBsKGNvbnRl eHRSZWYpLT5zZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KHRvSW1wbChhcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5KS0+c3RyaW5nKCkpOwogfQogCi12b2lkIFdLQ29udGV4dFNldERhdGFiYXNl RGlyZWN0b3J5KFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1N0cmluZ1JlZiBkYXRhYmFzZURp cmVjdG9yeSkKLXsKLSAgICB0b0ltcGwoY29udGV4dFJlZiktPnNldERhdGFiYXNlRGlyZWN0b3J5 KHRvSW1wbChkYXRhYmFzZURpcmVjdG9yeSktPnN0cmluZygpKTsKLX0KLQogV0tfRVhQT1JUIHZv aWQgV0tDb250ZXh0U2V0RGlza0NhY2hlRGlyZWN0b3J5KFdLQ29udGV4dFJlZiBjb250ZXh0UmVm LCBXS1N0cmluZ1JlZiBkaXNrQ2FjaGVEaXJlY3RvcnkpCiB7CiAgICAgdG9JbXBsKGNvbnRleHRS ZWYpLT5zZXREaXNrQ2FjaGVEaXJlY3RvcnkodG9JbXBsKGRpc2tDYWNoZURpcmVjdG9yeSktPnN0 cmluZygpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0Nv bnRleHRDb25maWd1cmF0aW9uUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmNwcAppbmRleCA1MmFkMDQwN2UxYjQzNTc5OGIw MjJkOGVkMjk5MTlmNjYzYzJiZjc0Li5mN2QyNTZhY2UyZmIzMjQ2Yzk1NTNiNzEzZmVkNTUyOGE0 YzQ5MjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3BwCkBAIC0zNiw2ICszNiwxNiBAQCBXS0Nv bnRleHRDb25maWd1cmF0aW9uUmVmIFdLQ29udGV4dENvbmZpZ3VyYXRpb25DcmVhdGUoKQogICAg IHJldHVybiB0b0FQSShBUEk6OkNvbnRleHRDb25maWd1cmF0aW9uOjpjcmVhdGUoKS5sZWFrUmVm KCkpOwogfQogCitXS1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weUluZGV4ZWRE QkRhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlv bikKK3sKKyAgICByZXR1cm4gdG9Db3BpZWRBUEkodG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5pbmRl eGVkREJEYXRhYmFzZURpcmVjdG9yeSgpKTsKK30KKwordm9pZCBXS0NvbnRleHRDb25maWd1cmF0 aW9uU2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJl ZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBpbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSkK K3sKKyAgICB0b0ltcGwoY29uZmlndXJhdGlvbiktPnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0 b3J5KHRvSW1wbChpbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSktPnN0cmluZygpKTsKK30KKwog V0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlJbmplY3RlZEJ1bmRsZVBhdGgo V0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQogewogICAgIHJldHVybiB0 b0NvcGllZEFQSSh0b0ltcGwoY29uZmlndXJhdGlvbiktPmluamVjdGVkQnVuZGxlUGF0aCgpKTsK QEAgLTU1LDMgKzY1LDEzIEBAIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldExvY2FsU3Rv cmFnZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvCiB7CiAgICAgdG9JbXBs KGNvbmZpZ3VyYXRpb24pLT5zZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkodG9JbXBsKGxvY2FsU3Rv cmFnZURpcmVjdG9yeSktPnN0cmluZygpKTsKIH0KKworV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29u ZmlndXJhdGlvbkNvcHlXZWJTUUxEYXRhYmFzZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0 aW9uUmVmIGNvbmZpZ3VyYXRpb24pCit7CisgICAgcmV0dXJuIHRvQ29waWVkQVBJKHRvSW1wbChj b25maWd1cmF0aW9uKS0+d2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSk7Cit9CisKK3ZvaWQgV0tD b250ZXh0Q29uZmlndXJhdGlvblNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dENv bmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tTdHJpbmdSZWYgd2ViU1FMRGF0YWJhc2VE aXJlY3RvcnkpCit7CisgICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRXZWJTUUxEYXRhYmFz ZURpcmVjdG9yeSh0b0ltcGwod2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkpLT5zdHJpbmcoKSk7Cit9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29u ZmlndXJhdGlvblJlZi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4 dENvbmZpZ3VyYXRpb25SZWYuaAppbmRleCBlYmVhMzJmMmVlMzk3ZGVmZWZjMDJiNzU1NWE3MDU4 MDE5NDVkMmJlLi43NTRkNDlhNTJkNmQ2ZTM3ZjRkZDlhMGExNWQwMjNhYzhjNmQzMWRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJh dGlvblJlZi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRD b25maWd1cmF0aW9uUmVmLmgKQEAgLTM0LDEyICszNCwxOCBAQCBleHRlcm4gIkMiIHsKIAogV0tf RVhQT1JUIFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNy ZWF0ZSgpOwogCitXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNv cHlJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNv bmZpZ3VyYXRpb24pOworV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldElu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmln dXJhdGlvbiwgV0tTdHJpbmdSZWYgaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkpOworCiBXS19F WFBPUlQgV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlJbmplY3RlZEJ1bmRs ZVBhdGgoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKIFdLX0VYUE9S VCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRJbmplY3RlZEJ1bmRsZVBhdGgoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBpbmplY3RlZEJ1 bmRsZVBhdGgpOwogCiBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlv bkNvcHlMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25m aWd1cmF0aW9uKTsKIFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRMb2Nh bFN0b3JhZ2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9u LCBXS1N0cmluZ1JlZiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwogCitXS19FWFBPUlQgV0tTdHJp bmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlXZWJTUUxEYXRhYmFzZURpcmVjdG9yeShX S0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOworV0tfRVhQT1JUIHZvaWQg V0tDb250ZXh0Q29uZmlndXJhdGlvblNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4 dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tTdHJpbmdSZWYgd2ViU1FMRGF0YWJh c2VEaXJlY3RvcnkpOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dFByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmgKaW5kZXggOTUw NGVhZjAyYmQ5MTRmY2M2NzA1NjgxYTZhNTA2MzQxMjY3MDgwOS4uNmE4YjBjZGE3YjJiZDJmMGE5 ZWMzMWQ1ZDMzODdjY2E4NGVjOWQ4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dFByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tDb250ZXh0UHJpdmF0ZS5oCkBAIC02Myw3ICs2Myw2IEBAIFdLX0VYUE9SVCB2 b2lkIFdLQ29udGV4dEFsbG93U3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChXS0NvbnRl eHRSZWYgY29udGV4CiAvLyBGSVhNRTogVGhlc2UgZnVuY3Rpb25zIGFyZSBvbmx5IGVmZmVjdGl2 ZSBpZiBjYWxsZWQgYmVmb3JlIHRoZSBXZWIgcHJvY2VzcyBpcyBsYXVuY2hlZC4gQnV0CiAvLyB3 ZSBzaG91bGQgcmVhbGx5IGNoYW5nZSB0aGVzZSBzZXR0aW5ncyB0byBiZSBvbiBXZWJQcmVmZXJl bmNlcyBhbmQgY2hhbmdlYWJsZSBhdCBydW50aW1lLgogV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0 U2V0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeShXS0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJp bmdSZWYgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSk7Ci1XS19FWFBPUlQgdm9pZCBXS0NvbnRl eHRTZXREYXRhYmFzZURpcmVjdG9yeShXS0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJpbmdSZWYg ZGF0YWJhc2VEaXJlY3RvcnkpOwogV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0U2V0RGlza0NhY2hl RGlyZWN0b3J5KFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1N0cmluZ1JlZiBkaXNrQ2FjaGVEaXJl Y3RvcnkpOwogV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0U2V0Q29va2llU3RvcmFnZURpcmVjdG9y eShXS0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJpbmdSZWYgY29va2llU3RvcmFnZURpcmVjdG9y eSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29u ZmlndXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJQ29udGV4dENvbmZp Z3VyYXRpb24uY3BwCmluZGV4IDM1OGFlYjU5ZGJiMTU3MzM0YzI5MjcyZGZmZTg5MWUwZWRiNjk0 MmYuLjZlZTFhODk3MzBmODcyYmUwMjM3ZTY3ZmVlYzI1ZjRmOTZiYThlNjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSUNvbnRleHRDb25maWd1cmF0aW9uLmNwcApA QCAtNDIsOCArNDIsMTAgQEAgV2ViS2l0OjpXZWJDb250ZXh0Q29uZmlndXJhdGlvbiBDb250ZXh0 Q29uZmlndXJhdGlvbjo6d2ViQ29udGV4dENvbmZpZ3VyYXRpb24oKQogewogICAgIFdlYktpdDo6 V2ViQ29udGV4dENvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbjsKIAorICAgIGNvbmZpZ3VyYXRp b24uaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgPSBtX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0 b3J5OwogICAgIGNvbmZpZ3VyYXRpb24uaW5qZWN0ZWRCdW5kbGVQYXRoID0gbV9pbmplY3RlZEJ1 bmRsZVBhdGg7CiAgICAgY29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBtX2xv Y2FsU3RvcmFnZURpcmVjdG9yeTsKKyAgICBjb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGly ZWN0b3J5ID0gbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsKIAogICAgIFdlYktpdDo6V2ViQ29u dGV4dDo6YXBwbHlQbGF0Zm9ybVNwZWNpZmljQ29uZmlndXJhdGlvbkRlZmF1bHRzKGNvbmZpZ3Vy YXRpb24pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJQ29udGV4 dENvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29u ZmlndXJhdGlvbi5oCmluZGV4IGM5NDFmNjdhYWUxYzllMzVlYmMxYzA2ZjYxYzU3MDQ4MDQwZDMy ZWEuLmJjZWMxZjQ4NTY0YzA4NzVkZTUzZTIwYjA4YmM1ZjViYWI2MTU1NTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElDb250ZXh0Q29uZmlndXJhdGlvbi5oCkBAIC00 MywxOSArNDMsMjcgQEAgcHVibGljOgogICAgIH0KICAgICB2aXJ0dWFsIH5Db250ZXh0Q29uZmln dXJhdGlvbigpOwogCisgICAgU3RyaW5nIGluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkgY29u c3QgeyByZXR1cm4gbV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsgfQorICAgIHZvaWQgc2V0 SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoY29uc3QgU3RyaW5nJiBpbmRleGVkREJEYXRhYmFz ZURpcmVjdG9yeSkgeyBtX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0gaW5kZXhlZERCRGF0 YWJhc2VEaXJlY3Rvcnk7IH0KKwogICAgIFN0cmluZyBpbmplY3RlZEJ1bmRsZVBhdGgoKSBjb25z dCB7IHJldHVybiBtX2luamVjdGVkQnVuZGxlUGF0aDsgfQogICAgIHZvaWQgc2V0SW5qZWN0ZWRC dW5kbGVQYXRoKGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKSB7IG1faW5qZWN0ZWRC dW5kbGVQYXRoID0gaW5qZWN0ZWRCdW5kbGVQYXRoOyB9CiAKICAgICBTdHJpbmcgbG9jYWxTdG9y YWdlRGlyZWN0b3J5KCkgY29uc3QgeyByZXR1cm4gbV9sb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7IH0K ICAgICB2b2lkIHNldExvY2FsU3RvcmFnZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIGxvY2FsU3Rv cmFnZURpcmVjdG9yeSkgeyBtX2xvY2FsU3RvcmFnZURpcmVjdG9yeSA9IGxvY2FsU3RvcmFnZURp cmVjdG9yeTsgfQogCisgICAgU3RyaW5nIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkgY29uc3Qg eyByZXR1cm4gbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsgfQorICAgIHZvaWQgc2V0V2ViU1FM RGF0YWJhc2VEaXJlY3RvcnkoY29uc3QgU3RyaW5nJiB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSkg eyBtX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7IH0K KwogICAgIFdlYktpdDo6V2ViQ29udGV4dENvbmZpZ3VyYXRpb24gd2ViQ29udGV4dENvbmZpZ3Vy YXRpb24oKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBDb250ZXh0Q29uZmlndXJhdGlvbigpOwog CisgICAgU3RyaW5nIG1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk7CiAgICAgU3RyaW5nIG1f aW5qZWN0ZWRCdW5kbGVQYXRoOwogICAgIFN0cmluZyBtX2xvY2FsU3RvcmFnZURpcmVjdG9yeTsK KyAgICBTdHJpbmcgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCmluZGV4IDc1YTY3 YzlhNGJkMzBhYTlhZjExMjRmMjMzMzI0MjYxMDlmMmNkYWMuLjUxOGI5NTcyOWYwYTkyOWFkMzIz MWNkMWQwMGNhZjcyNmE1Njk0YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4 dC5jcHAKQEAgLTEyNCw2ICsxMjQsMTIgQEAgdm9pZCBXZWJDb250ZXh0OjphcHBseVBsYXRmb3Jt U3BlY2lmaWNDb25maWd1cmF0aW9uRGVmYXVsdHMoV2ViQ29udGV4dENvbmZpZ3VyYXQKIAogICAg IGlmICghY29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkpCiAgICAgICAgIGNvbmZp Z3VyYXRpb24ubG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gcGxhdGZvcm1EZWZhdWx0TG9jYWxTdG9y YWdlRGlyZWN0b3J5KCk7CisKKyAgICBpZiAoIWNvbmZpZ3VyYXRpb24ud2ViU1FMRGF0YWJhc2VE aXJlY3RvcnkpCisgICAgICAgIGNvbmZpZ3VyYXRpb24ud2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnkg PSBwbGF0Zm9ybURlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpOworCisgICAgaWYgKCFj b25maWd1cmF0aW9uLmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KQorICAgICAgICBjb25maWd1 cmF0aW9uLmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0gcGxhdGZvcm1EZWZhdWx0SW5kZXhl ZERCRGF0YWJhc2VEaXJlY3RvcnkoKTsKIH0KIAogUGFzc1JlZlB0cjxXZWJDb250ZXh0PiBXZWJD b250ZXh0OjpjcmVhdGUoV2ViQ29udGV4dENvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbikKQEAg LTE2NCw2ICsxNzAsOCBAQCBXZWJDb250ZXh0OjpXZWJDb250ZXh0KFdlYkNvbnRleHRDb25maWd1 cmF0aW9uIGNvbmZpZ3VyYXRpb24pCiAjaWYgVVNFKFNPVVApCiAgICAgLCBtX2luaXRpYWxIVFRQ Q29va2llQWNjZXB0UG9saWN5KEhUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1 bWVudERvbWFpbikKICNlbmRpZgorICAgICwgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeShzdGQ6 Om1vdmUoY29uZmlndXJhdGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSkpCisgICAgLCBtX2lu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KHN0ZDo6bW92ZShjb25maWd1cmF0aW9uLmluZGV4ZWRE QkRhdGFiYXNlRGlyZWN0b3J5KSkKICAgICAsIG1fc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtTZXNz aW9uKGZhbHNlKQogICAgICwgbV9wcm9jZXNzVGVybWluYXRpb25FbmFibGVkKHRydWUpCiAjaWYg RU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKQEAgLTQ0OSwxMyArNDU3LDExIEBAIHZvaWQgV2ViQ29u dGV4dDo6ZW5zdXJlRGF0YWJhc2VQcm9jZXNzKCkKIAogICAgIG1fZGF0YWJhc2VQcm9jZXNzID0g RGF0YWJhc2VQcm9jZXNzUHJveHk6OmNyZWF0ZSh0aGlzKTsKIAorICAgIEFTU0VSVCghbV9pbmRl eGVkREJEYXRhYmFzZURpcmVjdG9yeS5pc0VtcHR5KCkpOworCiAgICAgRGF0YWJhc2VQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CisgICAgcGFyYW1ldGVycy5pbmRleGVkRGF0 YWJhc2VEaXJlY3RvcnkgPSBtX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5OwogCi0gICAgLy8g SW5kZXhlZCBkYXRhYmFzZXMgZXhpc3QgaW4gYSBzdWJkaXJlY3Rvcnkgb2YgdGhlICJkYXRhYmFz ZSBkaXJlY3RvcnkgcGF0aC4iCi0gICAgLy8gQ3VycmVudGx5LCB0aGUgdG9wIGxldmVsIG9mIHRo YXQgZGlyZWN0b3J5IGNvbnRhaW5zIGVudGl0aWVzIHJlbGF0ZWQgdG8gV2ViU1FMIGRhdGFiYXNl cy4KLSAgICAvLyBXZSBzaG91bGQgZml4IHRoaXMsIGFuZCBtb3ZlIFdlYlNRTCBpbnRvIGEgc3Vi ZGlyZWN0b3J5IChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0ODA3 KQotICAgIC8vIEluIHRoZSBtZWFudGltZSwgYW4gZW50aXR5IG5hbWUgcHJlZml4ZWQgd2l0aCB0 aHJlZSB1bmRlcnNjb3JlcyB3aWxsIG5vdCBjb25mbGljdCB3aXRoIGFueSBXZWJTUUwgZW50aXRp ZXMuCi0gICAgcGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkgPSBwYXRoQnlBcHBl bmRpbmdDb21wb25lbnQoZGF0YWJhc2VEaXJlY3RvcnkoKSwgIl9fX0luZGV4ZWREQiIpOwogICAg IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJh bWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeSwgcGFyYW1ldGVycy5pbmRleGVkRGF0YWJh c2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogCiAgICAgbV9kYXRhYmFzZVByb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OkRhdGFiYXNlUHJvY2Vzczo6SW5pdGlhbGl6ZURhdGFiYXNlUHJvY2Vzcyhw YXJhbWV0ZXJzKSwgMCk7CkBAIC01NjUsOSArNTcxLDkgQEAgV2ViUHJvY2Vzc1Byb3h5JiBXZWJD b250ZXh0OjpjcmVhdGVOZXdXZWJQcm9jZXNzKCkKICAgICBpZiAoIXBhcmFtZXRlcnMuYXBwbGlj YXRpb25DYWNoZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246 OmNyZWF0ZUhhbmRsZUZvclJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmFwcGxpY2F0aW9u Q2FjaGVEaXJlY3RvcnksIHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVu c2lvbkhhbmRsZSk7CiAKLSAgICBwYXJhbWV0ZXJzLmRhdGFiYXNlRGlyZWN0b3J5ID0gZGF0YWJh c2VEaXJlY3RvcnkoKTsKLSAgICBpZiAoIXBhcmFtZXRlcnMuZGF0YWJhc2VEaXJlY3RvcnkuaXNF bXB0eSgpKQotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFkV3Jp dGVEaXJlY3RvcnkocGFyYW1ldGVycy5kYXRhYmFzZURpcmVjdG9yeSwgcGFyYW1ldGVycy5kYXRh YmFzZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CisgICAgcGFyYW1ldGVycy53ZWJTUUxEYXRh YmFzZURpcmVjdG9yeSA9IG1fd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CisgICAgaWYgKCFwYXJh bWV0ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgU2FuZGJv eEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMu d2ViU1FMRGF0YWJhc2VEaXJlY3RvcnksIHBhcmFtZXRlcnMud2ViU1FMRGF0YWJhc2VEaXJlY3Rv cnlFeHRlbnNpb25IYW5kbGUpOwogCiAgICAgcGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3Rvcnkg PSBkaXNrQ2FjaGVEaXJlY3RvcnkoKTsKICAgICBpZiAoIXBhcmFtZXRlcnMuZGlza0NhY2hlRGly ZWN0b3J5LmlzRW1wdHkoKSkKQEAgLTExMjQsMTQgKzExMzAsNiBAQCBTdHJpbmcgV2ViQ29udGV4 dDo6YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIGNvbnN0CiAgICAgcmV0dXJuIHBsYXRmb3Jt RGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKIH0KIAotU3RyaW5nIFdlYkNvbnRl eHQ6OmRhdGFiYXNlRGlyZWN0b3J5KCkgY29uc3QKLXsKLSAgICBpZiAoIW1fb3ZlcnJpZGVEYXRh YmFzZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBtX292ZXJyaWRlRGF0YWJh c2VEaXJlY3Rvcnk7Ci0KLSAgICByZXR1cm4gcGxhdGZvcm1EZWZhdWx0RGF0YWJhc2VEaXJlY3Rv cnkoKTsKLX0KLQogdm9pZCBXZWJDb250ZXh0OjpzZXRJY29uRGF0YWJhc2VQYXRoKGNvbnN0IFN0 cmluZyYgcGF0aCkKIHsKICAgICBtX292ZXJyaWRlSWNvbkRhdGFiYXNlUGF0aCA9IHBhdGg7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAppbmRleCAxMGYzM2NlYWFiODk1ODQ1M2Q1 ZDgxYjcwMWFlZmU5ZjVhYzRkM2NhLi43ZGYyYjVlYmM5Y2I4YWI2OGVkM2QxODJkODU3ZGE4Y2Rh NmQ5MzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKQEAgLTk4LDYgKzk4 LDggQEAgaW50IHdlYlByb2Nlc3NUaHJvdWdocHV0UU9TKCk7CiBzdHJ1Y3QgV2ViQ29udGV4dENv bmZpZ3VyYXRpb24gewogICAgIFN0cmluZyBpbmplY3RlZEJ1bmRsZVBhdGg7CiAgICAgU3RyaW5n IGxvY2FsU3RvcmFnZURpcmVjdG9yeTsKKyAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VEaXJlY3Rv cnk7CisgICAgU3RyaW5nIGluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5OwogfTsKIAogY2xhc3Mg V2ViQ29udGV4dCA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6OkNv bnRleHQ+LCBwcml2YXRlIElQQzo6TWVzc2FnZVJlY2VpdmVyCkBAIC0yNDMsNyArMjQ1LDYgQEAg cHVibGljOgogICAgIHN0YXRpYyBTdGF0aXN0aWNzJiBzdGF0aXN0aWNzKCk7ICAgIAogCiAgICAg dm9pZCBzZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyKSB7IG1f b3ZlcnJpZGVBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gZGlyOyB9Ci0gICAgdm9pZCBzZXRE YXRhYmFzZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIGRpcikgeyBtX292ZXJyaWRlRGF0YWJhc2VE aXJlY3RvcnkgPSBkaXI7IH0KICAgICB2b2lkIHNldEljb25EYXRhYmFzZVBhdGgoY29uc3QgU3Ry aW5nJik7CiAgICAgU3RyaW5nIGljb25EYXRhYmFzZVBhdGgoKSBjb25zdDsKICAgICB2b2lkIHNl dERpc2tDYWNoZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIGRpcikgeyBtX292ZXJyaWRlRGlza0Nh Y2hlRGlyZWN0b3J5ID0gZGlyOyB9CkBAIC00MDksMTIgKzQxMCwxMSBAQCBwcml2YXRlOgogICAg IFN0cmluZyBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3Q7CiAgICAgU3RyaW5nIHBs YXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSBjb25zdDsKIAotICAgIFN0 cmluZyBkYXRhYmFzZURpcmVjdG9yeSgpIGNvbnN0OwotICAgIFN0cmluZyBwbGF0Zm9ybURlZmF1 bHREYXRhYmFzZURpcmVjdG9yeSgpIGNvbnN0OwotCiAgICAgU3RyaW5nIHBsYXRmb3JtRGVmYXVs dEljb25EYXRhYmFzZVBhdGgoKSBjb25zdDsKIAogICAgIHN0YXRpYyBTdHJpbmcgcGxhdGZvcm1E ZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CisgICAgc3RhdGljIFN0cmluZyBwbGF0Zm9y bURlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpOworICAgIHN0YXRpYyBTdHJpbmcg cGxhdGZvcm1EZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKTsKIAogICAgIFN0cmluZyBk aXNrQ2FjaGVEaXJlY3RvcnkoKSBjb25zdDsKICAgICBTdHJpbmcgcGxhdGZvcm1EZWZhdWx0RGlz a0NhY2hlRGlyZWN0b3J5KCkgY29uc3Q7CkBAIC01MTQsMTEgKzUxNCwxMyBAQCBwcml2YXRlOgog I2VuZGlmCiAKICAgICBTdHJpbmcgbV9vdmVycmlkZUFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnk7 Ci0gICAgU3RyaW5nIG1fb3ZlcnJpZGVEYXRhYmFzZURpcmVjdG9yeTsKICAgICBTdHJpbmcgbV9v dmVycmlkZUljb25EYXRhYmFzZVBhdGg7CiAgICAgU3RyaW5nIG1fb3ZlcnJpZGVEaXNrQ2FjaGVE aXJlY3Rvcnk7CiAgICAgU3RyaW5nIG1fb3ZlcnJpZGVDb29raWVTdG9yYWdlRGlyZWN0b3J5Owog CisgICAgU3RyaW5nIG1fd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CisgICAgU3RyaW5nIG1faW5k ZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk7CisKICAgICBib29sIG1fc2hvdWxkVXNlVGVzdGluZ05l dHdvcmtTZXNzaW9uOwogCiAgICAgYm9vbCBtX3Byb2Nlc3NUZXJtaW5hdGlvbkVuYWJsZWQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0KaW5kZXggZWRm ZjliOTYwNzgwODEyNmZhNWJiZGYzZGNjYzZhNmZkYzAxMGQ3My4uNmRmODA1OThhY2RiMzM1ZGEz OTBlMTJkOTViZjU2ZTg1M2NhOGQzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViQ29udGV4dE1hYy5tbQpAQCAtMjU5LDcgKzI1OSw3IEBAIFN0cmluZyBXZWJDb250ZXh0 OjpwbGF0Zm9ybURlZmF1bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKICAgICByZXR1 cm4gW0AiIiBzdHJpbmdCeVN0YW5kYXJkaXppbmdQYXRoXTsKIH0KIAotU3RyaW5nIFdlYkNvbnRl eHQ6OnBsYXRmb3JtRGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5KCkgY29uc3QKK1N0cmluZyBXZWJD b250ZXh0OjpwbGF0Zm9ybURlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpCiB7CiAgICAg TlNTdHJpbmcgKmRhdGFiYXNlc0RpcmVjdG9yeSA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRV c2VyRGVmYXVsdHNdIG9iamVjdEZvcktleTpXZWJEYXRhYmFzZURpcmVjdG9yeURlZmF1bHRzS2V5 XTsKICAgICBpZiAoIWRhdGFiYXNlc0RpcmVjdG9yeSB8fCAhW2RhdGFiYXNlc0RpcmVjdG9yeSBp c0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKQpAQCAtMjY3LDYgKzI2NywxNSBAQCBTdHJp bmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0RGF0YWJhc2VEaXJlY3RvcnkoKSBjb25zdAog ICAgIHJldHVybiBbZGF0YWJhc2VzRGlyZWN0b3J5IHN0cmluZ0J5U3RhbmRhcmRpemluZ1BhdGhd OwogfQogCitTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0SW5kZXhlZERCRGF0YWJh c2VEaXJlY3RvcnkoKQoreworICAgIC8vIEluZGV4ZWQgZGF0YWJhc2VzIGV4aXN0IGluIGEgc3Vi ZGlyZWN0b3J5IG9mIHRoZSAiZGF0YWJhc2UgZGlyZWN0b3J5IHBhdGguIgorICAgIC8vIEN1cnJl bnRseSwgdGhlIHRvcCBsZXZlbCBvZiB0aGF0IGRpcmVjdG9yeSBjb250YWlucyBlbnRpdGllcyBy ZWxhdGVkIHRvIFdlYlNRTCBkYXRhYmFzZXMuCisgICAgLy8gV2Ugc2hvdWxkIGZpeCB0aGlzLCBh bmQgbW92ZSBXZWJTUUwgaW50byBhIHN1YmRpcmVjdG9yeSAoaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNDgwNykKKyAgICAvLyBJbiB0aGUgbWVhbnRpbWUsIGFuIGVu dGl0eSBuYW1lIHByZWZpeGVkIHdpdGggdGhyZWUgdW5kZXJzY29yZXMgd2lsbCBub3QgY29uZmxp Y3Qgd2l0aCBhbnkgV2ViU1FMIGVudGl0aWVzLgorICAgIHJldHVybiBwYXRoQnlBcHBlbmRpbmdD b21wb25lbnQocGxhdGZvcm1EZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSwgIl9fX0lu ZGV4ZWREQiIpOworfQorCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0SWNvbkRh dGFiYXNlUGF0aCgpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6IDxyZGFyOi8vcHJvYmxlbS85MTM4 ODE3PiAtIEFmdGVyIHRoaXMgImJhY2t3YXJkcyBjb21wYXRpYmlsaXR5IiByYWRhciBpcyByZW1v dmVkLCB0aGlzIGNvZGUgc2hvdWxkIGJlIHJlbW92ZWQgdG8gb25seSByZXR1cm4gYW4gZW1wdHkg U3RyaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJEYXRhYmFzZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJEYXRhYmFzZU1hbmFnZXIuY3BwCmluZGV4IDcyNTQzZTEzZDk0ZTYw YTI0NjU1Y2Q3MDNhMGEzODVkNDMyZjcxZTQuLmU2NGE3NTNiMzNkM2E5M2IzOWY4MmVmYzFjNzcy OTE1OTEyZmJiMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViRGF0YWJhc2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRhdGFiYXNlTWFuYWdlci5jcHAKQEAgLTU1LDcgKzU1 LDcgQEAgV2ViRGF0YWJhc2VNYW5hZ2VyOjpXZWJEYXRhYmFzZU1hbmFnZXIoV2ViUHJvY2Vzcyog cHJvY2VzcykKIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXI6OmluaXRpYWxpemUoY29uc3QgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSAgICBEYXRhYmFzZU1h bmFnZXI6Om1hbmFnZXIoKS5pbml0aWFsaXplKHBhcmFtZXRlcnMuZGF0YWJhc2VEaXJlY3Rvcnkp OworICAgIERhdGFiYXNlTWFuYWdlcjo6bWFuYWdlcigpLmluaXRpYWxpemUocGFyYW1ldGVycy53 ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSk7CiAgICAgRGF0YWJhc2VNYW5hZ2VyOjptYW5hZ2VyKCku c2V0Q2xpZW50KHRoaXMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCmluZGV4IDNjZDRhNjdmN2I4N2I4NjNhYzBkMzBlMzNl ZGJiYzBkN2JkOTllYjQuLmRjOTkzOGI0ZGQ1YzExMDIzOGQ0NTVlNmM3NWY4YjIzNWY0OTVkNzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv Y29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0Nv Y29hLm1tCkBAIC0xNjEsNyArMTYxLDcgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKGNvbnN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMKIHsKICNp ZiBFTkFCTEUoU0FOREJPWF9FWFRFTlNJT05TKQogICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1 bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aEV4dGVu c2lvbkhhbmRsZSk7Ci0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBh cmFtZXRlcnMuZGF0YWJhc2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOworICAgIFNhbmRib3hF eHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseShwYXJhbWV0ZXJzLndlYlNRTERhdGFiYXNlRGly ZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVy bWFuZW50bHkocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFu ZGxlKTsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVy cy5kaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogI2VuZGlmCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzA4Mzg0OGE1OTdkYTQ0 NjRiZGIwMDRlY2ZjYzBmMGIxZTcwOWNjOC4uMDIwMWRmOTU2Yjk3MzI1MWUzZGFkMWUwNzI5N2Ey ZGNhMzMyYzcwNCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA1LTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBXS0NvbnRleHRTZXREYXRhYmFzZURp cmVjdG9yeSB3aXRoIHR3byBXS0NvbnRleHRDb25maWd1cmF0aW9uIHBhcmFtZXRlcnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzAzMworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTY4MzAxNDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU2V0IHVwIHRoZSBXZWJTUUwgYW5kIEluZGV4ZWREQiBkaXJl Y3Rvcmllcy4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6CisKIDIwMTQtMDUt MTYgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgogCiAgICAgICAgIE1lbW9yeUNhY2hl OjphZGRJbWFnZVRvQ2FjaGUgc2hvdWxkIHJldHVybiB0aGUgcmVzdWx0IG9mIGFkZCgpLgpkaWZm IC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCAzMTA3ZWFmOTY2NzVk OTM5NDc2MmQ2M2JjMTU5MWZjMzExNzA4MjM4Li4yMjMwOTM2MzJiZTY4ZWUxNzFkYjhlYTc3MGJk ZDU2MDg0MTgxNDZjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250 cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cApAQCAtMzM1LDcgKzMzNSw5IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50 IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKIAogICAgICAgICBjb25zdCBjaGFyIHNlcGFyYXRv ciA9ICcvJzsKIAorICAgICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0SW5kZXhlZERCRGF0 YWJhc2VEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIg KyBzZXBhcmF0b3IgKyAiRGF0YWJhc2VzIiArIHNlcGFyYXRvciArICJJbmRleGVkREIiKS5nZXQo KSk7CiAgICAgICAgIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRMb2NhbFN0b3JhZ2VEaXJlY3Rv cnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBzZXBhcmF0b3Ig KyAiTG9jYWxTdG9yYWdlIikuZ2V0KCkpOworICAgICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9u U2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1w b3JhcnlGb2xkZXIgKyBzZXBhcmF0b3IgKyAiRGF0YWJhc2VzIiArIHNlcGFyYXRvciArICJXZWJT UUwiKS5nZXQoKSk7CiAgICAgfQogCiAgICAgbV9jb250ZXh0ID0gYWRvcHRXSyhXS0NvbnRleHRD cmVhdGVXaXRoQ29uZmlndXJhdGlvbihjb25maWd1cmF0aW9uLmdldCgpKSk7CkBAIC0zNTMsNyAr MzU1LDYgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3Qg Y2hhciogYXJndltdKQogCiAgICAgICAgIC8vIEZJWE1FOiBUaGVzZSBzaG91bGQgYmUgbWlncmF0 ZWQgdG8gV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi4KICAgICAgICAgV0tDb250ZXh0U2V0QXBw bGljYXRpb25DYWNoZURpcmVjdG9yeShtX2NvbnRleHQuZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9s ZGVyICsgc2VwYXJhdG9yICsgIkFwcGxpY2F0aW9uQ2FjaGUiKS5nZXQoKSk7Ci0gICAgICAgIFdL Q29udGV4dFNldERhdGFiYXNlRGlyZWN0b3J5KG1fY29udGV4dC5nZXQoKSwgdG9XSyh0ZW1wb3Jh cnlGb2xkZXIgKyBzZXBhcmF0b3IgKyAiRGF0YWJhc2VzIikuZ2V0KCkpOwogICAgICAgICBXS0Nv bnRleHRTZXREaXNrQ2FjaGVEaXJlY3RvcnkobV9jb250ZXh0LmdldCgpLCB0b1dLKHRlbXBvcmFy eUZvbGRlciArIHNlcGFyYXRvciArICJDYWNoZSIpLmdldCgpKTsKICAgICAgICAgV0tDb250ZXh0 U2V0Q29va2llU3RvcmFnZURpcmVjdG9yeShtX2NvbnRleHQuZ2V0KCksIHRvV0sodGVtcG9yYXJ5 Rm9sZGVyICsgc2VwYXJhdG9yICsgIkNvb2tpZXMiKS5nZXQoKSk7CiAgICAgICAgIFdLQ29udGV4 dFNldEljb25EYXRhYmFzZVBhdGgobV9jb250ZXh0LmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRl ciArIHNlcGFyYXRvciArICJJY29uRGF0YWJhc2UiICsgc2VwYXJhdG9yICsgIldlYnBhZ2VJY29u cy5kYiIpLmdldCgpKTsK