174666 2017-07-19 21:11:39 -0700 WKHTTPCookieStore API tests fail on High Sierra 2019-12-12 09:47:10 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson achristensen aestes alex ap berlomar buildbot commit-queue darkson elvasoper kerferd morrision thorton tuwu zaxagu oldest_to_newest 1330544 0 beidson 2017-07-19 21:11:39 -0700 WKHTTPCookieStore API tests fail on High Sierra Some of the CFNetwork SPI we were using stopped working on High Sierra. I have a workaround. rdar://problem/33410271 1330545 1 315968 beidson 2017-07-19 21:21:15 -0700 Created attachment 315968 Patch 1330546 2 buildbot 2017-07-19 21:23:55 -0700 Attachment 315968 did not pass style-queue: ERROR: Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm:63: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1330547 3 315968 aestes 2017-07-19 21:32:15 -0700 Comment on attachment 315968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315968&action=review > Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm:44 > +-(instancetype)initWithObserver:(WebCore::CookieStorageObserver&)theObserver; Space after the - (and ditto everywhere else) 1330548 4 315969 beidson 2017-07-19 21:37:31 -0700 Created attachment 315969 Patch 1330616 5 315969 commit-queue 2017-07-20 07:28:22 -0700 Comment on attachment 315969 Patch Clearing flags on attachment: 315969 Committed r219683: <http://trac.webkit.org/changeset/219683> 1330617 6 commit-queue 2017-07-20 07:28:23 -0700 All reviewed patches have been landed. Closing bug. 315968 2017-07-19 21:21:15 -0700 2017-07-19 21:37:29 -0700 Patch bug-174666-20170719212120.patch text/plain 8609 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzEwYWIyMjgyZjE2YzY4 NTNkOTQzZGEzOTZlMGM3MjA5Yjc2MmE2Mi4uMGEyNzI4NTRkNGQ3NTcwMjA0ZGIyMzAwNzI1NzUx OWJkNmMxZTE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE3LTA3LTE5ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBXS0hUVFBDb29raWVTdG9y ZSBBUEkgdGVzdHMgZmFpbCBvbiBIaWdoIFNpZXJyYS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzMzNDEwMjcxPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NDY2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENv dmVyZWQgYnkgZXhpc3RpbmcgQVBJIHRlc3RzLgorCisgICAgICAgIEluIHIyMTk1NjcgSSdkIG1v dmVkIGNvb2tpZSBzdG9yYWdlIG9ic2VydmF0aW9uIG9mZiBvZiBOU0hUVFBDb29raWVTdG9yYWdl IGFuZCBOU05vdGlmaWNhdGlvbkNlbnRlcgorICAgICAgICB0byBDRkhUVFBDb29raWVTdG9yYWdl IG9ic2VydmF0aW9uIGNhbGxiYWNrcy4KKyAgICAgICAgCisgICAgICAgIFRoaXMgaXMgYmVjYXVz ZSBub3RpZmljYXRpb25zIHdlcmUgb25seSBzZW50IGZvciB0aGUgZGVmYXVsdCBbTlNIVFRQQ29v a2llU3RvcmFnZSBzaGFyZWRIVFRQQ29va2llU3RvcmFnZV0KKyAgICAgICAgYW5kIG5vdCBhbnkg b2YgdGhlIG90aGVyIG9uZXMgd2Uga2VlcCBpbiBmbGlnaHQuCisgICAgICAgIAorICAgICAgICBV bmZvcnR1bmF0ZWx5IHRoYXQgU1BJIGhhcyBiZWVuIGRpc2FibGVkIGluIEhpZ2ggU2llcnJhLgor ICAgICAgICBGb3J0dW5hdGVseSB3ZSBmb3VuZCBhIHdheSB3ZSBjYW4gZ2V0IG5vbi1zaGFyZWQg TlNIVFRQQ29va2llU3RvcmFnZXMgdG8gc2VuZCBub3RpZmljYXRpb25zIHRoYXQgd29ya3MgZXZl cnl3aGVyZS4KKyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29r aWVTdG9yYWdlT2JzZXJ2ZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL0Nv b2tpZVN0b3JhZ2VPYnNlcnZlci5tbToKKyAgICAgICAgKC1bV2ViQ29va2llT2JzZXJ2ZXJBZGFw dGVyIGluaXRXaXRoT2JzZXJ2ZXI6XSk6CisgICAgICAgICgtW1dlYkNvb2tpZU9ic2VydmVyQWRh cHRlciBjb29raWVzQ2hhbmdlZE5vdGlmaWNhdGlvbkhhbmRsZXI6XSk6CisgICAgICAgIChXZWJD b3JlOjpDb29raWVTdG9yYWdlT2JzZXJ2ZXI6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpD b29raWVTdG9yYWdlT2JzZXJ2ZXI6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlcik6CisgICAgICAgIChX ZWJDb3JlOjpDb29raWVTdG9yYWdlT2JzZXJ2ZXI6On5Db29raWVTdG9yYWdlT2JzZXJ2ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Q29va2llU3RvcmFnZU9ic2VydmVyOjpzdGFydE9ic2VydmluZyk6 IFVzZSBhIHRyaWNrIHRvIGNhbGwgc29tZSBTUEkgb24gbm9uLXNoYXJlZCBOU0hUVFBDb29raWVT dG9yYWdlcworICAgICAgICAgIHRvIGdldCB0aGVtIHRvIHNlbmQgbm90aWZpY2F0aW9ucy4KKyAg ICAgICAgKFdlYkNvcmU6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZyk6Cisg ICAgICAgIChXZWJDb3JlOjpjb29raWVzQ2hhbmdlZCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tOgorICAg ICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjb29raWVTdG9yYWdlT2JzZXJ2 ZXIpOgorCiAyMDE3LTA3LTE3ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OKHIyMTkyOTgpOiBpbXBvcnRlZC93M2MvSW5kZXhlZERCLXByaXZh dGUtYnJvd3NpbmcvaWRiZmFjdG9yeV9vcGVuLmh0bWwgaXMgY3Jhc2hpbmcgb2NjYXNzaW9uYWx5 IChVbmlxdWVJREJEYXRhYmFzZSBiZWluZyB0YWtlbiBmcm9tIHRoZSBJREJTZXJ2ZXIgc2V0IHR3 aWNlKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2Ev Q29va2llU3RvcmFnZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NvY29hL0Nvb2tpZVN0b3JhZ2VPYnNlcnZlci5oCmluZGV4IGEzMzJkMjI1YTllZTc5NjcwZjg5 NWVhMDk3Y2UwY2RiNTMzYWIwZmIuLjg2MDM0Nzc3MDhmMjNhNzc5MjE1YTQ4ODE5MjA2MjU2MzNi MDcxYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2Ev Q29va2llU3RvcmFnZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jb2NvYS9Db29raWVTdG9yYWdlT2JzZXJ2ZXIuaApAQCAtMzAsMTIgKzMwLDE1IEBACiAj aW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRTYWZlUmVmQ291 bnRlZC5oPgogCitPQkpDX0NMQVNTIE5TSFRUUENvb2tpZVN0b3JhZ2U7CitPQkpDX0NMQVNTIFdl YkNvb2tpZU9ic2VydmVyQWRhcHRlcjsKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBD b29raWVTdG9yYWdlT2JzZXJ2ZXIgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Q29va2ll U3RvcmFnZU9ic2VydmVyPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZlB0cjxDb29raWVTdG9y YWdlT2JzZXJ2ZXI+IGNyZWF0ZShDRkhUVFBDb29raWVTdG9yYWdlUmVmKTsKLSAgICBDb29raWVT dG9yYWdlT2JzZXJ2ZXIoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7CisgICAgc3RhdGljIFJlZlB0 cjxDb29raWVTdG9yYWdlT2JzZXJ2ZXI+IGNyZWF0ZShOU0hUVFBDb29raWVTdG9yYWdlICopOwor ICAgIENvb2tpZVN0b3JhZ2VPYnNlcnZlcihOU0hUVFBDb29raWVTdG9yYWdlICopOwogICAgIH5D b29raWVTdG9yYWdlT2JzZXJ2ZXIoKTsKIAogICAgIHZvaWQgc3RhcnRPYnNlcnZpbmcoV1RGOjpG dW5jdGlvbjx2b2lkKCk+JiYgY2FsbGJhY2spOwpAQCAtNDQsNyArNDcsOSBAQCBwdWJsaWM6CiAg ICAgdm9pZCBjb29raWVzRGlkQ2hhbmdlKCk7CiAKIHByaXZhdGU6Ci0gICAgUmV0YWluUHRyPENG SFRUUENvb2tpZVN0b3JhZ2VSZWY+IG1fY29va2llU3RvcmFnZTsKKyAgICBSZXRhaW5QdHI8TlNI VFRQQ29va2llU3RvcmFnZT4gbV9jb29raWVTdG9yYWdlOworICAgIGJvb2wgbV9oYXNSZWdpc3Rl cmVkSW50ZXJuYWxzRm9yTm90aWZpY2F0aW9ucyB7IGZhbHNlIH07CisgICAgUmV0YWluUHRyPFdl YkNvb2tpZU9ic2VydmVyQWRhcHRlcj4gbV9vYnNlcnZlckFkYXB0ZXI7CiAgICAgV1RGOjpGdW5j dGlvbjx2b2lkKCk+IG1fY29va2llQ2hhbmdlQ2FsbGJhY2s7CiB9OwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL0Nvb2tpZVN0b3JhZ2VPYnNlcnZl ci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvQ29va2llU3RvcmFn ZU9ic2VydmVyLm1tCmluZGV4IDU0NWE1NjZhNzNjMzMwOWJlZDM1NjhkNDI3NjY4YTY1NTUzNmI4 YTIuLjNkOGM4MDk2ZGU0NjQ0NWRiNGFlOTVjNDQ5MWExNDUxZDNkYTg3OTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvQ29va2llU3RvcmFnZU9ic2Vy dmVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvQ29va2ll U3RvcmFnZU9ic2VydmVyLm1tCkBAIC0yOSwyMCArMjksNTIgQEAKICNpbXBvcnQgIk5TVVJMQ29u bmVjdGlvblNQSS5oIgogI2ltcG9ydCA8d3RmL01haW5UaHJlYWQuaD4KIAotbmFtZXNwYWNlIFdl YkNvcmUgeworQGludGVyZmFjZSBXZWJOU0hUVFBDb29raWVTdG9yYWdlSW50ZXJuYWwgOiBOU09i amVjdCB7CitAcHVibGljCisgICAgaWQgaW50ZXJuYWw7Cit9CitAZW5kCisKK0BpbXBsZW1lbnRh dGlvbiBXZWJOU0hUVFBDb29raWVTdG9yYWdlSW50ZXJuYWwKK0BlbmQKKworQGludGVyZmFjZSBX ZWJDb29raWVPYnNlcnZlckFkYXB0ZXIgOiBOU09iamVjdCB7CisgICAgV2ViQ29yZTo6Q29va2ll U3RvcmFnZU9ic2VydmVyKiBvYnNlcnZlcjsKK30KKy0oaW5zdGFuY2V0eXBlKWluaXRXaXRoT2Jz ZXJ2ZXI6KFdlYkNvcmU6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlciYpdGhlT2JzZXJ2ZXI7CistKHZv aWQpY29va2llc0NoYW5nZWROb3RpZmljYXRpb25IYW5kbGVyOihOU05vdGlmaWNhdGlvbiAqKW5v dGlmaWNhdGlvbjsKKworQGVuZAogCi1zdGF0aWMgdm9pZCBjb29raWVzQ2hhbmdlZChDRkhUVFBD b29raWVTdG9yYWdlUmVmLCB2b2lkKiBjb250ZXh0KQorQGltcGxlbWVudGF0aW9uIFdlYkNvb2tp ZU9ic2VydmVyQWRhcHRlcgorCistKGluc3RhbmNldHlwZSlpbml0V2l0aE9ic2VydmVyOihXZWJD b3JlOjpDb29raWVTdG9yYWdlT2JzZXJ2ZXImKXRoZU9ic2VydmVyCiB7Ci0gICAgQVNTRVJUKCFp c01haW5UaHJlYWQoKSk7Ci0gICAgc3RhdGljX2Nhc3Q8Q29va2llU3RvcmFnZU9ic2VydmVyKj4o Y29udGV4dCktPmNvb2tpZXNEaWRDaGFuZ2UoKTsKKyAgICBzZWxmID0gW3N1cGVyIGluaXRdOwor ICAgIGlmICghc2VsZikKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIG9ic2VydmVyID0gJnRo ZU9ic2VydmVyOworCisgICAgcmV0dXJuIHNlbGY7CiB9CiAKLVJlZlB0cjxDb29raWVTdG9yYWdl T2JzZXJ2ZXI+IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6Y3JlYXRlKENGSFRUUENvb2tpZVN0b3Jh Z2VSZWYgY29va2llU3RvcmFnZSkKKy0odm9pZCljb29raWVzQ2hhbmdlZE5vdGlmaWNhdGlvbkhh bmRsZXI6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgVU5VU0VEX1BBUkFN KG5vdGlmaWNhdGlvbik7CisgICAgb2JzZXJ2ZXItPmNvb2tpZXNEaWRDaGFuZ2UoKTsKK30KKwor QGVuZAorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK1JlZlB0cjxDb29raWVTdG9yYWdlT2JzZXJ2 ZXI+IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6Y3JlYXRlKE5TSFRUUENvb2tpZVN0b3JhZ2UgKmNv b2tpZVN0b3JhZ2UpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDb29raWVTdG9yYWdlT2Jz ZXJ2ZXIoY29va2llU3RvcmFnZSkpOwogfQogCi1Db29raWVTdG9yYWdlT2JzZXJ2ZXI6OkNvb2tp ZVN0b3JhZ2VPYnNlcnZlcihDRkhUVFBDb29raWVTdG9yYWdlUmVmIGNvb2tpZVN0b3JhZ2UpCitD b29raWVTdG9yYWdlT2JzZXJ2ZXI6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlcihOU0hUVFBDb29raWVT dG9yYWdlICpjb29raWVTdG9yYWdlKQogICAgIDogbV9jb29raWVTdG9yYWdlKGNvb2tpZVN0b3Jh Z2UpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKQEAgLTUzLDI3ICs4NSw0NSBAQCBD b29raWVTdG9yYWdlT2JzZXJ2ZXI6On5Db29raWVTdG9yYWdlT2JzZXJ2ZXIoKQogewogICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CiAKLSAgICBpZiAobV9jb29raWVDaGFuZ2VDYWxsYmFjaykK KyAgICBpZiAobV9jb29raWVDaGFuZ2VDYWxsYmFjaykgeworICAgICAgICBBU1NFUlQobV9vYnNl cnZlckFkYXB0ZXIpOwogICAgICAgICBzdG9wT2JzZXJ2aW5nKCk7CisgICAgfQogfQogCiB2b2lk IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmcoV1RGOjpGdW5jdGlvbjx2b2lk KCk+JiYgY2FsbGJhY2spCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NF UlQoIW1fY29va2llQ2hhbmdlQ2FsbGJhY2spOworICAgIEFTU0VSVCghbV9vYnNlcnZlckFkYXB0 ZXIpOworCiAgICAgbV9jb29raWVDaGFuZ2VDYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spOwor ICAgIG1fb2JzZXJ2ZXJBZGFwdGVyID0gYWRvcHROUyhbW1dlYkNvb2tpZU9ic2VydmVyQWRhcHRl ciBhbGxvY10gaW5pdFdpdGhPYnNlcnZlcjoqdGhpc10pOwogCi0gICAgQ0ZIVFRQQ29va2llU3Rv cmFnZUFkZE9ic2VydmVyKG1fY29va2llU3RvcmFnZS5nZXQoKSwgW05TVVJMQ29ubmVjdGlvbiBy ZXNvdXJjZUxvYWRlclJ1bkxvb3BdLCBrQ0ZSdW5Mb29wQ29tbW9uTW9kZXMsIGNvb2tpZXNDaGFu Z2VkLCB0aGlzKTsKLSAgICBDRkhUVFBDb29raWVTdG9yYWdlU2NoZWR1bGVXaXRoUnVuTG9vcCht X2Nvb2tpZVN0b3JhZ2UuZ2V0KCksIFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5M b29wXSwga0NGUnVuTG9vcENvbW1vbk1vZGVzKTsKKyAgICBpZiAoIW1faGFzUmVnaXN0ZXJlZElu dGVybmFsc0Zvck5vdGlmaWNhdGlvbnMpIHsKKyAgICAgICAgaWYgKG1fY29va2llU3RvcmFnZS5n ZXQoKSAhPSBbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQQ29va2llU3RvcmFnZV0pIHsK KyAgICAgICAgICAgIGF1dG8gc2VsZWN0b3IgPSBOU1NlbGVjdG9yRnJvbVN0cmluZyhAInJlZ2lz dGVyRm9yUG9zdGluZ05vdGlmaWNhdGlvbnNXaXRoQ29udGV4dDoiKTsKKyAgICAgICAgICAgIGlk IGludGVybmFsT2JqZWN0ID0gKHN0YXRpY19jYXN0PFdlYk5TSFRUUENvb2tpZVN0b3JhZ2VJbnRl cm5hbCAqPihtX2Nvb2tpZVN0b3JhZ2UuZ2V0KCkpKS0+aW50ZXJuYWw7CisgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVChbaW50ZXJuYWxPYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9yOnNlbGVjdG9y XSk7CisgICAgICAgICAgICBbaW50ZXJuYWxPYmplY3QgcGVyZm9ybVNlbGVjdG9yOnNlbGVjdG9y IHdpdGhPYmplY3Q6bV9jb29raWVTdG9yYWdlLmdldCgpXTsKKyAgICAgICAgfQorCisgICAgICAg IG1faGFzUmVnaXN0ZXJlZEludGVybmFsc0Zvck5vdGlmaWNhdGlvbnMgPSB0cnVlOworICAgIH0K KworICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6 bV9vYnNlcnZlckFkYXB0ZXIuZ2V0KCkgc2VsZWN0b3I6QHNlbGVjdG9yKGNvb2tpZXNDaGFuZ2Vk Tm90aWZpY2F0aW9uSGFuZGxlcjopIG5hbWU6TlNIVFRQQ29va2llTWFuYWdlckNvb2tpZXNDaGFu Z2VkTm90aWZpY2F0aW9uIG9iamVjdDptX2Nvb2tpZVN0b3JhZ2UuZ2V0KCldOwogfQogCiB2b2lk IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZygpCiB7CiAgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9jb29raWVDaGFuZ2VDYWxsYmFjayk7Ci0gICAg bV9jb29raWVDaGFuZ2VDYWxsYmFjayA9IG51bGxwdHI7CisgICAgQVNTRVJUKG1fb2JzZXJ2ZXJB ZGFwdGVyKTsKIAotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VSZW1vdmVPYnNlcnZlcihtX2Nvb2tp ZVN0b3JhZ2UuZ2V0KCksIFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSwg a0NGUnVuTG9vcENvbW1vbk1vZGVzLCBjb29raWVzQ2hhbmdlZCwgdGhpcyk7CisgICAgW1tOU05v dGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjptX29ic2VydmVy QWRhcHRlci5nZXQoKSBuYW1lOk5TSFRUUENvb2tpZU1hbmFnZXJDb29raWVzQ2hhbmdlZE5vdGlm aWNhdGlvbiBvYmplY3Q6bmlsXTsKKworICAgIG1fY29va2llQ2hhbmdlQ2FsbGJhY2sgPSBudWxs cHRyOworICAgIG1fb2JzZXJ2ZXJBZGFwdGVyID0gbmlsOwogfQogCiB2b2lkIENvb2tpZVN0b3Jh Z2VPYnNlcnZlcjo6Y29va2llc0RpZENoYW5nZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Np b25Db2NvYS5tbQppbmRleCBmMTkzMWIxNDk2NmY5MTc2YTQ0ZjAyZGU2MTYwNjU2Nzg4ZDk3ODdl Li5mMTY5NjYzNjg3YzFjODI5NDEyYWQzMjQ4ZWE0OGRiNTVkODNjNzI3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lv bkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0 d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW0KQEAgLTk0LDcgKzk0LDcgQEAgTlNIVFRQQ29va2ll U3RvcmFnZSAqTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpuc0Nvb2tpZVN0b3JhZ2UoKSBjb25zdAog Q29va2llU3RvcmFnZU9ic2VydmVyJiBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZVN0b3Jh Z2VPYnNlcnZlcigpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Nvb2tpZVN0b3JhZ2VPYnNlcnZlcikK LSAgICAgICAgbV9jb29raWVTdG9yYWdlT2JzZXJ2ZXIgPSBDb29raWVTdG9yYWdlT2JzZXJ2ZXI6 OmNyZWF0ZShbbnNDb29raWVTdG9yYWdlKCkgX2Nvb2tpZVN0b3JhZ2VdKTsKKyAgICAgICAgbV9j b29raWVTdG9yYWdlT2JzZXJ2ZXIgPSBDb29raWVTdG9yYWdlT2JzZXJ2ZXI6OmNyZWF0ZShuc0Nv b2tpZVN0b3JhZ2UoKSk7CiAKICAgICByZXR1cm4gKm1fY29va2llU3RvcmFnZU9ic2VydmVyOwog fQo= 315969 2017-07-19 21:37:31 -0700 2017-07-20 07:28:22 -0700 Patch bug-174666-20170719213736.patch text/plain 8609 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzEwYWIyMjgyZjE2YzY4 NTNkOTQzZGEzOTZlMGM3MjA5Yjc2MmE2Mi4uNzgxMTlkMjExMmU0M2Q5YjBjOTgyNWMzNWJiYjU2 OWE2Njk2NDEzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE3LTA3LTE5ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBXS0hUVFBDb29raWVTdG9y ZSBBUEkgdGVzdHMgZmFpbCBvbiBIaWdoIFNpZXJyYS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzMzNDEwMjcxPiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NDY2NgorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHkgRXN0ZXMuCisKKyAgICAgICAgQ292ZXJl ZCBieSBleGlzdGluZyBBUEkgdGVzdHMuCisKKyAgICAgICAgSW4gcjIxOTU2NyBJJ2QgbW92ZWQg Y29va2llIHN0b3JhZ2Ugb2JzZXJ2YXRpb24gb2ZmIG9mIE5TSFRUUENvb2tpZVN0b3JhZ2UgYW5k IE5TTm90aWZpY2F0aW9uQ2VudGVyCisgICAgICAgIHRvIENGSFRUUENvb2tpZVN0b3JhZ2Ugb2Jz ZXJ2YXRpb24gY2FsbGJhY2tzLgorICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBiZWNhdXNlIG5v dGlmaWNhdGlvbnMgd2VyZSBvbmx5IHNlbnQgZm9yIHRoZSBkZWZhdWx0IFtOU0hUVFBDb29raWVT dG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXQorICAgICAgICBhbmQgbm90IGFueSBvZiB0 aGUgb3RoZXIgb25lcyB3ZSBrZWVwIGluIGZsaWdodC4KKyAgICAgICAgCisgICAgICAgIFVuZm9y dHVuYXRlbHkgdGhhdCBTUEkgaGFzIGJlZW4gZGlzYWJsZWQgaW4gSGlnaCBTaWVycmEuCisgICAg ICAgIEZvcnR1bmF0ZWx5IHdlIGZvdW5kIGEgd2F5IHdlIGNhbiBnZXQgbm9uLXNoYXJlZCBOU0hU VFBDb29raWVTdG9yYWdlcyB0byBzZW5kIG5vdGlmaWNhdGlvbnMgdGhhdCB3b3JrcyBldmVyeXdo ZXJlLgorICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL0Nvb2tpZVN0 b3JhZ2VPYnNlcnZlci5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvQ29va2ll U3RvcmFnZU9ic2VydmVyLm1tOgorICAgICAgICAoLVtXZWJDb29raWVPYnNlcnZlckFkYXB0ZXIg aW5pdFdpdGhPYnNlcnZlcjpdKToKKyAgICAgICAgKC1bV2ViQ29va2llT2JzZXJ2ZXJBZGFwdGVy IGNvb2tpZXNDaGFuZ2VkTm90aWZpY2F0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tp ZVN0b3JhZ2VPYnNlcnZlcjo6Q29va2llU3RvcmFnZU9ic2VydmVyKToKKyAgICAgICAgKFdlYkNv cmU6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6fkNvb2tpZVN0b3JhZ2VPYnNlcnZlcik6CisgICAg ICAgIChXZWJDb3JlOjpDb29raWVTdG9yYWdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nKTogVXNl IGEgdHJpY2sgdG8gY2FsbCBzb21lIFNQSSBvbiBub24tc2hhcmVkIE5TSFRUUENvb2tpZVN0b3Jh Z2VzCisgICAgICAgICAgdG8gZ2V0IHRoZW0gdG8gc2VuZCBub3RpZmljYXRpb25zLgorICAgICAg ICAoV2ViQ29yZTo6Q29va2llU3RvcmFnZU9ic2VydmVyOjpzdG9wT2JzZXJ2aW5nKToKKyAgICAg ICAgKFdlYkNvcmU6OmNvb2tpZXNDaGFuZ2VkKTogRGVsZXRlZC4KKworICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvY29jb2EvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW06CisgICAgICAg IChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZVN0b3JhZ2VPYnNlcnZlcik6 CisKIDIwMTctMDctMTcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAg ICAgIFJFR1JFU1NJT04ocjIxOTI5OCk6IGltcG9ydGVkL3czYy9JbmRleGVkREItcHJpdmF0ZS1i cm93c2luZy9pZGJmYWN0b3J5X29wZW4uaHRtbCBpcyBjcmFzaGluZyBvY2Nhc3Npb25hbHkgKFVu aXF1ZUlEQkRhdGFiYXNlIGJlaW5nIHRha2VuIGZyb20gdGhlIElEQlNlcnZlciBzZXQgdHdpY2Up LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29r aWVTdG9yYWdlT2JzZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29j b2EvQ29va2llU3RvcmFnZU9ic2VydmVyLmgKaW5kZXggYTMzMmQyMjVhOWVlNzk2NzBmODk1ZWEw OTdjZTBjZGI1MzNhYjBmYi4uODYwMzQ3NzcwOGYyM2E3NzkyMTVhNDg4MTkyMDYyNTYzM2IwNzFh MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29r aWVTdG9yYWdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NvY29hL0Nvb2tpZVN0b3JhZ2VPYnNlcnZlci5oCkBAIC0zMCwxMiArMzAsMTUgQEAKICNpbmNs dWRlIDx3dGYvUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1RocmVhZFNhZmVSZWZDb3VudGVk Lmg+CiAKK09CSkNfQ0xBU1MgTlNIVFRQQ29va2llU3RvcmFnZTsKK09CSkNfQ0xBU1MgV2ViQ29v a2llT2JzZXJ2ZXJBZGFwdGVyOworCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIENvb2tp ZVN0b3JhZ2VPYnNlcnZlciA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxDb29raWVTdG9y YWdlT2JzZXJ2ZXI+IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmUHRyPENvb2tpZVN0b3JhZ2VP YnNlcnZlcj4gY3JlYXRlKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwotICAgIENvb2tpZVN0b3Jh Z2VPYnNlcnZlcihDRkhUVFBDb29raWVTdG9yYWdlUmVmKTsKKyAgICBzdGF0aWMgUmVmUHRyPENv b2tpZVN0b3JhZ2VPYnNlcnZlcj4gY3JlYXRlKE5TSFRUUENvb2tpZVN0b3JhZ2UgKik7CisgICAg Q29va2llU3RvcmFnZU9ic2VydmVyKE5TSFRUUENvb2tpZVN0b3JhZ2UgKik7CiAgICAgfkNvb2tp ZVN0b3JhZ2VPYnNlcnZlcigpOwogCiAgICAgdm9pZCBzdGFydE9ic2VydmluZyhXVEY6OkZ1bmN0 aW9uPHZvaWQoKT4mJiBjYWxsYmFjayk7CkBAIC00NCw3ICs0Nyw5IEBAIHB1YmxpYzoKICAgICB2 b2lkIGNvb2tpZXNEaWRDaGFuZ2UoKTsKIAogcHJpdmF0ZToKLSAgICBSZXRhaW5QdHI8Q0ZIVFRQ Q29va2llU3RvcmFnZVJlZj4gbV9jb29raWVTdG9yYWdlOworICAgIFJldGFpblB0cjxOU0hUVFBD b29raWVTdG9yYWdlPiBtX2Nvb2tpZVN0b3JhZ2U7CisgICAgYm9vbCBtX2hhc1JlZ2lzdGVyZWRJ bnRlcm5hbHNGb3JOb3RpZmljYXRpb25zIHsgZmFsc2UgfTsKKyAgICBSZXRhaW5QdHI8V2ViQ29v a2llT2JzZXJ2ZXJBZGFwdGVyPiBtX29ic2VydmVyQWRhcHRlcjsKICAgICBXVEY6OkZ1bmN0aW9u PHZvaWQoKT4gbV9jb29raWVDaGFuZ2VDYWxsYmFjazsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvQ29va2llU3RvcmFnZU9ic2VydmVyLm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29raWVTdG9yYWdlT2Jz ZXJ2ZXIubW0KaW5kZXggNTQ1YTU2NmE3M2MzMzA5YmVkMzU2OGQ0Mjc2NjhhNjU1NTM2YjhhMi4u MWY3OTQwOThjM2MzODZlYmQxOTQ1ZDgwZmQ4MzVhMzc1ZGUyOGM3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29raWVTdG9yYWdlT2JzZXJ2ZXIu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9Db29raWVTdG9y YWdlT2JzZXJ2ZXIubW0KQEAgLTI5LDIwICsyOSw1MiBAQAogI2ltcG9ydCAiTlNVUkxDb25uZWN0 aW9uU1BJLmgiCiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogCi1uYW1lc3BhY2UgV2ViQ29y ZSB7CitAaW50ZXJmYWNlIFdlYk5TSFRUUENvb2tpZVN0b3JhZ2VJbnRlcm5hbCA6IE5TT2JqZWN0 IHsKK0BwdWJsaWMKKyAgICBpZCBpbnRlcm5hbDsKK30KK0BlbmQKKworQGltcGxlbWVudGF0aW9u IFdlYk5TSFRUUENvb2tpZVN0b3JhZ2VJbnRlcm5hbAorQGVuZAorCitAaW50ZXJmYWNlIFdlYkNv b2tpZU9ic2VydmVyQWRhcHRlciA6IE5TT2JqZWN0IHsKKyAgICBXZWJDb3JlOjpDb29raWVTdG9y YWdlT2JzZXJ2ZXIqIG9ic2VydmVyOworfQorLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoT2JzZXJ2 ZXI6KFdlYkNvcmU6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlciYpdGhlT2JzZXJ2ZXI7CistICh2b2lk KWNvb2tpZXNDaGFuZ2VkTm90aWZpY2F0aW9uSGFuZGxlcjooTlNOb3RpZmljYXRpb24gKilub3Rp ZmljYXRpb247CisKK0BlbmQKIAotc3RhdGljIHZvaWQgY29va2llc0NoYW5nZWQoQ0ZIVFRQQ29v a2llU3RvcmFnZVJlZiwgdm9pZCogY29udGV4dCkKK0BpbXBsZW1lbnRhdGlvbiBXZWJDb29raWVP YnNlcnZlckFkYXB0ZXIKKworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoT2JzZXJ2ZXI6KFdlYkNv cmU6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlciYpdGhlT2JzZXJ2ZXIKIHsKLSAgICBBU1NFUlQoIWlz TWFpblRocmVhZCgpKTsKLSAgICBzdGF0aWNfY2FzdDxDb29raWVTdG9yYWdlT2JzZXJ2ZXIqPihj b250ZXh0KS0+Y29va2llc0RpZENoYW5nZSgpOworICAgIHNlbGYgPSBbc3VwZXIgaW5pdF07Cisg ICAgaWYgKCFzZWxmKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgb2JzZXJ2ZXIgPSAmdGhl T2JzZXJ2ZXI7CisKKyAgICByZXR1cm4gc2VsZjsKIH0KIAotUmVmUHRyPENvb2tpZVN0b3JhZ2VP YnNlcnZlcj4gQ29va2llU3RvcmFnZU9ic2VydmVyOjpjcmVhdGUoQ0ZIVFRQQ29va2llU3RvcmFn ZVJlZiBjb29raWVTdG9yYWdlKQorLSAodm9pZCljb29raWVzQ2hhbmdlZE5vdGlmaWNhdGlvbkhh bmRsZXI6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgVU5VU0VEX1BBUkFN KG5vdGlmaWNhdGlvbik7CisgICAgb2JzZXJ2ZXItPmNvb2tpZXNEaWRDaGFuZ2UoKTsKK30KKwor QGVuZAorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK1JlZlB0cjxDb29raWVTdG9yYWdlT2JzZXJ2 ZXI+IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6Y3JlYXRlKE5TSFRUUENvb2tpZVN0b3JhZ2UgKmNv b2tpZVN0b3JhZ2UpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDb29raWVTdG9yYWdlT2Jz ZXJ2ZXIoY29va2llU3RvcmFnZSkpOwogfQogCi1Db29raWVTdG9yYWdlT2JzZXJ2ZXI6OkNvb2tp ZVN0b3JhZ2VPYnNlcnZlcihDRkhUVFBDb29raWVTdG9yYWdlUmVmIGNvb2tpZVN0b3JhZ2UpCitD b29raWVTdG9yYWdlT2JzZXJ2ZXI6OkNvb2tpZVN0b3JhZ2VPYnNlcnZlcihOU0hUVFBDb29raWVT dG9yYWdlICpjb29raWVTdG9yYWdlKQogICAgIDogbV9jb29raWVTdG9yYWdlKGNvb2tpZVN0b3Jh Z2UpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKQEAgLTUzLDI3ICs4NSw0NSBAQCBD b29raWVTdG9yYWdlT2JzZXJ2ZXI6On5Db29raWVTdG9yYWdlT2JzZXJ2ZXIoKQogewogICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CiAKLSAgICBpZiAobV9jb29raWVDaGFuZ2VDYWxsYmFjaykK KyAgICBpZiAobV9jb29raWVDaGFuZ2VDYWxsYmFjaykgeworICAgICAgICBBU1NFUlQobV9vYnNl cnZlckFkYXB0ZXIpOwogICAgICAgICBzdG9wT2JzZXJ2aW5nKCk7CisgICAgfQogfQogCiB2b2lk IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmcoV1RGOjpGdW5jdGlvbjx2b2lk KCk+JiYgY2FsbGJhY2spCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NF UlQoIW1fY29va2llQ2hhbmdlQ2FsbGJhY2spOworICAgIEFTU0VSVCghbV9vYnNlcnZlckFkYXB0 ZXIpOworCiAgICAgbV9jb29raWVDaGFuZ2VDYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spOwor ICAgIG1fb2JzZXJ2ZXJBZGFwdGVyID0gYWRvcHROUyhbW1dlYkNvb2tpZU9ic2VydmVyQWRhcHRl ciBhbGxvY10gaW5pdFdpdGhPYnNlcnZlcjoqdGhpc10pOwogCi0gICAgQ0ZIVFRQQ29va2llU3Rv cmFnZUFkZE9ic2VydmVyKG1fY29va2llU3RvcmFnZS5nZXQoKSwgW05TVVJMQ29ubmVjdGlvbiBy ZXNvdXJjZUxvYWRlclJ1bkxvb3BdLCBrQ0ZSdW5Mb29wQ29tbW9uTW9kZXMsIGNvb2tpZXNDaGFu Z2VkLCB0aGlzKTsKLSAgICBDRkhUVFBDb29raWVTdG9yYWdlU2NoZWR1bGVXaXRoUnVuTG9vcCht X2Nvb2tpZVN0b3JhZ2UuZ2V0KCksIFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5M b29wXSwga0NGUnVuTG9vcENvbW1vbk1vZGVzKTsKKyAgICBpZiAoIW1faGFzUmVnaXN0ZXJlZElu dGVybmFsc0Zvck5vdGlmaWNhdGlvbnMpIHsKKyAgICAgICAgaWYgKG1fY29va2llU3RvcmFnZS5n ZXQoKSAhPSBbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQQ29va2llU3RvcmFnZV0pIHsK KyAgICAgICAgICAgIGF1dG8gc2VsZWN0b3IgPSBOU1NlbGVjdG9yRnJvbVN0cmluZyhAInJlZ2lz dGVyRm9yUG9zdGluZ05vdGlmaWNhdGlvbnNXaXRoQ29udGV4dDoiKTsKKyAgICAgICAgICAgIGlk IGludGVybmFsT2JqZWN0ID0gKHN0YXRpY19jYXN0PFdlYk5TSFRUUENvb2tpZVN0b3JhZ2VJbnRl cm5hbCAqPihtX2Nvb2tpZVN0b3JhZ2UuZ2V0KCkpKS0+aW50ZXJuYWw7CisgICAgICAgICAgICBS RUxFQVNFX0FTU0VSVChbaW50ZXJuYWxPYmplY3QgcmVzcG9uZHNUb1NlbGVjdG9yOnNlbGVjdG9y XSk7CisgICAgICAgICAgICBbaW50ZXJuYWxPYmplY3QgcGVyZm9ybVNlbGVjdG9yOnNlbGVjdG9y IHdpdGhPYmplY3Q6bV9jb29raWVTdG9yYWdlLmdldCgpXTsKKyAgICAgICAgfQorCisgICAgICAg IG1faGFzUmVnaXN0ZXJlZEludGVybmFsc0Zvck5vdGlmaWNhdGlvbnMgPSB0cnVlOworICAgIH0K KworICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6 bV9vYnNlcnZlckFkYXB0ZXIuZ2V0KCkgc2VsZWN0b3I6QHNlbGVjdG9yKGNvb2tpZXNDaGFuZ2Vk Tm90aWZpY2F0aW9uSGFuZGxlcjopIG5hbWU6TlNIVFRQQ29va2llTWFuYWdlckNvb2tpZXNDaGFu Z2VkTm90aWZpY2F0aW9uIG9iamVjdDptX2Nvb2tpZVN0b3JhZ2UuZ2V0KCldOwogfQogCiB2b2lk IENvb2tpZVN0b3JhZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZygpCiB7CiAgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9jb29raWVDaGFuZ2VDYWxsYmFjayk7Ci0gICAg bV9jb29raWVDaGFuZ2VDYWxsYmFjayA9IG51bGxwdHI7CisgICAgQVNTRVJUKG1fb2JzZXJ2ZXJB ZGFwdGVyKTsKIAotICAgIENGSFRUUENvb2tpZVN0b3JhZ2VSZW1vdmVPYnNlcnZlcihtX2Nvb2tp ZVN0b3JhZ2UuZ2V0KCksIFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSwg a0NGUnVuTG9vcENvbW1vbk1vZGVzLCBjb29raWVzQ2hhbmdlZCwgdGhpcyk7CisgICAgW1tOU05v dGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjptX29ic2VydmVy QWRhcHRlci5nZXQoKSBuYW1lOk5TSFRUUENvb2tpZU1hbmFnZXJDb29raWVzQ2hhbmdlZE5vdGlm aWNhdGlvbiBvYmplY3Q6bmlsXTsKKworICAgIG1fY29va2llQ2hhbmdlQ2FsbGJhY2sgPSBudWxs cHRyOworICAgIG1fb2JzZXJ2ZXJBZGFwdGVyID0gbmlsOwogfQogCiB2b2lkIENvb2tpZVN0b3Jh Z2VPYnNlcnZlcjo6Y29va2llc0RpZENoYW5nZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Np b25Db2NvYS5tbQppbmRleCBmMTkzMWIxNDk2NmY5MTc2YTQ0ZjAyZGU2MTYwNjU2Nzg4ZDk3ODdl Li5mMTY5NjYzNjg3YzFjODI5NDEyYWQzMjQ4ZWE0OGRiNTVkODNjNzI3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lv bkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0 d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW0KQEAgLTk0LDcgKzk0LDcgQEAgTlNIVFRQQ29va2ll U3RvcmFnZSAqTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpuc0Nvb2tpZVN0b3JhZ2UoKSBjb25zdAog Q29va2llU3RvcmFnZU9ic2VydmVyJiBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZVN0b3Jh Z2VPYnNlcnZlcigpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2Nvb2tpZVN0b3JhZ2VPYnNlcnZlcikK LSAgICAgICAgbV9jb29raWVTdG9yYWdlT2JzZXJ2ZXIgPSBDb29raWVTdG9yYWdlT2JzZXJ2ZXI6 OmNyZWF0ZShbbnNDb29raWVTdG9yYWdlKCkgX2Nvb2tpZVN0b3JhZ2VdKTsKKyAgICAgICAgbV9j b29raWVTdG9yYWdlT2JzZXJ2ZXIgPSBDb29raWVTdG9yYWdlT2JzZXJ2ZXI6OmNyZWF0ZShuc0Nv b2tpZVN0b3JhZ2UoKSk7CiAKICAgICByZXR1cm4gKm1fY29va2llU3RvcmFnZU9ic2VydmVyOwog fQo=