170521 2017-04-05 14:16:54 -0700 Refactor so WebsiteDataStores always have a StorageManager 2017-04-07 09:03:01 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 170578 1 beidson beidson achristensen commit-queue ggaren thorton oldest_to_newest 1294642 0 beidson 2017-04-05 14:16:54 -0700 Refactor so WebsiteDataStores always have a StorageManager Even for ephemeral sessions. 1294646 1 306314 beidson 2017-04-05 14:22:02 -0700 Created attachment 306314 Patch 1294647 2 306314 ggaren 2017-04-05 14:25:10 -0700 Comment on attachment 306314 Patch r=me 1294650 3 306316 beidson 2017-04-05 14:27:57 -0700 Created attachment 306316 Patch 1294672 4 306316 commit-queue 2017-04-05 15:38:27 -0700 Comment on attachment 306316 Patch Clearing flags on attachment: 306316 Committed r214973: <http://trac.webkit.org/changeset/214973> 1294673 5 commit-queue 2017-04-05 15:38:29 -0700 All reviewed patches have been landed. Closing bug. 1295131 6 commit-queue 2017-04-06 17:15:41 -0700 Re-opened since this is blocked by bug 170578 1295357 7 beidson 2017-04-07 09:02:53 -0700 There's significant UIProcess architecture issues that made this not be okay right now. Basically, a single WebProcess connection can have multiple data stores associated with it, meaning multiple StorageManagers, and we can't have more than one StorageManager registered for message handling on a given connection. I'll be resolving LocalStorage issues another way. 306314 2017-04-05 14:22:02 -0700 2017-04-05 14:27:55 -0700 Patch bug-170521-20170405142202.patch text/plain 8846 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0OTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOThiMzgyZTQ5ZDczNjRl MDhmZTY2OTliNWZmZTQ5ODM3ZDFlMDNmZi4uOWMzYTk3ZWVmMDY0ZmM4MDI1NTIxMGNlZDIwYjdm MDU3MmQ1MmE3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA0LTA1ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBzbyBXZWJz aXRlRGF0YVN0b3JlcyBhbHdheXMgaGF2ZSBhIFN0b3JhZ2VNYW5hZ2VyLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNTIxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBiYXNpY2FsbHkgaW52b2x2 ZXMgdGVhY2hpbmcgU3RvcmFnZU1hbmFnZXIgaG93IHRvIHdvcmsgd2l0aG91dCBhIExvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlciwKKyAgICAgICAgc2luY2UgdGhlcmUgd2lsbCBuZXZlciBiZSBl cGhlbWVyYWwgYml0cyBvbiBkaXNrIHRvIHRyYWNrLgorICAgICAgICAKKyAgICAgICAgKiBVSVBy b2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6b3BlbkRhdGFiYXNlQW5kSW1wb3J0SXRlbXNJZk5lZWRl ZCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVFcGhlbWVyYWwpOgor ICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZU1hbmFnZXIpOgorICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3JpZ2lucyk6CisgICAg ICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5EZXRhaWxz KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZUVu dHJpZXNGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRl TG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9y YWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmg6CisgICAgICAgIAorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6V2Vic2l0ZURhdGFTdG9yZSk6CisKIDIwMTctMDQt MDUgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl1b aU9TXSBBZGQgZW50aXRsZW1lbnRzIHRvIGVuYWJsZSBhdWRpby92aWRlbyBjYXB0dXJlIGluIFdl YlByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0 b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VNYW5hZ2VyLmNwcAppbmRleCA1ODAzZTJjYjM5MGNlYzE2OTc5ZDI5N2Q2MjMwODM1MTczYjhm M2FjLi44YmM3Y2Q0N2JjMWE5ZGRjZWUyMGQxZmRjMDg4YjRiN2E5MjM3YTdhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBA IC0yODEsMTIgKzI4MSwxMiBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xl YXIoKQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6b3BlbkRhdGFiYXNlQW5k SW1wb3J0SXRlbXNJZk5lZWRlZCgpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX2xvY2FsU3RvcmFnZU5h bWVzcGFjZSkKKyAgICBpZiAoIW1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlIHx8ICFtX2xvY2FsU3Rv cmFnZU5hbWVzcGFjZS0+c3RvcmFnZU1hbmFnZXIoKS0+bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRy YWNrZXIpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIFdlIG9wZW4gdGhlIGRhdGFiYXNlIGhl cmUgZXZlbiBpZiB3ZSd2ZSBhbHJlYWR5IGltcG9ydGVkIG91ciBpdGVtcyB0byBlbnN1cmUgdGhh dCB0aGUgZGF0YWJhc2UgaXMgb3BlbiBpZiB3ZSBuZWVkIHRvIHdyaXRlIHRvIGl0LgogICAgIGlm ICghbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZSkKLSAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFz ZSA9IExvY2FsU3RvcmFnZURhdGFiYXNlOjpjcmVhdGUobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2Ut PnN0b3JhZ2VNYW5hZ2VyKCktPm1fcXVldWUuY29weVJlZigpLCBtX2xvY2FsU3RvcmFnZU5hbWVz cGFjZS0+c3RvcmFnZU1hbmFnZXIoKS0+bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY29w eVJlZigpLCBtX3NlY3VyaXR5T3JpZ2luKTsKKyAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFz ZSA9IExvY2FsU3RvcmFnZURhdGFiYXNlOjpjcmVhdGUobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2Ut PnN0b3JhZ2VNYW5hZ2VyKCktPm1fcXVldWUuY29weVJlZigpLCAqbV9sb2NhbFN0b3JhZ2VOYW1l c3BhY2UtPnN0b3JhZ2VNYW5hZ2VyKCktPm1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLCBt X3NlY3VyaXR5T3JpZ2luKTsKIAogICAgIGlmIChtX2RpZEltcG9ydEl0ZW1zRnJvbURhdGFiYXNl KQogICAgICAgICByZXR1cm47CkBAIC00NTEsMTAgKzQ1MSwxNyBAQCBSZWY8U3RvcmFnZU1hbmFn ZXI+IFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGUoY29uc3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJl Y3RvcnkpCiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3RvcmFnZU1hbmFnZXIobG9jYWxTdG9y YWdlRGlyZWN0b3J5KSk7CiB9CiAKK1JlZjxTdG9yYWdlTWFuYWdlcj4gU3RvcmFnZU1hbmFnZXI6 OmNyZWF0ZUVwaGVtZXJhbCgpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3RvcmFnZU1h bmFnZXIoeyB9KSk7Cit9CisKIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlTWFuYWdlcihjb25zdCBT dHJpbmcmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSkKICAgICA6IG1fcXVldWUoV29ya1F1ZXVlOjpj cmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuU3RvcmFnZU1hbmFnZXIiKSkKLSAgICAsIG1fbG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyKExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6Y3JlYXRl KG1fcXVldWUuY29weVJlZigpLCBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpKQogeworICAgIGlmICgh bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgbV9sb2NhbFN0b3JhZ2VE YXRhYmFzZVRyYWNrZXIgPSBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmNyZWF0ZShtX3F1 ZXVlLmNvcHlSZWYoKSwgbG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKKwogICAgIC8vIE1ha2Ugc3Vy ZSB0aGUgZW5jb2RpbmcgaXMgaW5pdGlhbGl6ZWQgYmVmb3JlIHdlIHN0YXJ0IGRpc3BhdGNoaW5n IHRoaW5ncyB0byB0aGUgcXVldWUuCiAgICAgVVRGOEVuY29kaW5nKCk7CiB9CkBAIC01ODAsOCAr NTg3LDEwIEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdpbnMoc3Rk OjpmdW5jdGlvbjx2b2lkKEhhc2hTZXQ8V2ViQ29yZTo6CiAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2go W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgSGFzaFNl dDxTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnM7CiAKLSAgICAgICAgZm9yIChhdXRvJiBvcmln aW4gOiBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2lucygpKQotICAgICAgICAg ICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKKyAgICAgICAgaWYgKG1fbG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyKSB7CisgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG1fbG9jYWxTdG9y YWdlRGF0YWJhc2VUcmFja2VyLT5vcmlnaW5zKCkpCisgICAgICAgICAgICAgICAgb3JpZ2lucy5h ZGQob3JpZ2luKTsKKyAgICAgICAgfQogCiAgICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50TG9j YWxTdG9yYWdlTmFtZXNwYWNlIDogbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZh bHVlcygpKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IHRyYW5zaWVudExvY2Fs U3RvcmFnZU5hbWVzcGFjZS0+b3JpZ2lucygpKQpAQCAtNTk3LDcgKzYwNiw5IEBAIHZvaWQgU3Rv cmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdpbnMoc3RkOjpmdW5jdGlvbjx2b2lkKEhh c2hTZXQ8V2ViQ29yZTo6CiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmln aW5EZXRhaWxzKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPExvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlcjo6T3JpZ2luRGV0YWlscz4pPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIG1f cXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNv bXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7 Ci0gICAgICAgIGF1dG8gb3JpZ2luRGV0YWlscyA9IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFj a2VyLT5vcmlnaW5EZXRhaWxzKCk7CisgICAgICAgIFZlY3RvcjxMb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXI6Ok9yaWdpbkRldGFpbHM+IG9yaWdpbkRldGFpbHM7CisgICAgICAgIGlmIChtX2xv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcikKKyAgICAgICAgICAgIG1fbG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyLT5vcmlnaW5EZXRhaWxzKCk7CiAKICAgICAgICAgUnVuTG9vcDo6bWFpbigp LmRpc3BhdGNoKFtvcmlnaW5EZXRhaWxzID0gV1RGTW92ZShvcmlnaW5EZXRhaWxzKSwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUob3JpZ2luRGV0YWlscykpOwpAQCAt NjE0LDE0ICs2MjUsMTcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdl RW50cmllc0Zvck9yaWdpbihTZWN1cml0eU9yaWdpbkRhdGEmJiBzZWMKICAgICAgICAgZm9yIChh dXRvJiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX3RyYW5zaWVudExvY2FsU3Rv cmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCiAgICAgICAgICAgICB0cmFuc2llbnRMb2NhbFN0b3Jh Z2VOYW1lc3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4oY29waWVkT3JpZ2lu KTsKIAotICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ZGVsZXRlRGF0YWJh c2VXaXRoT3JpZ2luKGNvcGllZE9yaWdpbik7CisgICAgICAgIGlmIChtX2xvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlcikKKyAgICAgICAgICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy LT5kZWxldGVEYXRhYmFzZVdpdGhPcmlnaW4oY29waWVkT3JpZ2luKTsKICAgICB9KTsKIH0KIAog dm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2lu Y2Uoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCB0aW1lLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBtX3F1ZXVlLT5kaXNwYXRj aChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCB0aW1lLCBjb21wbGV0aW9u SGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAgICAg ICBhdXRvIGRlbGV0ZWRPcmlnaW5zID0gbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXItPmRl bGV0ZURhdGFiYXNlc01vZGlmaWVkU2luY2UodGltZSk7CisgICAgICAgIFZlY3RvcjxXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbkRhdGE+IGRlbGV0ZWRPcmlnaW5zOworICAgICAgICBpZiAobV9sb2Nh bFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIpCisgICAgICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFi YXNlVHJhY2tlci0+ZGVsZXRlRGF0YWJhc2VzTW9kaWZpZWRTaW5jZSh0aW1lKTsKIAogICAgICAg ICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IGRlbGV0ZWRPcmlnaW5zKSB7CiAgICAgICAgICAg ICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5hbWVzcGFjZSA6IG1fbG9jYWxTdG9yYWdlTmFtZXNw YWNlcy52YWx1ZXMoKSkKQEAgLTY1MSw3ICs2NjUsOCBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpk ZWxldGVMb2NhbFN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6 UwogICAgICAgICAgICAgZm9yIChhdXRvJiB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2Ug OiBtX3RyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCiAgICAgICAgICAg ICAgICAgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01h dGNoaW5nT3JpZ2luKG9yaWdpbik7CiAKLSAgICAgICAgICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyLT5kZWxldGVEYXRhYmFzZVdpdGhPcmlnaW4ob3JpZ2luKTsKKyAgICAgICAgICAg IGlmIChtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcikKKyAgICAgICAgICAgICAgICBtX2xv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ZGVsZXRlRGF0YWJhc2VXaXRoT3JpZ2luKG9yaWdp bik7CiAgICAgICAgIH0KIAogICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKaW5kZXggNTJmMDkzZTAxNWI3M2MyZDFhODZmNWUxYTA3 MTRjMDcxY2RjMTdhZC4uZDU3M2ZjYjIwZTJiNGIzOGRlMTRhNzM4NDY0Njg4MGFjMmE5ZWQxZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdl ci5oCkBAIC00Nyw2ICs0Nyw3IEBAIGNsYXNzIFdlYlByb2Nlc3NQcm94eTsKIGNsYXNzIFN0b3Jh Z2VNYW5hZ2VyIDogcHVibGljIElQQzo6Q29ubmVjdGlvbjo6V29ya1F1ZXVlTWVzc2FnZVJlY2Vp dmVyIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPFN0b3JhZ2VNYW5hZ2VyPiBjcmVhdGUoY29u c3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOworICAgIHN0YXRpYyBSZWY8U3RvcmFn ZU1hbmFnZXI+IGNyZWF0ZUVwaGVtZXJhbCgpOwogICAgIH5TdG9yYWdlTWFuYWdlcigpOwogCiAg ICAgdm9pZCBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRfdCBzdG9yYWdlTmFt ZXNwYWNlSUQsIHVuc2lnbmVkIHF1b3RhSW5CeXRlcyk7CkBAIC05OSw3ICsxMDAsNyBAQCBwcml2 YXRlOgogCiAgICAgUmVmPFdvcmtRdWV1ZT4gbV9xdWV1ZTsKIAotICAgIFJlZjxMb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXI+IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOworICAgIFJl ZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyOwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2U+PiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXM7CiAKICAgICBIYXNoTWFwPHN0ZDo6cGFpcjx1 aW50NjRfdCwgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiwgUmVmUHRyPFRyYW5zaWVudExv Y2FsU3RvcmFnZU5hbWVzcGFjZT4+IG1fdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlczsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz aXRlRGF0YVN0b3JlLmNwcAppbmRleCAxZmMzNTM4MDc0NTgwMDUxM2VkZmNkNjNlNTcwY2QyODhm NTg3OGVlLi5lYmUxYTA2MmNjYWQ5Y2E3YmQxYzlmMTZkMWE0ZDRhN2NjMWUzMWJmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9y ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuY3BwCkBAIC05MSw2ICs5MSw3IEBAIFdlYnNpdGVEYXRhU3RvcmU6OldlYnNpdGVE YXRhU3RvcmUoV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICA6IG1faWRlbnRpZmll cihnZW5lcmF0ZUlkZW50aWZpZXIoKSkKICAgICAsIG1fc2Vzc2lvbklEKHNlc3Npb25JRCkKICAg ICAsIG1fY29uZmlndXJhdGlvbigpCisgICAgLCBtX3N0b3JhZ2VNYW5hZ2VyKFN0b3JhZ2VNYW5h Z2VyOjpjcmVhdGVFcGhlbWVyYWwoKSkKICAgICAsIG1fcXVldWUoV29ya1F1ZXVlOjpjcmVhdGUo ImNvbS5hcHBsZS5XZWJLaXQuV2Vic2l0ZURhdGFTdG9yZSIpKQogewogICAgIHBsYXRmb3JtSW5p dGlhbGl6ZSgpOwo= 306316 2017-04-05 14:27:57 -0700 2017-04-05 15:38:27 -0700 Patch bug-170521-20170405142756.patch text/plain 8876 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0OTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOThiMzgyZTQ5ZDczNjRl MDhmZTY2OTliNWZmZTQ5ODM3ZDFlMDNmZi4uMTAyMzg3MjRhMTI4YjhkZTI5MmU0YTExMTRlMDc1 OWU4OTc0MTNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA0LTA1ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBzbyBXZWJz aXRlRGF0YVN0b3JlcyBhbHdheXMgaGF2ZSBhIFN0b3JhZ2VNYW5hZ2VyLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNTIxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgVGhpcyBiYXNpY2FsbHkgaW52b2x2ZXMg dGVhY2hpbmcgU3RvcmFnZU1hbmFnZXIgaG93IHRvIHdvcmsgd2l0aG91dCBhIExvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlciwKKyAgICAgICAgc2luY2UgdGhlcmUgd2lsbCBuZXZlciBiZSBlcGhl bWVyYWwgYml0cyBvbiBkaXNrIHRvIHRyYWNrLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nl c3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VN YW5hZ2VyOjpTdG9yYWdlQXJlYTo6b3BlbkRhdGFiYXNlQW5kSW1wb3J0SXRlbXNJZk5lZWRlZCk6 CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVFcGhlbWVyYWwpOgorICAg ICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZU1hbmFnZXIpOgorICAgICAgICAo V2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3JpZ2lucyk6CisgICAgICAg IChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5EZXRhaWxzKToK KyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJp ZXNGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9j YWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdl TWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAgICAq IFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmg6CisgICAgICAgIAorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6V2Vic2l0ZURhdGFTdG9yZSk6CisKIDIwMTctMDQtMDUg IEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl1baU9T XSBBZGQgZW50aXRsZW1lbnRzIHRvIGVuYWJsZSBhdWRpby92aWRlbyBjYXB0dXJlIGluIFdlYlBy b2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VN YW5hZ2VyLmNwcAppbmRleCA1ODAzZTJjYjM5MGNlYzE2OTc5ZDI5N2Q2MjMwODM1MTczYjhmM2Fj Li4zYTJlNGJlYmI5MTdhYzU3YmNiODY3NDRhZjZmZDM3YjlkNWY1ZTI5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC0y ODEsMTIgKzI4MSwxMiBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xlYXIo KQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6b3BlbkRhdGFiYXNlQW5kSW1w b3J0SXRlbXNJZk5lZWRlZCgpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX2xvY2FsU3RvcmFnZU5hbWVz cGFjZSkKKyAgICBpZiAoIW1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlIHx8ICFtX2xvY2FsU3RvcmFn ZU5hbWVzcGFjZS0+c3RvcmFnZU1hbmFnZXIoKS0+bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIFdlIG9wZW4gdGhlIGRhdGFiYXNlIGhlcmUg ZXZlbiBpZiB3ZSd2ZSBhbHJlYWR5IGltcG9ydGVkIG91ciBpdGVtcyB0byBlbnN1cmUgdGhhdCB0 aGUgZGF0YWJhc2UgaXMgb3BlbiBpZiB3ZSBuZWVkIHRvIHdyaXRlIHRvIGl0LgogICAgIGlmICgh bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZSkKLSAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZSA9 IExvY2FsU3RvcmFnZURhdGFiYXNlOjpjcmVhdGUobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPnN0 b3JhZ2VNYW5hZ2VyKCktPm1fcXVldWUuY29weVJlZigpLCBtX2xvY2FsU3RvcmFnZU5hbWVzcGFj ZS0+c3RvcmFnZU1hbmFnZXIoKS0+bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY29weVJl ZigpLCBtX3NlY3VyaXR5T3JpZ2luKTsKKyAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZSA9 IExvY2FsU3RvcmFnZURhdGFiYXNlOjpjcmVhdGUobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPnN0 b3JhZ2VNYW5hZ2VyKCktPm1fcXVldWUuY29weVJlZigpLCAqbV9sb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UtPnN0b3JhZ2VNYW5hZ2VyKCktPm1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLCBtX3Nl Y3VyaXR5T3JpZ2luKTsKIAogICAgIGlmIChtX2RpZEltcG9ydEl0ZW1zRnJvbURhdGFiYXNlKQog ICAgICAgICByZXR1cm47CkBAIC00NTEsMTAgKzQ1MSwxNyBAQCBSZWY8U3RvcmFnZU1hbmFnZXI+ IFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGUoY29uc3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3Rv cnkpCiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3RvcmFnZU1hbmFnZXIobG9jYWxTdG9yYWdl RGlyZWN0b3J5KSk7CiB9CiAKK1JlZjxTdG9yYWdlTWFuYWdlcj4gU3RvcmFnZU1hbmFnZXI6OmNy ZWF0ZUVwaGVtZXJhbCgpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3RvcmFnZU1hbmFn ZXIoeyB9KSk7Cit9CisKIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlTWFuYWdlcihjb25zdCBTdHJp bmcmIGxvY2FsU3RvcmFnZURpcmVjdG9yeSkKICAgICA6IG1fcXVldWUoV29ya1F1ZXVlOjpjcmVh dGUoImNvbS5hcHBsZS5XZWJLaXQuU3RvcmFnZU1hbmFnZXIiKSkKLSAgICAsIG1fbG9jYWxTdG9y YWdlRGF0YWJhc2VUcmFja2VyKExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6Y3JlYXRlKG1f cXVldWUuY29weVJlZigpLCBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpKQogeworICAgIGlmICghbG9j YWxTdG9yYWdlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXIgPSBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmNyZWF0ZShtX3F1ZXVl LmNvcHlSZWYoKSwgbG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKKwogICAgIC8vIE1ha2Ugc3VyZSB0 aGUgZW5jb2RpbmcgaXMgaW5pdGlhbGl6ZWQgYmVmb3JlIHdlIHN0YXJ0IGRpc3BhdGNoaW5nIHRo aW5ncyB0byB0aGUgcXVldWUuCiAgICAgVVRGOEVuY29kaW5nKCk7CiB9CkBAIC01ODAsOCArNTg3 LDEwIEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdpbnMoc3RkOjpm dW5jdGlvbjx2b2lkKEhhc2hTZXQ8V2ViQ29yZTo6CiAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBX VEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgSGFzaFNldDxT ZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnM7CiAKLSAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4g OiBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2lucygpKQotICAgICAgICAgICAg b3JpZ2lucy5hZGQob3JpZ2luKTsKKyAgICAgICAgaWYgKG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VU cmFja2VyKSB7CisgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG1fbG9jYWxTdG9yYWdl RGF0YWJhc2VUcmFja2VyLT5vcmlnaW5zKCkpCisgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQo b3JpZ2luKTsKKyAgICAgICAgfQogCiAgICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50TG9jYWxT dG9yYWdlTmFtZXNwYWNlIDogbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVl cygpKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IHRyYW5zaWVudExvY2FsU3Rv cmFnZU5hbWVzcGFjZS0+b3JpZ2lucygpKQpAQCAtNTk3LDcgKzYwNiw5IEBAIHZvaWQgU3RvcmFn ZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdpbnMoc3RkOjpmdW5jdGlvbjx2b2lkKEhhc2hT ZXQ8V2ViQ29yZTo6CiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5E ZXRhaWxzKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPExvY2FsU3RvcmFnZURhdGFiYXNlVHJh Y2tlcjo6T3JpZ2luRGV0YWlscz4pPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIG1fcXVl dWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7Ci0g ICAgICAgIGF1dG8gb3JpZ2luRGV0YWlscyA9IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy LT5vcmlnaW5EZXRhaWxzKCk7CisgICAgICAgIFZlY3RvcjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRy YWNrZXI6Ok9yaWdpbkRldGFpbHM+IG9yaWdpbkRldGFpbHM7CisgICAgICAgIGlmIChtX2xvY2Fs U3RvcmFnZURhdGFiYXNlVHJhY2tlcikKKyAgICAgICAgICAgIG9yaWdpbkRldGFpbHMgPSBtX2xv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+b3JpZ2luRGV0YWlscygpOwogCiAgICAgICAgIFJ1 bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbb3JpZ2luRGV0YWlscyA9IFdURk1vdmUob3JpZ2luRGV0 YWlscyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkg bXV0YWJsZSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKG9yaWdpbkRl dGFpbHMpKTsKQEAgLTYxNCwxNCArNjI1LDE3IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlbGV0 ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW4oU2VjdXJpdHlPcmlnaW5EYXRhJiYgc2VjCiAg ICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV90cmFu c2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQogICAgICAgICAgICAgdHJhbnNp ZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2lu KGNvcGllZE9yaWdpbik7CiAKLSAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIt PmRlbGV0ZURhdGFiYXNlV2l0aE9yaWdpbihjb3BpZWRPcmlnaW4pOworICAgICAgICBpZiAobV9s b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIpCisgICAgICAgICAgICBtX2xvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlci0+ZGVsZXRlRGF0YWJhc2VXaXRoT3JpZ2luKGNvcGllZE9yaWdpbik7CiAg ICAgfSk7CiB9CiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZU9yaWdp bnNNb2RpZmllZFNpbmNlKHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgdGlt ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgbV9x dWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdGlt ZSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRh YmxlIHsKLSAgICAgICAgYXV0byBkZWxldGVkT3JpZ2lucyA9IG1fbG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyLT5kZWxldGVEYXRhYmFzZXNNb2RpZmllZFNpbmNlKHRpbWUpOworICAgICAgICBW ZWN0b3I8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiBkZWxldGVkT3JpZ2luczsKKyAgICAg ICAgaWYgKG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyKQorICAgICAgICAgICAgZGVsZXRl ZE9yaWdpbnMgPSBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ZGVsZXRlRGF0YWJhc2Vz TW9kaWZpZWRTaW5jZSh0aW1lKTsKIAogICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6 IGRlbGV0ZWRPcmlnaW5zKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFnZU5h bWVzcGFjZSA6IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKQEAgLTY1MSw3ICs2 NjUsOCBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VFbnRyaWVzRm9y T3JpZ2lucyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6UwogICAgICAgICAgICAgZm9yIChhdXRvJiB0 cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX3RyYW5zaWVudExvY2FsU3RvcmFnZU5h bWVzcGFjZXMudmFsdWVzKCkpCiAgICAgICAgICAgICAgICAgdHJhbnNpZW50TG9jYWxTdG9yYWdl TmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKG9yaWdpbik7CiAKLSAg ICAgICAgICAgIG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLT5kZWxldGVEYXRhYmFzZVdp dGhPcmlnaW4ob3JpZ2luKTsKKyAgICAgICAgICAgIGlmIChtX2xvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlcikKKyAgICAgICAgICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ ZGVsZXRlRGF0YWJhc2VXaXRoT3JpZ2luKG9yaWdpbik7CiAgICAgICAgIH0KIAogICAgICAgICBS dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKaW5k ZXggNTJmMDkzZTAxNWI3M2MyZDFhODZmNWUxYTA3MTRjMDcxY2RjMTdhZC4uZDU3M2ZjYjIwZTJi NGIzOGRlMTRhNzM4NDY0Njg4MGFjMmE5ZWQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCkBAIC00Nyw2ICs0Nyw3IEBAIGNsYXNz IFdlYlByb2Nlc3NQcm94eTsKIGNsYXNzIFN0b3JhZ2VNYW5hZ2VyIDogcHVibGljIElQQzo6Q29u bmVjdGlvbjo6V29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyIHsKIHB1YmxpYzoKICAgICBzdGF0aWMg UmVmPFN0b3JhZ2VNYW5hZ2VyPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJl Y3RvcnkpOworICAgIHN0YXRpYyBSZWY8U3RvcmFnZU1hbmFnZXI+IGNyZWF0ZUVwaGVtZXJhbCgp OwogICAgIH5TdG9yYWdlTWFuYWdlcigpOwogCiAgICAgdm9pZCBjcmVhdGVTZXNzaW9uU3RvcmFn ZU5hbWVzcGFjZSh1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIHVuc2lnbmVkIHF1b3RhSW5C eXRlcyk7CkBAIC05OSw3ICsxMDAsNyBAQCBwcml2YXRlOgogCiAgICAgUmVmPFdvcmtRdWV1ZT4g bV9xdWV1ZTsKIAotICAgIFJlZjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+IG1fbG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyOworICAgIFJlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRy YWNrZXI+IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOwogICAgIEhhc2hNYXA8dWludDY0 X3QsIFJlZlB0cjxMb2NhbFN0b3JhZ2VOYW1lc3BhY2U+PiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFj ZXM7CiAKICAgICBIYXNoTWFwPHN0ZDo6cGFpcjx1aW50NjRfdCwgV2ViQ29yZTo6U2VjdXJpdHlP cmlnaW5EYXRhPiwgUmVmUHRyPFRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZT4+IG1fdHJh bnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCAxZmMz NTM4MDc0NTgwMDUxM2VkZmNkNjNlNTcwY2QyODhmNTg3OGVlLi5lYmUxYTA2MmNjYWQ5Y2E3YmQx YzlmMTZkMWE0ZDRhN2NjMWUzMWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC05MSw2ICs5MSw3 IEBAIFdlYnNpdGVEYXRhU3RvcmU6OldlYnNpdGVEYXRhU3RvcmUoV2ViQ29yZTo6U2Vzc2lvbklE IHNlc3Npb25JRCkKICAgICA6IG1faWRlbnRpZmllcihnZW5lcmF0ZUlkZW50aWZpZXIoKSkKICAg ICAsIG1fc2Vzc2lvbklEKHNlc3Npb25JRCkKICAgICAsIG1fY29uZmlndXJhdGlvbigpCisgICAg LCBtX3N0b3JhZ2VNYW5hZ2VyKFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVFcGhlbWVyYWwoKSkKICAg ICAsIG1fcXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuV2Vic2l0ZURh dGFTdG9yZSIpKQogewogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwo=