182403 2018-02-01 12:55:34 -0800 Configure serviceWorkerRegistrationDirectory on the web site data store and move it to a Caches subfolder as a default 2018-02-05 15:08:45 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cdumez commit-queue webkit-bug-importer oldest_to_newest 1395601 0 youennf 2018-02-01 12:55:34 -0800 Configure serviceWorkerRegistrationDirectory on the web site data store and move it to a Caches subfolder as a default 1395603 1 youennf 2018-02-01 12:58:27 -0800 <rdar://problem/36673358> 1395605 2 332902 youennf 2018-02-01 13:11:46 -0800 Created attachment 332902 Patch 1395715 3 332929 youennf 2018-02-01 18:13:20 -0800 Created attachment 332929 Patch 1395745 4 cdumez 2018-02-01 21:04:13 -0800 It'd be good if Alex or Brady took a look at this one. 1395917 5 332929 commit-queue 2018-02-02 11:25:25 -0800 Comment on attachment 332929 Patch Clearing flags on attachment: 332929 Committed r228019: <https://trac.webkit.org/changeset/228019> 1395918 6 commit-queue 2018-02-02 11:25:27 -0800 All reviewed patches have been landed. Closing bug. 1396037 7 youennf 2018-02-02 15:57:38 -0800 Reopening to attach new patch. 1396038 8 333014 youennf 2018-02-02 15:57:38 -0800 Created attachment 333014 Follow-up fix 1396051 9 333014 commit-queue 2018-02-02 16:36:26 -0800 Comment on attachment 333014 Follow-up fix Clearing flags on attachment: 333014 Committed r228033: <https://trac.webkit.org/changeset/228033> 1396052 10 commit-queue 2018-02-02 16:36:27 -0800 All reviewed patches have been landed. Closing bug. 1396555 11 cdumez 2018-02-05 14:38:04 -0800 After this change, it seems all WebKitTestRunner instances share the same registration database direction, thus introducing flakiness :/ 1396557 12 332929 cdumez 2018-02-05 14:48:30 -0800 Comment on attachment 332929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332929&action=review > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:111 > + void setServiceWorkerRegistrationDirectory(String&& directory) { m_resolvedConfiguration.serviceWorkerRegistrationDirectory = WTFMove(directory); } WebsiteDataStore::resolveDirectoriesIfNecessary() overrides the path you set here in the resolvedConfiguration with the default path that is in the configuration :/ 1396576 13 youennf 2018-02-05 15:08:45 -0800 (In reply to Chris Dumez from comment #12) > Comment on attachment 332929 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=332929&action=review > > > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:111 > > + void setServiceWorkerRegistrationDirectory(String&& directory) { m_resolvedConfiguration.serviceWorkerRegistrationDirectory = WTFMove(directory); } > > WebsiteDataStore::resolveDirectoriesIfNecessary() overrides the path you set > here in the resolvedConfiguration with the default path that is in the > configuration :/ Filed https://bugs.webkit.org/show_bug.cgi?id=182514 332902 2018-02-01 13:11:46 -0800 2018-02-01 18:13:18 -0800 Patch bug-182403-20180201131145.patch text/plain 20768 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5MTk1MmFjMDE1NWZiMWRj YTk4NjIyN2VmMzQ2NGYwNWQ4NjA3N2UuLjdhYzM0YjcwMGUwMzQwMWZhOTI0YzI2OWI4OTI2Mzhj ODYwYWEyMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTgtMDItMDEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENvbmZpZ3VyZSBzZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5IG9uIHRoZSB3ZWIgc2l0ZSBkYXRhIHN0b3JlIGFuZCBt b3ZlIGl0IHRvIGEgQ2FjaGVzIHN1YmZvbGRlciBhcyBhIGRlZmF1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQwMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYnNpdGVEYXRhU3RvcmUgaXMgdGhl IHBsYWNlIHRvIHNldCBjb25maWd1cmF0aW9uIGluZm9ybWF0aW9uIHN1Y2ggYXMgc2VydmljZSB3 b3JrZXIgcmVnaXN0cmF0aW9uIHBhdGguCisgICAgICAgIFRoaXMgcGF0Y2ggdXBkYXRlcyBXZWJL aXQgY29kZSBhY2NvcmRpbmdseS4KKyAgICAgICAgQnkgZGVmYXVsdCwgdGhlIHNlcnZpY2Ugd29y a2VyIHJlZ2lzdHJhdGlvbiBwYXRoIGlzIGluIGEgQ2FjaGVzIHN1YmZvbGRlciwgc2ltaWxhcmx5 IHRvIGNhY2hlIEFQSSBwYXRoLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb246OmNyZWF0ZVdpdGhMZWdhY3lPcHRpb25zKToKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uOjpjcmVhdGVXaXRoV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24p OgorICAgICAgICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OlByb2Nlc3NQb29sQ29u ZmlndXJhdGlvbik6CisgICAgICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y29w eSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5j cHA6CisgICAgICAgIChXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weVNlcnZpY2VXb3JrZXJEYXRh YmFzZURpcmVjdG9yeSk6IERlbGV0ZWQuCisgICAgICAgIChXS0NvbnRleHRDb25maWd1cmF0aW9u U2V0U2VydmljZVdvcmtlckRhdGFiYXNlRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgorICAgICAgICAo QVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRp cmVjdG9yeSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3Rv cmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfc2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbkRpcmVjdG9yeV0pOgorICAgICAgICAoLVtXS1dlYnNpdGVEYXRhU3RvcmUgX3NldFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6XSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6 OmVuc3VyZVN0b3JhZ2VQcm9jZXNzQW5kV2Vic2l0ZURhdGFTdG9yZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQb29sOjppbml0aWFsaXplTmV3V2ViUHJvY2Vzcyk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSBj b25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNldFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkpOgorCiAyMDE4LTAxLTMxICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBEZWxheSBzZXJ2aWNlIHdvcmtlciBwcm9jZXNz IGNyZWF0aW9uIHVudGlsIGFjdHVhbGx5IG5lZWRlZCBieSBTV1NlcnZlcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmNwcAppbmRleCA3NjdiMTcxOWU3MzUwNDIyOTc0ZTNjMTlhNDUwMzcyMTc2NjM1YjNlLi5l OTY5NDA2YjdmY2I4MTdkMmQ2ZWEwNGYyNzkzNjAwODY0ODBiMTM3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmNwcApAQCAtNDksNyArNDksNiBAQCBSZWY8UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uPiBQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OmNyZWF0ZVdpdGhMZWdhY3lPcHRpb25zKAogICAgIGNv bmZpZ3VyYXRpb24tPm1fZGlza0NhY2hlRGlyZWN0b3J5ID0gV2ViS2l0OjpXZWJQcm9jZXNzUG9v bDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCk7CiAgICAgY29u ZmlndXJhdGlvbi0+bV9tZWRpYUNhY2hlRGlyZWN0b3J5ID0gV2ViS2l0OjpXZWJQcm9jZXNzUG9v bDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0TWVkaWFDYWNoZURpcmVjdG9yeSgpOwogICAgIGNvbmZp Z3VyYXRpb24tPm1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgp OwotICAgIGNvbmZpZ3VyYXRpb24tPm1fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9y eSA9IFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdFNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKTsKICAgICBjb25maWd1cmF0aW9uLT5tX2xvY2Fs U3RvcmFnZURpcmVjdG9yeSA9IFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3Jt RGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpOwogICAgIGNvbmZpZ3VyYXRpb24tPm1fbWVk aWFLZXlzU3RvcmFnZURpcmVjdG9yeSA9IFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBs YXRmb3JtRGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKTsKICAgICBjb25maWd1cmF0 aW9uLT5tX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6 bGVnYWN5UGxhdGZvcm1EZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKTsKQEAgLTY3LDcg KzY2LDYgQEAgUmVmPFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbj4gUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uOjpjcmVhdGVXaXRoV2Vic2l0ZURhdGFTdG8KICAgICBjb25maWd1cmF0aW9uLT5tX2Rp c2tDYWNoZURpcmVjdG9yeSA9IGxlZ2FjeUNvbmZpZ3VyYXRpb24ubmV0d29ya0NhY2hlRGlyZWN0 b3J5OwogICAgIGNvbmZpZ3VyYXRpb24tPm1fbWVkaWFDYWNoZURpcmVjdG9yeSA9IGxlZ2FjeUNv bmZpZ3VyYXRpb24ubWVkaWFDYWNoZURpcmVjdG9yeTsKICAgICBjb25maWd1cmF0aW9uLT5tX2lu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0gV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bGVnYWN5 UGxhdGZvcm1EZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKTsKLSAgICBjb25maWd1 cmF0aW9uLT5tX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgPSBXZWJLaXQ6Oldl YlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi0+bV9sb2NhbFN0b3JhZ2VEaXJlY3Rv cnkgPSBsZWdhY3lDb25maWd1cmF0aW9uLmxvY2FsU3RvcmFnZURpcmVjdG9yeTsKICAgICBjb25m aWd1cmF0aW9uLT5tX21lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSBsZWdhY3lDb25maWd1cmF0 aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnk7CiAgICAgY29uZmlndXJhdGlvbi0+bV9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5ID0gbGVnYWN5Q29uZmlndXJhdGlvbi5yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5OwpAQCAtODIsNyArODAsNiBAQCBQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb246OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbigpCiAgICAgLCBtX2Rpc2tDYWNo ZURpcmVjdG9yeShXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5 KCkpCiAgICAgLCBtX21lZGlhQ2FjaGVEaXJlY3RvcnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVs dE1lZGlhQ2FjaGVEaXJlY3RvcnkoKSkKICAgICAsIG1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rv cnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkp Ci0gICAgLCBtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoV2Vic2l0ZURhdGFT dG9yZTo6ZGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKSkKICAgICAs IG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5KFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoKSkKICAgICAsIG1fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoV2Vic2l0 ZURhdGFTdG9yZTo6ZGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkpCiAgICAgLCBtX21l ZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE1lZGlhS2V5 c1N0b3JhZ2VEaXJlY3RvcnkoKSkKQEAgLTEwOSw3ICsxMDYsNiBAQCBSZWY8UHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uPiBQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OmNvcHkoKQogICAgIGNvcHkt Pm1fYXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSA9IHRoaXMtPm1fYXBw bGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZTsKICAgICBjb3B5LT5tX21lZGlh Q2FjaGVEaXJlY3RvcnkgPSB0aGlzLT5tX21lZGlhQ2FjaGVEaXJlY3Rvcnk7CiAgICAgY29weS0+ bV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSA9IHRoaXMtPm1faW5kZXhlZERCRGF0YWJhc2VE aXJlY3Rvcnk7Ci0gICAgY29weS0+bV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5 ID0gdGhpcy0+bV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5OwogICAgIGNvcHkt Pm1faW5qZWN0ZWRCdW5kbGVQYXRoID0gdGhpcy0+bV9pbmplY3RlZEJ1bmRsZVBhdGg7CiAgICAg Y29weS0+bV9sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSB0aGlzLT5tX2xvY2FsU3RvcmFnZURpcmVj dG9yeTsKICAgICBjb3B5LT5tX21lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSB0aGlzLT5tX21l ZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKaW5kZXggZTBhYmMwMTFj OWI3YTY3OTg0ZmE4ODIwMTMxNTlhY2NhY2FiMWQ3Ni4uMTk2YzJkZDUzY2IzODMyMGZiZGEwMDhh YzQ0OTFjNGQ4MDZkNzZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaApAQCAtNzYsOSArNzYsNiBAQCBw dWJsaWM6CiAgICAgY29uc3QgV1RGOjpTdHJpbmcmIGluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KCkgY29uc3QgeyByZXR1cm4gbV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsgfQogICAgIHZv aWQgc2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoY29uc3QgV1RGOjpTdHJpbmcmIGluZGV4 ZWREQkRhdGFiYXNlRGlyZWN0b3J5KSB7IG1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgPSBp bmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsgfQogCi0gICAgY29uc3QgV1RGOjpTdHJpbmcmIHNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKSBjb25zdCB7IHJldHVybiBtX3NlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk7IH0KLSAgICB2b2lkIHNldFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoY29uc3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeSkgeyBt X3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgPSBkaXJlY3Rvcnk7IH0KLSAgICAK ICAgICBjb25zdCBXVEY6OlN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKCkgY29uc3QgeyByZXR1 cm4gbV9pbmplY3RlZEJ1bmRsZVBhdGg7IH0KICAgICB2b2lkIHNldEluamVjdGVkQnVuZGxlUGF0 aChjb25zdCBXVEY6OlN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKSB7IG1faW5qZWN0ZWRCdW5k bGVQYXRoID0gaW5qZWN0ZWRCdW5kbGVQYXRoOyB9CiAKQEAgLTE1MSw3ICsxNDgsNiBAQCBwcml2 YXRlOgogICAgIFdURjo6U3RyaW5nIG1fZGlza0NhY2hlRGlyZWN0b3J5OwogICAgIFdURjo6U3Ry aW5nIG1fbWVkaWFDYWNoZURpcmVjdG9yeTsKICAgICBXVEY6OlN0cmluZyBtX2luZGV4ZWREQkRh dGFiYXNlRGlyZWN0b3J5OwotICAgIFdURjo6U3RyaW5nIG1fc2VydmljZVdvcmtlclJlZ2lzdHJh dGlvbkRpcmVjdG9yeTsKICAgICBXVEY6OlN0cmluZyBtX2luamVjdGVkQnVuZGxlUGF0aDsKICAg ICBXVEY6OlN0cmluZyBtX2xvY2FsU3RvcmFnZURpcmVjdG9yeTsKICAgICBXVEY6OlN0cmluZyBt X3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmNwcAppbmRleCA2NmQ5 NmMyOTg0MTRkZDc5MjVhYjMyM2VhMzBiMDI3ODYyOWRkOWY2Li44YWM4MWRkNjM0MWE1NzA0ZjJm ODZlYzI2MjBkOGFiZTY0YjkzYTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmNwcApAQCAtNzgsMTYg Kzc4LDYgQEAgdm9pZCBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0SW5kZXhlZERCRGF0YWJhc2VE aXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblIKICAgICB0b0ltcGwoY29uZmlndXJhdGlv biktPnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KHRvSW1wbChpbmRleGVkREJEYXRhYmFz ZURpcmVjdG9yeSktPnN0cmluZygpKTsKIH0KIAotV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmln dXJhdGlvbkNvcHlTZXJ2aWNlV29ya2VyRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQotewotICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0lt cGwoY29uZmlndXJhdGlvbiktPnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKSk7 Ci19Ci0KLXZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFNlcnZpY2VXb3JrZXJEYXRhYmFz ZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIFdLU3Ry aW5nUmVmIHN3RGF0YWJhc2VEaXJlY3RvcnkpCi17Ci0gICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24p LT5zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KHRvSW1wbChzd0RhdGFiYXNl RGlyZWN0b3J5KS0+c3RyaW5nKCkpOwotfQotCiBXS1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1 cmF0aW9uQ29weUluamVjdGVkQnVuZGxlUGF0aChXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNv bmZpZ3VyYXRpb24pCiB7CiAgICAgcmV0dXJuIHRvQ29waWVkQVBJKHRvSW1wbChjb25maWd1cmF0 aW9uKS0+aW5qZWN0ZWRCdW5kbGVQYXRoKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oCmluZGV4IDU5MDk0 Y2Y5MThkYzUxN2ZjOTJhNGNiNDcxM2U2NmY2NDEzYmU0OTUuLmQ2OWJiODUyOTY3NjFiZWYyNWY1 ZjBkMzE3OWJhMTNjNDAyNzM0MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmgKQEAgLTQ0LDkgKzQ0LDYg QEAgV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldERpc2tDYWNoZURpcmVj dG9yeShXS0NvbnRleHRDb25maWd1cmF0aW8KIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS0NvbnRl eHRDb25maWd1cmF0aW9uQ29weUluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dENv bmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbik7CiBXS19FWFBPUlQgdm9pZCBXS0NvbnRleHRD b25maWd1cmF0aW9uU2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBpbmRleGVkREJEYXRhYmFzZURp cmVjdG9yeSk7CiAKLVdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9u Q29weVNlcnZpY2VXb3JrZXJEYXRhYmFzZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9u UmVmIGNvbmZpZ3VyYXRpb24pOwotV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlv blNldFNlcnZpY2VXb3JrZXJEYXRhYmFzZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9u UmVmIGNvbmZpZ3VyYXRpb24sIFdLU3RyaW5nUmVmIHN3RGF0YWJhc2VEaXJlY3RvcnkpOwotCiBX S19FWFBPUlQgV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlJbmplY3RlZEJ1 bmRsZVBhdGgoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKIFdLX0VY UE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRJbmplY3RlZEJ1bmRsZVBhdGgoV0tD b250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBpbmplY3Rl ZEJ1bmRsZVBhdGgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQppbmRleCAwNzljOGNkZDE1 ZjNjYTUxZGEyZWIxYmUyZGExZDkzOWFkNWU2ZTY1Li43MDYxNzQyMDFkZDM3NmI5YzY1NTA2YjZm ZmQxMDUyOWQxYTMwZjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTc0LDcgKzc0 LDcgQEAgU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURp cmVjdG9yeSgpCiAKIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0U2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpCiB7Ci0gICAgcmV0dXJuIHdlYnNpdGVEYXRhRGlyZWN0 b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKCJTZXJ2aWNlV29ya2VycyIpOworICAgIHJldHVy biBjYWNoZURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiU2VydmljZVdvcmtlcnMi KTsKIH0KIAogU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRMb2NhbFN0b3JhZ2VEaXJl Y3RvcnkoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYnNpdGVEYXRhU3RvcmUubW0KaW5kZXggZDRlZWI5ZjM0ZThjODgxZjI5NWJmMDE1ZWQwYjBj YjZkMDExNjhmMy4uYzlmZjkzOGZmMDY3MGNiNmU2Nzg3MTg3MjI0ODg2Zjc4ODY2NzRkYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFT dG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl RGF0YVN0b3JlLm1tCkBAIC0yNjQsNiArMjY0LDE2IEBAIC0gKHZvaWQpX3NldENhY2hlU3RvcmFn ZURpcmVjdG9yeTooTlNTdHJpbmcgKilkaXJlY3RvcnkKICAgICBfd2Vic2l0ZURhdGFTdG9yZS0+ d2Vic2l0ZURhdGFTdG9yZSgpLnNldENhY2hlU3RvcmFnZURpcmVjdG9yeShkaXJlY3RvcnkpOwog fQogCistIChOU1N0cmluZyAqKV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5Cit7 CisgICAgcmV0dXJuIF93ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpOworfQorCistICh2b2lkKV9zZXRTZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5OihOU1N0cmluZyAqKWRpcmVjdG9yeQoreworICAg IF93ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2V0U2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbkRpcmVjdG9yeShkaXJlY3RvcnkpOworfQorCiAtICh2b2lkKV9zZXRCb3VuZElu dGVyZmFjZUlkZW50aWZpZXI6KE5TU3RyaW5nICopaWRlbnRpZmllcgogewogICAgIF93ZWJzaXRl RGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2V0Qm91bmRJbnRlcmZhY2VJZGVudGlmaWVy KGlkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgKaW5kZXggZDBiZWFkZmY0NDJl ODQ0NTA1ZDAzOGQ5MzA3MDNhNDcyMzkzMjQzZC4uNjIxMzU1NmM2NjIyNTEyMTczNWNhNzQ0MjFh YWZlYjVlNzRhNzIyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0ZS5oCkBAIC00OCw2ICs0OCw3 IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tXZWJzaXRlRGF0YVN0b3JlRmV0 Y2hPcHRpb25zKSB7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGVidWdNb2RlOikgQk9PTCBfcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVn TW9kZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEp KTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldENhY2hlU3RvcmFnZVBlck9yaWdp blF1b3RhOikgTlNVSW50ZWdlciBfY2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGEgV0tfQVBJX0FW QUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYywgc2V0dGVyPV9zZXRDYWNoZVN0b3JhZ2VEaXJlY3Rvcnk6KSBOU1N0cmluZyog X2NhY2hlU3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6KSBOU1N0cmluZyogX3NlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RC QSksIGlvcyhXS19JT1NfVEJBKSk7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3Nl dEJvdW5kSW50ZXJmYWNlSWRlbnRpZmllcjopIE5TU3RyaW5nICpfYm91bmRJbnRlcmZhY2VJZGVu dGlmaWVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RC QSkpOwogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0QWxsb3dzQ2VsbHVsYXJBY2Nl c3M6KSBCT09MIF9hbGxvd3NDZWxsdWxhckFjY2VzcyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCmluZGV4IDZmZmYzM2VhMzJjNjli Y2QwZGFiZjg0YjRiMzQ0M2UyNzlkNWMzZWMuLjJkMWFkZTM3Y2Y0YTY1YzA4YWYwZDZmNWNkOTQ4 YTFjMzNlZmZjMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlByb2Nlc3NQb29sQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQpAQCAtNDAzLDE2ICs0MDMsNiBAQCBTdHJpbmcgV2ViUHJv Y2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KCkKICAgICByZXR1cm4gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGxlZ2Fj eVBsYXRmb3JtRGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCksICJfX19JbmRleGVkREIi KTsKIH0KIAotU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRTZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCkKLXsKLSAgICByZWdpc3RlclVzZXJEZWZh dWx0c0lmTmVlZGVkKCk7Ci0KLSAgICBOU1N0cmluZyAqZGlyZWN0b3J5ID0gW1tOU1VzZXJEZWZh dWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0Rm9yS2V5OldlYlNlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb25EaXJlY3RvcnlEZWZhdWx0c0tleV07Ci0gICAgaWYgKCFkaXJlY3RvcnkgfHwg IVtkaXJlY3RvcnkgaXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xhc3NdXSkKLSAgICAgICAgZGly ZWN0b3J5ID0gQCJ+L0xpYnJhcnkvV2ViS2l0L1NlcnZpY2VXb3JrZXJzIjsKLSAgICByZXR1cm4g c3RyaW5nQnlSZXNvbHZpbmdTeW1saW5rc0luUGF0aChbZGlyZWN0b3J5IHN0cmluZ0J5U3RhbmRh cmRpemluZ1BhdGhdKTsKLX0KLQogU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9y bURlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKQogewogICAgIHJlZ2lzdGVyVXNlckRlZmF1 bHRzSWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cAppbmRleCAwNWZlNmY4N2M5MGQxODc2NDhkZjYwNDY2ZWMwZDgwZDVkMWQ3YmNiLi5mZWJkZDA5 YmMwNjIyNzk1NTY2YzNkZTI5ZjMyNjA4ZTYxY2QwYjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC01NTUsNyArNTU1LDcgQEAgdm9pZCBXZWJQcm9j ZXNzUG9vbDo6ZW5zdXJlU3RvcmFnZVByb2Nlc3NBbmRXZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVE YXRhU3RvcmUqIHIKICNlbmRpZgogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKICAgICAgICAg aWYgKHBhcmFtZXRlcnMuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeS5pc0VtcHR5 KCkpIHsKLSAgICAgICAgICAgIHBhcmFtZXRlcnMuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRp cmVjdG9yeSA9IG1fY29uZmlndXJhdGlvbi0+c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVj dG9yeSgpOworICAgICAgICAgICAgcGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9u RGlyZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0U2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbkRpcmVjdG9yeSgpOwogICAgICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3Jl YXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuc2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbkRpcmVjdG9yeSwgcGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9u RGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKICAgICAgICAgfQogCkBAIC04MTYsNyArODE2LDEw IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdXZWJQcm9jZXNzKFdlYlByb2Nl c3NQcm94eSYgcHJvY2VzcywgV2Vic2l0ZURhCiAjZW5kaWYKIAogI2lmIEVOQUJMRShTRVJWSUNF X1dPUktFUikKLSAgICBwYXJhbWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IFNl cnZpY2VXb3JrZXJQcm9jZXNzUHJveHk6Omhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhtX2Nv bmZpZ3VyYXRpb24tPnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKSk7CisgICAg U3RyaW5nIHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgPSB3ZWJzaXRlRGF0YVN0 b3JlLnJlc29sdmVkU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpOworICAgIGlm IChzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAg c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9y ZTo6ZGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKTsKKyAgICBwYXJh bWV0ZXJzLmhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyA9IFNlcnZpY2VXb3JrZXJQcm9jZXNz UHJveHk6Omhhc1JlZ2lzdGVyZWRTZXJ2aWNlV29ya2VycyhzZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uRGlyZWN0b3J5KTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCBiZTBkODQ4YjBk NzliNjJhYzNlZjg5ZTE4OGJhMmExMWVlMTNhNzYyLi5mYzFkOTY0MGFiNDg0NzU4YzhmMzBkYjli NzNjNjk3OGJkZWI5NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmgKQEAgLTM5Myw3ICszOTMsNiBAQCBwdWJsaWM6CiAgICAgLy8gRklYTUU6IE1vdmUgdGhlc2Ug dG8gQVBJOjpXZWJzaXRlRGF0YVN0b3JlLgogICAgIHN0YXRpYyBTdHJpbmcgbGVnYWN5UGxhdGZv cm1EZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CiAgICAgc3RhdGljIFN0cmluZyBsZWdh Y3lQbGF0Zm9ybURlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpOwotICAgIHN0YXRp YyBTdHJpbmcgbGVnYWN5UGxhdGZvcm1EZWZhdWx0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRp cmVjdG9yeSgpOwogICAgIHN0YXRpYyBTdHJpbmcgbGVnYWN5UGxhdGZvcm1EZWZhdWx0V2ViU1FM RGF0YWJhc2VEaXJlY3RvcnkoKTsKICAgICBzdGF0aWMgU3RyaW5nIGxlZ2FjeVBsYXRmb3JtRGVm YXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKTsKICAgICBzdGF0aWMgU3RyaW5nIGxlZ2Fj eVBsYXRmb3JtRGVmYXVsdE1lZGlhQ2FjaGVEaXJlY3RvcnkoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAppbmRleCBi NTQ2Y2ExYzYwY2RhYzM4NTNkYjQxY2ZlZGUxMzcxYzkyZmE2MTg2Li4zMjI5NWZjZTk1MTVmNGZh MzQ3NGI0ODllZTc2MDU3MmIyY2VmYjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCkBAIC0xMDcsNiArMTA3LDgg QEAgcHVibGljOgogICAgIHZvaWQgc2V0Q2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGEodWludDY0 X3QgcXVvdGEpIHsgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24uY2FjaGVTdG9yYWdlUGVyT3JpZ2lu UXVvdGEgPSBxdW90YTsgfQogICAgIGNvbnN0IFN0cmluZyYgY2FjaGVTdG9yYWdlRGlyZWN0b3J5 KCkgY29uc3QgeyByZXR1cm4gbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24uY2FjaGVTdG9yYWdlRGly ZWN0b3J5OyB9CiAgICAgdm9pZCBzZXRDYWNoZVN0b3JhZ2VEaXJlY3RvcnkoU3RyaW5nJiYgZGly ZWN0b3J5KSB7IG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLmNhY2hlU3RvcmFnZURpcmVjdG9yeSA9 IFdURk1vdmUoZGlyZWN0b3J5KTsgfQorICAgIGNvbnN0IFN0cmluZyYgc2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbkRpcmVjdG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb2x2ZWRDb25maWd1cmF0 aW9uLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk7IH0KKyAgICB2b2lkIHNldFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoU3RyaW5nJiYgZGlyZWN0b3J5KSB7IG1f cmVzb2x2ZWRDb25maWd1cmF0aW9uLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnkg PSBXVEZNb3ZlKGRpcmVjdG9yeSk7IH0KIAogICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZSogcmVzb3VyY2VMb2FkU3RhdGlzdGljcygpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VM b2FkU3RhdGlzdGljcy5nZXQoKTsgfQogICAgIHZvaWQgY2xlYXJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzSW5XZWJQcm9jZXNzZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlYjJlYzgzOTMyOGMz NTFiOWM2MWQ0ZDFmZDQ0ZmZlMDAyYjEyNzA1Li42Zjg5MmU5MWY3N2NhNDI2NTI4YTBjNmVhNGU2 MGI2NjIwNmY1Y2U1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDItMDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgorCisgICAgICAgIENvbmZpZ3VyZSBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uRGlyZWN0b3J5IG9uIHRoZSB3ZWIgc2l0ZSBkYXRhIHN0b3JlIGFuZCBtb3ZlIGl0IHRvIGEg Q2FjaGVzIHN1YmZvbGRlciBhcyBhIGRlZmF1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5j cHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpnZW5lcmF0ZUNvbnRleHRDb25maWd1 cmF0aW9uIGNvbnN0KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250 cm9sbGVyQ29jb2EubW06CisgICAgICAgIChXVFI6OmluaXRpYWxpemVXZWJWaWV3Q29uZmlndXJh dGlvbik6CisKIDIwMTgtMDEtMzEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIERlbGF5IHNlcnZpY2Ugd29ya2VyIHByb2Nlc3MgY3JlYXRpb24gdW50aWwgYWN0 dWFsbHkgbmVlZGVkIGJ5IFNXU2VydmVyCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRy b2xsZXIuY3BwCmluZGV4IGYzMDg1ZWZlY2RhMjE3ODY0NWYyYjU3NDVhYzM0NTUyNTM0ZDMzMmEu LjIyODlkZTI2OWEzNDU2MWQwYjViZWQ4YzkzNzRiN2RmZWU5YmE3NTMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC00MTEsNyArNDExLDYgQEAgV0tSZXRh aW5QdHI8V0tDb250ZXh0Q29uZmlndXJhdGlvblJlZj4gVGVzdENvbnRyb2xsZXI6OmdlbmVyYXRl Q29udGV4dENvbmZpZ3VyYXQKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldEFwcGxp Y2F0aW9uQ2FjaGVEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlG b2xkZXIgKyBzZXBhcmF0b3IgKyAiQXBwbGljYXRpb25DYWNoZSIpLmdldCgpKTsKICAgICAgICAg V0tDb250ZXh0Q29uZmlndXJhdGlvblNldERpc2tDYWNoZURpcmVjdG9yeShjb25maWd1cmF0aW9u LmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJDYWNoZSIpLmdldCgp KTsKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldEluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgc2VwYXJh dG9yICsgIkRhdGFiYXNlcyIgKyBzZXBhcmF0b3IgKyAiSW5kZXhlZERCIikuZ2V0KCkpOwotICAg ICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0U2VydmljZVdvcmtlckRhdGFiYXNlRGlyZWN0 b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgc2VwYXJhdG9y ICsgIlNlcnZpY2VXb3JrZXJzIikuZ2V0KCkpOwogICAgICAgICBXS0NvbnRleHRDb25maWd1cmF0 aW9uU2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVt cG9yYXJ5Rm9sZGVyICsgc2VwYXJhdG9yICsgIkxvY2FsU3RvcmFnZSIpLmdldCgpKTsKICAgICAg ICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KGNvbmZp Z3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgc2VwYXJhdG9yICsgIkRhdGFi YXNlcyIgKyBzZXBhcmF0b3IgKyAiV2ViU1FMIikuZ2V0KCkpOwogICAgICAgICBXS0NvbnRleHRD b25maWd1cmF0aW9uU2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9uLmdl dCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJNZWRpYUtleXMiKS5nZXQo KSk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9s bGVyQ29jb2EubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVy Q29jb2EubW0KaW5kZXggOWMxOTc2M2UxYTgzODA5NDMwNzI0MzNiZDk2YWQxZjA4N2Q2MzFmYi4u NmZjMjUwOTM5YWM2YzgyNWVhYWE4NTBlNTg1ZmZmYjc0NmY4YzczYSAxMDA2NDQKLS0tIGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1tCisrKyBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQpAQCAtODMs NiArODMsOSBAQCB2b2lkIGluaXRpYWxpemVXZWJWaWV3Q29uZmlndXJhdGlvbihjb25zdCBjaGFy KiBsaWJyYXJ5UGF0aCwgV0tTdHJpbmdSZWYgaW5qZWN0ZQogICAgIGlmIChsaWJyYXJ5UGF0aCkg ewogICAgICAgICBTdHJpbmcgY2FjaGVTdG9yYWdlRGlyZWN0b3J5ID0gU3RyaW5nKGxpYnJhcnlQ YXRoKSArICcvJyArICJDYWNoZVN0b3JhZ2UiOwogICAgICAgICBbcG9vbFdlYnNpdGVEYXRhU3Rv cmUgX3NldENhY2hlU3RvcmFnZURpcmVjdG9yeTogY2FjaGVTdG9yYWdlRGlyZWN0b3J5XTsKKwor ICAgICAgICBTdHJpbmcgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSA9IFN0cmlu ZyhsaWJyYXJ5UGF0aCkgKyAnLycgKyAiU2VydmljZVdvcmtlcnMiOworICAgICAgICBbcG9vbFdl YnNpdGVEYXRhU3RvcmUgX3NldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6IHNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnldOwogICAgIH0KIAogICAgIFtnbG9iYWxX ZWJWaWV3Q29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRW5hYmxlZDpZRVNdOwo= 332929 2018-02-01 18:13:20 -0800 2018-02-02 15:57:36 -0800 Patch bug-182403-20180201181319.patch text/plain 22664 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3OTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY1MDQzOTgzZjk1MTA2NjBh NDc5ZDVhZjE1Y2NkMTNiOTAyYjFlM2MuLmU2YTFmNWU4OGM0ZDE4OTQzODZhNjk5ZDNjMTkwMWNl MTA4MmIxM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTgtMDItMDEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENvbmZpZ3VyZSBzZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5IG9uIHRoZSB3ZWIgc2l0ZSBkYXRhIHN0b3JlIGFuZCBt b3ZlIGl0IHRvIGEgQ2FjaGVzIHN1YmZvbGRlciBhcyBhIGRlZmF1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQwMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYnNpdGVEYXRhU3RvcmUgaXMgdGhl IHBsYWNlIHRvIHNldCBjb25maWd1cmF0aW9uIGluZm9ybWF0aW9uIHN1Y2ggYXMgc2VydmljZSB3 b3JrZXIgcmVnaXN0cmF0aW9uIHBhdGguCisgICAgICAgIFRoaXMgcGF0Y2ggdXBkYXRlcyBXZWJL aXQgY29kZSBhY2NvcmRpbmdseS4KKyAgICAgICAgQnkgZGVmYXVsdCwgdGhlIHNlcnZpY2Ugd29y a2VyIHJlZ2lzdHJhdGlvbiBwYXRoIGlzIGluIGEgQ2FjaGVzIHN1YmZvbGRlciwgc2ltaWxhcmx5 IHRvIGNhY2hlIEFQSSBwYXRoLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb246OmNyZWF0ZVdpdGhMZWdhY3lPcHRpb25zKToKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uOjpjcmVhdGVXaXRoV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24p OgorICAgICAgICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OlByb2Nlc3NQb29sQ29u ZmlndXJhdGlvbik6CisgICAgICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y29w eSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5j cHA6CisgICAgICAgIChXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weVNlcnZpY2VXb3JrZXJEYXRh YmFzZURpcmVjdG9yeSk6IERlbGV0ZWQuCisgICAgICAgIChXS0NvbnRleHRDb25maWd1cmF0aW9u U2V0U2VydmljZVdvcmtlckRhdGFiYXNlRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgorICAgICAgICAo QVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRp cmVjdG9yeSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3Rv cmUubW06CisgICAgICAgICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfc2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbkRpcmVjdG9yeV0pOgorICAgICAgICAoLVtXS1dlYnNpdGVEYXRhU3RvcmUgX3NldFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk6XSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6 OmVuc3VyZVN0b3JhZ2VQcm9jZXNzQW5kV2Vic2l0ZURhdGFTdG9yZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQb29sOjppbml0aWFsaXplTmV3V2ViUHJvY2Vzcyk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSBj b25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNldFNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViUHJv Y2Vzc1Bvb2xHdGsuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc1Bvb2xX UEUuY3BwOgorCiAyMDE4LTAyLTAxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBDbGVhcmluZyBhbGwgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9ucyBzaG91 bGQgd2FpdCBmb3IgaW1wb3J0aW5nIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiB0byBmaW5p c2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nl c3NQb29sQ29uZmlndXJhdGlvbi5jcHAKaW5kZXggNzY3YjE3MTllNzM1MDQyMjk3NGUzYzE5YTQ1 MDM3MjE3NjYzNWIzZS4uZTk2OTQwNmI3ZmNiODE3ZDJkNmVhMDRmMjc5MzYwMDg2NDgwYjEzNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29u ZmlndXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nl c3NQb29sQ29uZmlndXJhdGlvbi5jcHAKQEAgLTQ5LDcgKzQ5LDYgQEAgUmVmPFByb2Nlc3NQb29s Q29uZmlndXJhdGlvbj4gUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpjcmVhdGVXaXRoTGVnYWN5 T3B0aW9ucygKICAgICBjb25maWd1cmF0aW9uLT5tX2Rpc2tDYWNoZURpcmVjdG9yeSA9IFdlYktp dDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdE5ldHdvcmtDYWNoZURpcmVj dG9yeSgpOwogICAgIGNvbmZpZ3VyYXRpb24tPm1fbWVkaWFDYWNoZURpcmVjdG9yeSA9IFdlYktp dDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdE1lZGlhQ2FjaGVEaXJlY3Rv cnkoKTsKICAgICBjb25maWd1cmF0aW9uLT5tX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0g V2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0SW5kZXhlZERCRGF0 YWJhc2VEaXJlY3RvcnkoKTsKLSAgICBjb25maWd1cmF0aW9uLT5tX3NlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25EaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9y bURlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCk7CiAgICAgY29uZmln dXJhdGlvbi0+bV9sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlByb2Nlc3NQb29s OjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKTsKICAgICBjb25m aWd1cmF0aW9uLT5tX21lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCk7 CiAgICAgY29uZmlndXJhdGlvbi0+bV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSA9IFdlYktpdDo6 V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0 b3J5KCk7CkBAIC02Nyw3ICs2Niw2IEBAIFJlZjxQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IFBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y3JlYXRlV2l0aFdlYnNpdGVEYXRhU3RvCiAgICAgY29u ZmlndXJhdGlvbi0+bV9kaXNrQ2FjaGVEaXJlY3RvcnkgPSBsZWdhY3lDb25maWd1cmF0aW9uLm5l dHdvcmtDYWNoZURpcmVjdG9yeTsKICAgICBjb25maWd1cmF0aW9uLT5tX21lZGlhQ2FjaGVEaXJl Y3RvcnkgPSBsZWdhY3lDb25maWd1cmF0aW9uLm1lZGlhQ2FjaGVEaXJlY3Rvcnk7CiAgICAgY29u ZmlndXJhdGlvbi0+bV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSA9IFdlYktpdDo6V2ViUHJv Y2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KCk7Ci0gICAgY29uZmlndXJhdGlvbi0+bV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5ID0gV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0U2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpOwogICAgIGNvbmZpZ3VyYXRpb24tPm1fbG9j YWxTdG9yYWdlRGlyZWN0b3J5ID0gbGVnYWN5Q29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJl Y3Rvcnk7CiAgICAgY29uZmlndXJhdGlvbi0+bV9tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5ID0g bGVnYWN5Q29uZmlndXJhdGlvbi5tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OwogICAgIGNvbmZp Z3VyYXRpb24tPm1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IGxlZ2FjeUNvbmZp Z3VyYXRpb24ucmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeTsKQEAgLTgyLDcgKzgwLDYg QEAgUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24oKQog ICAgICwgbV9kaXNrQ2FjaGVEaXJlY3RvcnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE5ldHdv cmtDYWNoZURpcmVjdG9yeSgpKQogICAgICwgbV9tZWRpYUNhY2hlRGlyZWN0b3J5KFdlYnNpdGVE YXRhU3RvcmU6OmRlZmF1bHRNZWRpYUNhY2hlRGlyZWN0b3J5KCkpCiAgICAgLCBtX2luZGV4ZWRE QkRhdGFiYXNlRGlyZWN0b3J5KFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRJbmRleGVkREJEYXRh YmFzZURpcmVjdG9yeSgpKQotICAgICwgbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5KFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGly ZWN0b3J5KCkpCiAgICAgLCBtX2xvY2FsU3RvcmFnZURpcmVjdG9yeShXZWJzaXRlRGF0YVN0b3Jl OjpkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkpCiAgICAgLCBtX3dlYlNRTERhdGFiYXNl RGlyZWN0b3J5KFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9y eSgpKQogICAgICwgbV9tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KFdlYnNpdGVEYXRhU3RvcmU6 OmRlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KCkpCkBAIC0xMDksNyArMTA2LDYgQEAg UmVmPFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbj4gUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpj b3B5KCkKICAgICBjb3B5LT5tX2FwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5h bWUgPSB0aGlzLT5tX2FwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWU7CiAg ICAgY29weS0+bV9tZWRpYUNhY2hlRGlyZWN0b3J5ID0gdGhpcy0+bV9tZWRpYUNhY2hlRGlyZWN0 b3J5OwogICAgIGNvcHktPm1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgPSB0aGlzLT5tX2lu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5OwotICAgIGNvcHktPm1fc2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbkRpcmVjdG9yeSA9IHRoaXMtPm1fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVj dG9yeTsKICAgICBjb3B5LT5tX2luamVjdGVkQnVuZGxlUGF0aCA9IHRoaXMtPm1faW5qZWN0ZWRC dW5kbGVQYXRoOwogICAgIGNvcHktPm1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gdGhpcy0+bV9s b2NhbFN0b3JhZ2VEaXJlY3Rvcnk7CiAgICAgY29weS0+bV9tZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5ID0gdGhpcy0+bV9tZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5o CmluZGV4IGUwYWJjMDExYzliN2E2Nzk4NGZhODgyMDEzMTU5YWNjYWNhYjFkNzYuLjE5NmMyZGQ1 M2NiMzgzMjBmYmRhMDA4YWM0NDkxYzRkODA2ZDc2YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKQEAg LTc2LDkgKzc2LDYgQEAgcHVibGljOgogICAgIGNvbnN0IFdURjo6U3RyaW5nJiBpbmRleGVkREJE YXRhYmFzZURpcmVjdG9yeSgpIGNvbnN0IHsgcmV0dXJuIG1faW5kZXhlZERCRGF0YWJhc2VEaXJl Y3Rvcnk7IH0KICAgICB2b2lkIHNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KGNvbnN0IFdU Rjo6U3RyaW5nJiBpbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSkgeyBtX2luZGV4ZWREQkRhdGFi YXNlRGlyZWN0b3J5ID0gaW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk7IH0KIAotICAgIGNvbnN0 IFdURjo6U3RyaW5nJiBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCkgY29uc3Qg eyByZXR1cm4gbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5OyB9Ci0gICAgdm9p ZCBzZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KGNvbnN0IFdURjo6U3RyaW5n JiBkaXJlY3RvcnkpIHsgbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5ID0gZGly ZWN0b3J5OyB9Ci0gICAgCiAgICAgY29uc3QgV1RGOjpTdHJpbmcmIGluamVjdGVkQnVuZGxlUGF0 aCgpIGNvbnN0IHsgcmV0dXJuIG1faW5qZWN0ZWRCdW5kbGVQYXRoOyB9CiAgICAgdm9pZCBzZXRJ bmplY3RlZEJ1bmRsZVBhdGgoY29uc3QgV1RGOjpTdHJpbmcmIGluamVjdGVkQnVuZGxlUGF0aCkg eyBtX2luamVjdGVkQnVuZGxlUGF0aCA9IGluamVjdGVkQnVuZGxlUGF0aDsgfQogCkBAIC0xNTEs NyArMTQ4LDYgQEAgcHJpdmF0ZToKICAgICBXVEY6OlN0cmluZyBtX2Rpc2tDYWNoZURpcmVjdG9y eTsKICAgICBXVEY6OlN0cmluZyBtX21lZGlhQ2FjaGVEaXJlY3Rvcnk7CiAgICAgV1RGOjpTdHJp bmcgbV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsKLSAgICBXVEY6OlN0cmluZyBtX3NlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnk7CiAgICAgV1RGOjpTdHJpbmcgbV9pbmplY3Rl ZEJ1bmRsZVBhdGg7CiAgICAgV1RGOjpTdHJpbmcgbV9sb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7CiAg ICAgV1RGOjpTdHJpbmcgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJl Zi5jcHAKaW5kZXggNjZkOTZjMjk4NDE0ZGQ3OTI1YWIzMjNlYTMwYjAyNzg2MjlkZDlmNi4uOGFj ODFkZDYzNDFhNTcwNGYyZjg2ZWMyNjIwZDhhYmU2NGI5M2E3ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJl Zi5jcHAKQEAgLTc4LDE2ICs3OCw2IEBAIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldElu ZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SCiAgICAgdG9J bXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSh0b0ltcGwo aW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkpLT5zdHJpbmcoKSk7CiB9CiAKLVdLU3RyaW5nUmVm IFdLQ29udGV4dENvbmZpZ3VyYXRpb25Db3B5U2VydmljZVdvcmtlckRhdGFiYXNlRGlyZWN0b3J5 KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbikKLXsKLSAgICByZXR1cm4g dG9Db3BpZWRBUEkodG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uRGlyZWN0b3J5KCkpOwotfQotCi12b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRTZXJ2 aWNlV29ya2VyRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25m aWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBzd0RhdGFiYXNlRGlyZWN0b3J5KQotewotICAgIHRvSW1w bChjb25maWd1cmF0aW9uKS0+c2V0U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSh0 b0ltcGwoc3dEYXRhYmFzZURpcmVjdG9yeSktPnN0cmluZygpKTsKLX0KLQogV0tTdHJpbmdSZWYg V0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlJbmplY3RlZEJ1bmRsZVBhdGgoV0tDb250ZXh0Q29u ZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQogewogICAgIHJldHVybiB0b0NvcGllZEFQSSh0 b0ltcGwoY29uZmlndXJhdGlvbiktPmluamVjdGVkQnVuZGxlUGF0aCgpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYu aCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25S ZWYuaAppbmRleCA1OTA5NGNmOTE4ZGM1MTdmYzkyYTRjYjQ3MTNlNjZmNjQxM2JlNDk1Li5kNjli Yjg1Mjk2NzYxYmVmMjVmNWYwZDMxNzliYTEzYzQwMjczNDI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5o CkBAIC00NCw5ICs0NCw2IEBAIFdLX0VYUE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25T ZXREaXNrQ2FjaGVEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvCiBXS19FWFBPUlQgV0tT dHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlJbmRleGVkREJEYXRhYmFzZURpcmVj dG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOwogV0tfRVhQT1JU IHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tTdHJpbmdSZWYgaW5k ZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkpOwogCi1XS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tDb250 ZXh0Q29uZmlndXJhdGlvbkNvcHlTZXJ2aWNlV29ya2VyRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKLVdLX0VYUE9SVCB2b2lkIFdLQ29u dGV4dENvbmZpZ3VyYXRpb25TZXRTZXJ2aWNlV29ya2VyRGF0YWJhc2VEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBzd0RhdGFiYXNl RGlyZWN0b3J5KTsKLQogV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLQ29udGV4dENvbmZpZ3VyYXRp b25Db3B5SW5qZWN0ZWRCdW5kbGVQYXRoKFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmln dXJhdGlvbik7CiBXS19FWFBPUlQgdm9pZCBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0SW5qZWN0 ZWRCdW5kbGVQYXRoKFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tT dHJpbmdSZWYgaW5qZWN0ZWRCdW5kbGVQYXRoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0K aW5kZXggMDc5YzhjZGQxNWYzY2E1MWRhMmViMWJlMmRhMWQ5MzlhZDVlNmU2NS4uNzA2MTc0MjAx ZGQzNzZiOWM2NTUwNmI2ZmZkMTA1MjlkMWEzMGYwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL0FQSVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29h Lm1tCkBAIC03NCw3ICs3NCw3IEBAIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0SW5k ZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVm YXVsdFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKQogewotICAgIHJldHVybiB3 ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiU2VydmljZVdvcmtl cnMiKTsKKyAgICByZXR1cm4gY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o IlNlcnZpY2VXb3JrZXJzIik7CiB9CiAKIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0 TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCmluZGV4IGQ0ZWViOWYzNGU4Yzg4 MWYyOTViZjAxNWVkMGIwY2I2ZDAxMTY4ZjMuLmM5ZmY5MzhmZjA2NzBjYjZlNjc4NzE4NzIyNDg4 NmY3ODg2Njc0ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMjY0LDYgKzI2NCwxNiBAQCBzdGF0aWMg VmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHRvV2Vic2l0ZURhdGFSZWNvcmRzKE5T QXJyYXkgKmRhdGFSZWNvcgogICAgIF93ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3Jl KCkuc2V0Q2FjaGVTdG9yYWdlRGlyZWN0b3J5KGRpcmVjdG9yeSk7CiB9CiAKKy0gKE5TU3RyaW5n ICopX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkKK3sKKyAgICByZXR1cm4gX3dl YnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uRGlyZWN0b3J5KCk7Cit9CisKKy0gKHZvaWQpX3NldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25EaXJlY3Rvcnk6KE5TU3RyaW5nICopZGlyZWN0b3J5Cit7CisgICAgX3dlYnNpdGVEYXRhU3Rv cmUtPndlYnNpdGVEYXRhU3RvcmUoKS5zZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5KGRpcmVjdG9yeSk7Cit9CisKIC0gKHZvaWQpX3NldEJvdW5kSW50ZXJmYWNlSWRlbnRpZmll cjooTlNTdHJpbmcgKilpZGVudGlmaWVyCiB7CiAgICAgX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNp dGVEYXRhU3RvcmUoKS5zZXRCb3VuZEludGVyZmFjZUlkZW50aWZpZXIoaWRlbnRpZmllcik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0 YVN0b3JlUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi c2l0ZURhdGFTdG9yZVByaXZhdGUuaAppbmRleCBkMGJlYWRmZjQ0MmU4NDQ1MDVkMDM4ZDkzMDcw M2E0NzIzOTMyNDNkLi42MjEzNTU2YzY2MjI1MTIxNzM1Y2E3NDQyMWFhZmViNWU3NGE3MjJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0 YVN0b3JlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgKQEAgLTQ4LDYgKzQ4LDcgQEAgdHlwZWRlZiBOU19P UFRJT05TKE5TVUludGVnZXIsIF9XS1dlYnNpdGVEYXRhU3RvcmVGZXRjaE9wdGlvbnMpIHsKIEBw cm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1 Z01vZGU6KSBCT09MIF9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogQHByb3BlcnR5IChu b25hdG9taWMsIHNldHRlcj1fc2V0Q2FjaGVTdG9yYWdlUGVyT3JpZ2luUXVvdGE6KSBOU1VJbnRl Z2VyIF9jYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChX S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0 ZXI9X3NldENhY2hlU3RvcmFnZURpcmVjdG9yeTopIE5TU3RyaW5nKiBfY2FjaGVTdG9yYWdlRGly ZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RC QSkpOworQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0U2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbkRpcmVjdG9yeTopIE5TU3RyaW5nKiBfc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRp cmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19U QkEpKTsKIAogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0Qm91bmRJbnRlcmZhY2VJ ZGVudGlmaWVyOikgTlNTdHJpbmcgKl9ib3VuZEludGVyZmFjZUlkZW50aWZpZXIgV0tfQVBJX0FW QUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYywgc2V0dGVyPV9zZXRBbGxvd3NDZWxsdWxhckFjY2VzczopIEJPT0wgX2FsbG93 c0NlbGx1bGFyQWNjZXNzIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3Mo V0tfSU9TX1RCQSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl YlByb2Nlc3NQb29sQ29jb2EubW0KaW5kZXggNmZmZjMzZWEzMmM2OWJjZDBkYWJmODRiNGIzNDQz ZTI3OWQ1YzNlYy4uMmQxYWRlMzdjZjRhNjVjMDhhZjBkNmY1Y2Q5NDhhMWMzM2VmZmMzNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2Nv YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENv Y29hLm1tCkBAIC00MDMsMTYgKzQwMyw2IEBAIFN0cmluZyBXZWJQcm9jZXNzUG9vbDo6bGVnYWN5 UGxhdGZvcm1EZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKQogICAgIHJldHVybiBG aWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQobGVnYWN5UGxhdGZvcm1EZWZhdWx0 V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKSwgIl9fX0luZGV4ZWREQiIpOwogfQogCi1TdHJpbmcg V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25EaXJlY3RvcnkoKQotewotICAgIHJlZ2lzdGVyVXNlckRlZmF1bHRzSWZOZWVkZWQoKTsK LQotICAgIE5TU3RyaW5nICpkaXJlY3RvcnkgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNl ckRlZmF1bHRzXSBvYmplY3RGb3JLZXk6V2ViU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVj dG9yeURlZmF1bHRzS2V5XTsKLSAgICBpZiAoIWRpcmVjdG9yeSB8fCAhW2RpcmVjdG9yeSBpc0tp bmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKQotICAgICAgICBkaXJlY3RvcnkgPSBAIn4vTGli cmFyeS9XZWJLaXQvU2VydmljZVdvcmtlcnMiOwotICAgIHJldHVybiBzdHJpbmdCeVJlc29sdmlu Z1N5bWxpbmtzSW5QYXRoKFtkaXJlY3Rvcnkgc3RyaW5nQnlTdGFuZGFyZGl6aW5nUGF0aF0pOwot fQotCiBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdExvY2FsU3Rv cmFnZURpcmVjdG9yeSgpCiB7CiAgICAgcmVnaXN0ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDA1ZmU2Zjg3 YzkwZDE4NzY0OGRmNjA0NjZlYzBkODBkNWQxZDdiY2IuLmZlYmRkMDliYzA2MjI3OTU1NjZjM2Rl MjlmMzI2MDhlNjFjZDBiM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHAKQEAgLTU1NSw3ICs1NTUsNyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjplbnN1cmVT dG9yYWdlUHJvY2Vzc0FuZFdlYnNpdGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9yZSogcgogI2Vu ZGlmCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogICAgICAgICBpZiAocGFyYW1ldGVycy5z ZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5LmlzRW1wdHkoKSkgewotICAgICAgICAg ICAgcGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5ID0gbV9jb25m aWd1cmF0aW9uLT5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCk7CisgICAgICAg ICAgICBwYXJhbWV0ZXJzLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkgPSBBUEk6 OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5KCk7CiAgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JSZWFk V3JpdGVEaXJlY3RvcnkocGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5LCBwYXJhbWV0ZXJzLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnlFeHRlbnNp b25IYW5kbGUpOwogICAgICAgICB9CiAKQEAgLTgxNiw3ICs4MTYsMTAgQEAgdm9pZCBXZWJQcm9j ZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz LCBXZWJzaXRlRGEKICNlbmRpZgogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHBh cmFtZXRlcnMuaGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzID0gU2VydmljZVdvcmtlclByb2Nl c3NQcm94eTo6aGFzUmVnaXN0ZXJlZFNlcnZpY2VXb3JrZXJzKG1fY29uZmlndXJhdGlvbi0+c2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpKTsKKyAgICBTdHJpbmcgc2VydmljZVdv cmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSA9IHdlYnNpdGVEYXRhU3RvcmUucmVzb2x2ZWRTZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCk7CisgICAgaWYgKHNlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb25EaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICBzZXJ2aWNlV29ya2VyUmVn aXN0cmF0aW9uRGlyZWN0b3J5ID0gQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0U2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSgpOworICAgIHBhcmFtZXRlcnMuaGFzUmVnaXN0 ZXJlZFNlcnZpY2VXb3JrZXJzID0gU2VydmljZVdvcmtlclByb2Nlc3NQcm94eTo6aGFzUmVnaXN0 ZXJlZFNlcnZpY2VXb3JrZXJzKHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkpOwog I2VuZGlmCiAKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IGJlMGQ4NDhiMGQ3OWI2MmFjM2VmODllMTg4 YmEyYTExZWUxM2E3NjIuLmZjMWQ5NjQwYWI0ODQ3NThjOGYzMGRiOWI3M2M2OTc4YmRlYjk1Y2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAtMzkzLDcgKzM5 Myw2IEBAIHB1YmxpYzoKICAgICAvLyBGSVhNRTogTW92ZSB0aGVzZSB0byBBUEk6OldlYnNpdGVE YXRhU3RvcmUuCiAgICAgc3RhdGljIFN0cmluZyBsZWdhY3lQbGF0Zm9ybURlZmF1bHRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoKTsKICAgICBzdGF0aWMgU3RyaW5nIGxlZ2FjeVBsYXRmb3JtRGVmYXVs dEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCk7Ci0gICAgc3RhdGljIFN0cmluZyBsZWdhY3lQ bGF0Zm9ybURlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KCk7CiAgICAg c3RhdGljIFN0cmluZyBsZWdhY3lQbGF0Zm9ybURlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9y eSgpOwogICAgIHN0YXRpYyBTdHJpbmcgbGVnYWN5UGxhdGZvcm1EZWZhdWx0TWVkaWFLZXlzU3Rv cmFnZURpcmVjdG9yeSgpOwogICAgIHN0YXRpYyBTdHJpbmcgbGVnYWN5UGxhdGZvcm1EZWZhdWx0 TWVkaWFDYWNoZURpcmVjdG9yeSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IGI1NDZjYTFjNjBjZGFjMzg1 M2RiNDFjZmVkZTEzNzFjOTJmYTYxODYuLjMyMjk1ZmNlOTUxNWY0ZmEzNDc0YjQ4OWVlNzYwNTcy YjJjZWZiNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTEwNyw2ICsxMDcsOCBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRDYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YSh1aW50NjRfdCBxdW90YSkgeyBtX3Jl c29sdmVkQ29uZmlndXJhdGlvbi5jYWNoZVN0b3JhZ2VQZXJPcmlnaW5RdW90YSA9IHF1b3RhOyB9 CiAgICAgY29uc3QgU3RyaW5nJiBjYWNoZVN0b3JhZ2VEaXJlY3RvcnkoKSBjb25zdCB7IHJldHVy biBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi5jYWNoZVN0b3JhZ2VEaXJlY3Rvcnk7IH0KICAgICB2 b2lkIHNldENhY2hlU3RvcmFnZURpcmVjdG9yeShTdHJpbmcmJiBkaXJlY3RvcnkpIHsgbV9yZXNv bHZlZENvbmZpZ3VyYXRpb24uY2FjaGVTdG9yYWdlRGlyZWN0b3J5ID0gV1RGTW92ZShkaXJlY3Rv cnkpOyB9CisgICAgY29uc3QgU3RyaW5nJiBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5KCkgY29uc3QgeyByZXR1cm4gbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24uc2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbkRpcmVjdG9yeTsgfQorICAgIHZvaWQgc2V0U2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbkRpcmVjdG9yeShTdHJpbmcmJiBkaXJlY3RvcnkpIHsgbV9yZXNvbHZlZENvbmZpZ3Vy YXRpb24uc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeSA9IFdURk1vdmUoZGlyZWN0 b3J5KTsgfQogCiAgICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKiByZXNvdXJjZUxv YWRTdGF0aXN0aWNzKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmdl dCgpOyB9CiAgICAgdm9pZCBjbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3NJbldlYlByb2Nlc3Nl cyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29sR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAKaW5kZXggMjE2NjlmZjU2YWI2YTRlZWM0 NjhmMTY2MDRiMzQxMDhhOGFlZmIyMS4uYjRhMTcyMzlmNWJjNDQ2ZGJjMGE1YzBlYmVlM2FhNTg3 Y2ZmOGI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYlByb2Nl c3NQb29sR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vz c1Bvb2xHdGsuY3BwCkBAIC0xMDYsMTEgKzEwNiw2IEBAIFN0cmluZyBXZWJQcm9jZXNzUG9vbDo6 bGVnYWN5UGxhdGZvcm1EZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKQogICAgIHJl dHVybiBBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVj dG9yeSgpOwogfQogCi1TdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVs dFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKQotewotICAgIHJldHVybiBBUEk6 OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0 b3J5KCk7Ci19Ci0KIFN0cmluZyBXZWJQcm9jZXNzUG9vbDo6bGVnYWN5UGxhdGZvcm1EZWZhdWx0 TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkKIHsKICAgICByZXR1cm4gQVBJOjpXZWJzaXRlRGF0YVN0 b3JlOjpkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy93cGUvV2ViUHJvY2Vzc1Bvb2xXUEUuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3Mvd3BlL1dlYlByb2Nlc3NQb29sV1BFLmNwcAppbmRleCBiMjlhOTJiODIzZDlm YjFjY2MxZDBhNGJmNmYxMGI1NGE5N2JhZjkyLi43M2Q4MDFiYTk1Y2MwYmQ3ODE2ZjIyNTM4NjU4 NDcxZWQzNmM2ZDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93cGUvV2Vi UHJvY2Vzc1Bvb2xXUEUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dwZS9XZWJQ cm9jZXNzUG9vbFdQRS5jcHAKQEAgLTExMSwxMyArMTExLDYgQEAgU3RyaW5nIFdlYlByb2Nlc3NQ b29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSgpCiAg ICAgcmV0dXJuIFdlYkNvcmU6OkZpbGVTeXN0ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVz ZW50YXRpb24oaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkuZ2V0KCkpOwogfQogCi1TdHJpbmcg V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25EaXJlY3RvcnkoKQotewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgd2hlbiBpbXBsZW1l bnRpbmcgU2VydmljZVdvcmtlcnMKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBT dHJpbmcoKTsKLX0KLQogU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1 bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKQogewogICAgIEdVbmlxdWVQdHI8Z2NoYXI+IHN0b3Jh Z2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dldF91c2VyX2RhdGFfZGlyKCksICJ3cGUi LCAibG9jYWxzdG9yYWdlIiwgbnVsbHB0cikpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGJkZWJmYzM1ZDYxYWQ3OTVhNTA1NmI2N2E1ODFiZGY4 ODNiZDI1OWUuLjRkNTA5YjUzOWUxODcxYTJkZTQwNGI4ODJkYTY4N2MxMDk4MjgzOTEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxOC0wMi0wMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAg ICAgICAgQ29uZmlndXJlIHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3Rvcnkgb24gdGhl IHdlYiBzaXRlIGRhdGEgc3RvcmUgYW5kIG1vdmUgaXQgdG8gYSBDYWNoZXMgc3ViZm9sZGVyIGFz IGEgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTgyNDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6 VGVzdENvbnRyb2xsZXI6OmdlbmVyYXRlQ29udGV4dENvbmZpZ3VyYXRpb24gY29uc3QpOgorICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbToKKyAg ICAgICAgKFdUUjo6aW5pdGlhbGl6ZVdlYlZpZXdDb25maWd1cmF0aW9uKToKKwogMjAxOC0wMi0w MSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYXJpbmcg YWxsIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbnMgc2hvdWxkIHdhaXQgZm9yIGltcG9ydGlu ZyBzZXJ2aWNlIHdvcmtlciByZWdpc3RyYXRpb24gdG8gZmluaXNoCmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDJjMDkyODg2OTc5Yzk5MTI5MDc3M2M3ZDQ2 ZDNiYzBkMmQxMWM3MTYuLmZkNTQ4ZWE3MDhhMmM0ODcxMWFjNzI2NTQzNzczYTM4YWRmNWVhYWYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisr KyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC00MTEsNyAr NDExLDYgQEAgV0tSZXRhaW5QdHI8V0tDb250ZXh0Q29uZmlndXJhdGlvblJlZj4gVGVzdENvbnRy b2xsZXI6OmdlbmVyYXRlQ29udGV4dENvbmZpZ3VyYXQKICAgICAgICAgV0tDb250ZXh0Q29uZmln dXJhdGlvblNldEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwg dG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBzZXBhcmF0b3IgKyAiQXBwbGljYXRpb25DYWNoZSIpLmdl dCgpKTsKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldERpc2tDYWNoZURpcmVjdG9y eShjb25maWd1cmF0aW9uLmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciAr ICJDYWNoZSIpLmdldCgpKTsKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldEluZGV4 ZWREQkRhdGFiYXNlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5 Rm9sZGVyICsgc2VwYXJhdG9yICsgIkRhdGFiYXNlcyIgKyBzZXBhcmF0b3IgKyAiSW5kZXhlZERC IikuZ2V0KCkpOwotICAgICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0U2VydmljZVdvcmtl ckRhdGFiYXNlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9s ZGVyICsgc2VwYXJhdG9yICsgIlNlcnZpY2VXb3JrZXJzIikuZ2V0KCkpOwogICAgICAgICBXS0Nv bnRleHRDb25maWd1cmF0aW9uU2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24u Z2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgc2VwYXJhdG9yICsgIkxvY2FsU3RvcmFnZSIp LmdldCgpKTsKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFdlYlNRTERhdGFiYXNl RGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5Rm9sZGVyICsgc2Vw YXJhdG9yICsgIkRhdGFiYXNlcyIgKyBzZXBhcmF0b3IgKyAiV2ViU1FMIikuZ2V0KCkpOwogICAg ICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShj b25maWd1cmF0aW9uLmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJN ZWRpYUtleXMiKS5nZXQoKSk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2Nv Y29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29h L1Rlc3RDb250cm9sbGVyQ29jb2EubW0KaW5kZXggOWMxOTc2M2UxYTgzODA5NDMwNzI0MzNiZDk2 YWQxZjA4N2Q2MzFmYi4uNmZjMjUwOTM5YWM2YzgyNWVhYWE4NTBlNTg1ZmZmYjc0NmY4YzczYSAx MDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNv Y29hLm1tCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJD b2NvYS5tbQpAQCAtODMsNiArODMsOSBAQCB2b2lkIGluaXRpYWxpemVXZWJWaWV3Q29uZmlndXJh dGlvbihjb25zdCBjaGFyKiBsaWJyYXJ5UGF0aCwgV0tTdHJpbmdSZWYgaW5qZWN0ZQogICAgIGlm IChsaWJyYXJ5UGF0aCkgewogICAgICAgICBTdHJpbmcgY2FjaGVTdG9yYWdlRGlyZWN0b3J5ID0g U3RyaW5nKGxpYnJhcnlQYXRoKSArICcvJyArICJDYWNoZVN0b3JhZ2UiOwogICAgICAgICBbcG9v bFdlYnNpdGVEYXRhU3RvcmUgX3NldENhY2hlU3RvcmFnZURpcmVjdG9yeTogY2FjaGVTdG9yYWdl RGlyZWN0b3J5XTsKKworICAgICAgICBTdHJpbmcgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRp cmVjdG9yeSA9IFN0cmluZyhsaWJyYXJ5UGF0aCkgKyAnLycgKyAiU2VydmljZVdvcmtlcnMiOwor ICAgICAgICBbcG9vbFdlYnNpdGVEYXRhU3RvcmUgX3NldFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25EaXJlY3Rvcnk6IHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnldOwogICAgIH0K IAogICAgIFtnbG9iYWxXZWJWaWV3Q29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3JlIF9zZXRS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZRVNdOwo= 333014 2018-02-02 15:57:38 -0800 2018-02-02 16:36:26 -0800 Follow-up fix bug-182403-20180202155738.patch text/plain 1863 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MDI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFlMGYxOTA5NjkyZTMyOWJj YzI2MzVjYzIyMjljZTZkM2NjN2FhM2YuLjEyNWJiN2M3N2Y1ZTJiZGJjMGYzYjllM2I1ODgwMTU3 MzY3YWU2YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMDItMDIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENvbmZpZ3VyZSBzZXJ2aWNlV29y a2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5IG9uIHRoZSB3ZWIgc2l0ZSBkYXRhIHN0b3JlIGFuZCBt b3ZlIGl0IHRvIGEgQ2FjaGVzIHN1YmZvbGRlciBhcyBhIGRlZmF1bHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQwMworICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzY2NzMzNTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNl bi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OmxlZ2FjeVdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uKTogU2V0dGluZyBzZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5IGZvciBsZWdhY3kgc3RvcmVzLgorCiAyMDE4 LTAyLTAyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVh cmluZyBhbGwgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9ucyBzaG91bGQgd2FpdCBmb3IgaW1w b3J0aW5nIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiB0byBmaW5pc2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBmZWJkZDA5YmMwNjIyNzk1NTY2 YzNkZTI5ZjMyNjA4ZTYxY2QwYjNlLi40ZTc5Zjg1NzczMWIyOGZlMzJkMWFiYTg0YTk2Zjg4NjE2 MzRjZGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBA IC0xOTYsNiArMTk2LDcgQEAgc3RhdGljIFdlYnNpdGVEYXRhU3RvcmU6OkNvbmZpZ3VyYXRpb24g bGVnYWN5V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24oQVBJOjoKICAgICBXZWJzaXRlRGF0 YVN0b3JlOjpDb25maWd1cmF0aW9uIGNvbmZpZ3VyYXRpb247CiAKICAgICBjb25maWd1cmF0aW9u LmNhY2hlU3RvcmFnZURpcmVjdG9yeSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdENh Y2hlU3RvcmFnZURpcmVjdG9yeSgpOworICAgIGNvbmZpZ3VyYXRpb24uc2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbkRpcmVjdG9yeSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkoKTsKICAgICBjb25maWd1cmF0aW9uLmxvY2Fs U3RvcmFnZURpcmVjdG9yeSA9IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VE aXJlY3RvcnkoKTsKICAgICBjb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0g cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCk7CiAgICAg Y29uZmlndXJhdGlvbi5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsK