143540 2015-04-08 16:54:24 -0700 Give each cache group a storage and use it in place of the singleton 2015-04-09 09:14:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ap commit-queue japhet oldest_to_newest 1083771 0 andersca 2015-04-08 16:54:24 -0700 Give each cache group a storage and use it in place of the singleton 1083773 1 250395 andersca 2015-04-08 16:55:15 -0700 Created attachment 250395 Patch 1083863 2 ap 2015-04-08 22:13:53 -0700 I'd love to know more about the plan. My understanding is that storage groups need to be application global, really. 1083979 3 andersca 2015-04-09 09:11:33 -0700 (In reply to comment #2) > I'd love to know more about the plan. My understanding is that storage > groups need to be application global, really. This is just about the possibility to give each web view (web page) a different data store (which includes the application cache). 1083982 4 andersca 2015-04-09 09:14:02 -0700 Committed r182601: <http://trac.webkit.org/changeset/182601> 250395 2015-04-08 16:55:15 -0700 2015-04-08 21:52:08 -0700 Patch bug-143540-20150408165426.patch text/plain 12943 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRhMzJlODQ5Njk2MzNh ZmZlMmZlNDAyNGZhNjg4YjRiYjUwYTMyYy4uOGEzZDFkZDI0ZWYzNjY0OTIwZWI3ZTk0Nzk5YjUz N2JjYmI1MzE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA0LTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgR2l2ZSBlYWNoIGNh Y2hlIGdyb3VwIGEgc3RvcmFnZSBhbmQgdXNlIGl0IGluIHBsYWNlIG9mIHRoZSBzaW5nbGV0b24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzU0MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMg YW5vdGhlciBzdGVwIHRvd2FyZHMgbWFraW5nIHRoZSBjYWNoZSBzdG9yYWdlIGJlIHBlciBwYWdl LgorCisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OkFwcGxpY2F0aW9uQ2Fj aGVHcm91cCk6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6On5BcHBs aWNhdGlvbkNhY2hlR3JvdXApOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUdy b3VwOjpjYWNoZUZvck1haW5SZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9u Q2FjaGVHcm91cDo6ZmFsbGJhY2tDYWNoZUZvck1haW5SZXF1ZXN0KToKKyAgICAgICAgKFdlYkNv cmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGUpOgorICAgICAgICAoV2ViQ29y ZTo6QXBwbGljYXRpb25DYWNoZUdyb3VwOjptYWtlT2Jzb2xldGUpOgorICAgICAgICAoV2ViQ29y ZTo6QXBwbGljYXRpb25DYWNoZUdyb3VwOjpkaWRSZWFjaE1heEFwcENhY2hlU2l6ZSk6CisgICAg ICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OnJlY2FsY3VsYXRlQXZhaWxhYmxl U3BhY2VJblF1b3RhKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6 Y2hlY2tJZkxvYWRJc0NvbXBsZXRlKToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGlj YXRpb25DYWNoZUdyb3VwLmg6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9u Q2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9y YWdlOjpsb2FkQ2FjaGVHcm91cCk6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hl U3RvcmFnZTo6ZmluZE9yQ3JlYXRlQ2FjaGVHcm91cCk6CisgICAgICAgIChXZWJDb3JlOjpBcHBs aWNhdGlvbkNhY2hlU3RvcmFnZTo6Y2FjaGVHcm91cEZvclVSTCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6ZmFsbGJhY2tDYWNoZUdyb3VwRm9yVVJMKToKKwog MjAxNS0wNC0wOCAgUGVyIEFybmUgVm9sbGFuICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAg ICAgW0N1cmxdIENvbXBpbGUgZXJyb3IgaW4gQ3VybENhY2hlRW50cnk6OnBhcnNlUmVzcG9uc2VI ZWFkZXJzIG1ldGhvZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNo ZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNh Y2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKaW5kZXggOTY3OTNlNzIwYzViM2RhYTJlNTEw ZTcwODVlMGU5NDYyNDE0OGE4NS4uY2QwNDZlNjBhOTM5Mzg2MTg0ZTdlMzVjNDYyNDkxYjhmY2Uy NWVlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0 aW9uQ2FjaGVHcm91cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0Fw cGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKQEAgLTUwLDggKzUwLDkgQEAKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi1BcHBsaWNhdGlvbkNhY2hlR3JvdXA6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cChj b25zdCBVUkwmIG1hbmlmZXN0VVJMKQotICAgIDogbV9tYW5pZmVzdFVSTChtYW5pZmVzdFVSTCkK K0FwcGxpY2F0aW9uQ2FjaGVHcm91cDo6QXBwbGljYXRpb25DYWNoZUdyb3VwKFJlZjxBcHBsaWNh dGlvbkNhY2hlU3RvcmFnZT4mJiBzdG9yYWdlLCBjb25zdCBVUkwmIG1hbmlmZXN0VVJMKQorICAg IDogbV9zdG9yYWdlKFdURjo6bW92ZShzdG9yYWdlKSkKKyAgICAsIG1fbWFuaWZlc3RVUkwobWFu aWZlc3RVUkwpCiAgICAgLCBtX29yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKG1hbmlmZXN0 VVJMKSkKICAgICAsIG1fdXBkYXRlU3RhdHVzKElkbGUpCiAgICAgLCBtX2Rvd25sb2FkaW5nUGVu ZGluZ01hc3RlclJlc291cmNlTG9hZGVyc0NvdW50KDApCkBAIC03MywzMyArNzQsMzQgQEAgQXBw bGljYXRpb25DYWNoZUdyb3VwOjp+QXBwbGljYXRpb25DYWNoZUdyb3VwKCkKICAgICBBU1NFUlQo bV9jYWNoZXMuaXNFbXB0eSgpKTsKICAgICAKICAgICBzdG9wTG9hZGluZygpOwotICAgIAotICAg IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5jYWNoZUdyb3VwRGVzdHJveWVk KHRoaXMpOworCisgICAgbV9zdG9yYWdlLT5jYWNoZUdyb3VwRGVzdHJveWVkKHRoaXMpOwogfQog ICAgIAogQXBwbGljYXRpb25DYWNoZSogQXBwbGljYXRpb25DYWNoZUdyb3VwOjpjYWNoZUZvck1h aW5SZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRG9jdW1lbnRMb2FkZXIq IGRvY3VtZW50TG9hZGVyKQogewogICAgIGlmICghQXBwbGljYXRpb25DYWNoZTo6cmVxdWVzdElz SFRUUE9ySFRUUFNHZXQocmVxdWVzdCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1 cm4gbnVsbHB0cjsKIAogICAgIFVSTCB1cmwocmVxdWVzdC51cmwoKSk7CiAgICAgaWYgKHVybC5o YXNGcmFnbWVudElkZW50aWZpZXIoKSkKICAgICAgICAgdXJsLnJlbW92ZUZyYWdtZW50SWRlbnRp ZmllcigpOwogCi0gICAgaWYgKGRvY3VtZW50TG9hZGVyLT5mcmFtZSgpICYmIGRvY3VtZW50TG9h ZGVyLT5mcmFtZSgpLT5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkpCi0gICAgICAgIHJl dHVybiAwOworICAgIGF1dG8qIHBhZ2UgPSBkb2N1bWVudExvYWRlci0+ZnJhbWUoKSA/IGRvY3Vt ZW50TG9hZGVyLT5mcmFtZSgpLT5wYWdlKCkgOiBudWxscHRyOworICAgIGlmICghcGFnZSB8fCBw YWdlLT51c2VzRXBoZW1lcmFsU2Vzc2lvbigpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAot ICAgIGlmIChBcHBsaWNhdGlvbkNhY2hlR3JvdXAqIGdyb3VwID0gQXBwbGljYXRpb25DYWNoZVN0 b3JhZ2U6OnNpbmdsZXRvbigpLmNhY2hlR3JvdXBGb3JVUkwodXJsKSkgeworICAgIGlmIChBcHBs aWNhdGlvbkNhY2hlR3JvdXAqIGdyb3VwID0gcGFnZS0+YXBwbGljYXRpb25DYWNoZVN0b3JhZ2Uo KS5jYWNoZUdyb3VwRm9yVVJMKHVybCkpIHsKICAgICAgICAgQVNTRVJUKGdyb3VwLT5uZXdlc3RD YWNoZSgpKTsKICAgICAgICAgQVNTRVJUKCFncm91cC0+aXNPYnNvbGV0ZSgpKTsKICAgICAgICAg CiAgICAgICAgIHJldHVybiBncm91cC0+bmV3ZXN0Q2FjaGUoKTsKICAgICB9CiAgICAgCi0gICAg cmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAgICAgCi1BcHBsaWNhdGlvbkNhY2hl KiBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmZhbGxiYWNrQ2FjaGVGb3JNYWluUmVxdWVzdChjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIERvY3VtZW50TG9hZGVyKikKK0FwcGxpY2F0aW9u Q2FjaGUqIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZmFsbGJhY2tDYWNoZUZvck1haW5SZXF1ZXN0 KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50 TG9hZGVyKQogewogICAgIGlmICghQXBwbGljYXRpb25DYWNoZTo6cmVxdWVzdElzSFRUUE9ySFRU UFNHZXQocmVxdWVzdCkpCiAgICAgICAgIHJldHVybiAwOwpAQCAtMTA4LDcgKzExMCwxMSBAQCBB cHBsaWNhdGlvbkNhY2hlKiBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmZhbGxiYWNrQ2FjaGVGb3JN YWluUmVxdWVzdChjb25zdCBSZXNvdQogICAgIGlmICh1cmwuaGFzRnJhZ21lbnRJZGVudGlmaWVy KCkpCiAgICAgICAgIHVybC5yZW1vdmVGcmFnbWVudElkZW50aWZpZXIoKTsKIAotICAgIGlmIChB cHBsaWNhdGlvbkNhY2hlR3JvdXAqIGdyb3VwID0gQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNp bmdsZXRvbigpLmZhbGxiYWNrQ2FjaGVHcm91cEZvclVSTCh1cmwpKSB7CisgICAgYXV0byogcGFn ZSA9IGRvY3VtZW50TG9hZGVyLT5mcmFtZSgpID8gZG9jdW1lbnRMb2FkZXItPmZyYW1lKCktPnBh Z2UoKSA6IG51bGxwdHI7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgIGlmIChBcHBsaWNhdGlvbkNhY2hlR3JvdXAqIGdyb3VwID0gcGFnZS0+YXBwbGljYXRp b25DYWNoZVN0b3JhZ2UoKS5mYWxsYmFja0NhY2hlR3JvdXBGb3JVUkwodXJsKSkgewogICAgICAg ICBBU1NFUlQoZ3JvdXAtPm5ld2VzdENhY2hlKCkpOwogICAgICAgICBBU1NFUlQoIWdyb3VwLT5p c09ic29sZXRlKCkpOwogCkBAIC0xNjIsNyArMTY4LDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hl R3JvdXA6OnNlbGVjdENhY2hlKEZyYW1lKiBmcmFtZSwgY29uc3QgVVJMJiBwYXNzZWRNYW5pZmVz dFUKICAgICAgICAgICAgIGJvb2wgaW5TdG9yYWdlID0gcmVzb3VyY2UtPnN0b3JhZ2VJRCgpOwog ICAgICAgICAgICAgcmVzb3VyY2UtPmFkZFR5cGUoQXBwbGljYXRpb25DYWNoZVJlc291cmNlOjpG b3JlaWduKTsKICAgICAgICAgICAgIGlmIChpblN0b3JhZ2UpCi0gICAgICAgICAgICAgICAgQXBw bGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLnN0b3JlVXBkYXRlZFR5cGUocmVzb3Vy Y2UsIG1haW5SZXNvdXJjZUNhY2hlKTsKKyAgICAgICAgICAgICAgICBmcmFtZS0+cGFnZSgpLT5h cHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLnN0b3JlVXBkYXRlZFR5cGUocmVzb3VyY2UsIG1haW5S ZXNvdXJjZUNhY2hlKTsKIAogICAgICAgICAgICAgLy8gUmVzdGFydCB0aGUgY3VycmVudCBuYXZp Z2F0aW9uIGZyb20gdGhlIHRvcCBvZiB0aGUgbmF2aWdhdGlvbiBhbGdvcml0aG0sIHVuZG9pbmcg YW55IGNoYW5nZXMgdGhhdCB3ZXJlIG1hZGUKICAgICAgICAgICAgIC8vIGFzIHBhcnQgb2YgdGhl IGluaXRpYWwgbG9hZC4KQEAgLTE4Myw3ICsxODksNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVH cm91cDo6c2VsZWN0Q2FjaGUoRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHBhc3NlZE1hbmlmZXN0 VQogICAgIGlmICghcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKG1hbmlmZXN0VVJMLCByZXF1 ZXN0LnVybCgpKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgQXBwbGljYXRpb25DYWNoZUdyb3Vw KiBncm91cCA9IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5maW5kT3JDcmVh dGVDYWNoZUdyb3VwKG1hbmlmZXN0VVJMKTsKKyAgICBBcHBsaWNhdGlvbkNhY2hlR3JvdXAqIGdy b3VwID0gZnJhbWUtPnBhZ2UoKS0+YXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5maW5kT3JDcmVh dGVDYWNoZUdyb3VwKG1hbmlmZXN0VVJMKTsKIAogICAgIGRvY3VtZW50TG9hZGVyLT5hcHBsaWNh dGlvbkNhY2hlSG9zdCgpLT5zZXRDYW5kaWRhdGVBcHBsaWNhdGlvbkNhY2hlR3JvdXAoZ3JvdXAp OwogICAgIGdyb3VwLT5tX3BlbmRpbmdNYXN0ZXJSZXNvdXJjZUxvYWRlcnMuYWRkKGRvY3VtZW50 TG9hZGVyKTsKQEAgLTM5Niw3ICs0MDIsNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6 bWFrZU9ic29sZXRlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9pc09ic29sZXRlID0gdHJ1 ZTsKLSAgICBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuY2FjaGVHcm91cE1h ZGVPYnNvbGV0ZSh0aGlzKTsKKyAgICBtX3N0b3JhZ2UtPmNhY2hlR3JvdXBNYWRlT2Jzb2xldGUo dGhpcyk7CiAgICAgQVNTRVJUKCFtX3N0b3JhZ2VJRCk7CiB9CiAKQEAgLTc2MCw3ICs3NjYsNyBA QCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkUmVhY2hNYXhBcHBDYWNoZVNpemUoKQog ewogICAgIEFTU0VSVChtX2ZyYW1lKTsKICAgICBBU1NFUlQobV9jYWNoZUJlaW5nVXBkYXRlZCk7 Ci0gICAgbV9mcmFtZS0+cGFnZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5yZWFjaGVkTWF4QXBwQ2Fj aGVTaXplKEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5zcGFjZU5lZWRlZCht X2NhY2hlQmVpbmdVcGRhdGVkLT5lc3RpbWF0ZWRTaXplSW5TdG9yYWdlKCkpKTsKKyAgICBtX2Zy YW1lLT5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLnJlYWNoZWRNYXhBcHBDYWNoZVNpemUobV9m cmFtZS0+cGFnZSgpLT5hcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLnNwYWNlTmVlZGVkKG1fY2Fj aGVCZWluZ1VwZGF0ZWQtPmVzdGltYXRlZFNpemVJblN0b3JhZ2UoKSkpOwogICAgIG1fY2FsbGVk UmVhY2hlZE1heEFwcENhY2hlU2l6ZSA9IHRydWU7CiAgICAgY2hlY2tJZkxvYWRJc0NvbXBsZXRl KCk7CiB9CkBAIC03ODQsNyArNzkwLDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNh Y2hlVXBkYXRlRmFpbGVkKCkKIAogdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OnJlY2FsY3Vs YXRlQXZhaWxhYmxlU3BhY2VJblF1b3RhKCkKIHsKLSAgICBpZiAoIUFwcGxpY2F0aW9uQ2FjaGVT dG9yYWdlOjpzaW5nbGV0b24oKS5jYWxjdWxhdGVSZW1haW5pbmdTaXplRm9yT3JpZ2luRXhjbHVk aW5nQ2FjaGUobV9vcmlnaW4uZ2V0KCksIG1fbmV3ZXN0Q2FjaGUuZ2V0KCksIG1fYXZhaWxhYmxl U3BhY2VJblF1b3RhKSkgeworICAgIGlmICghbV9mcmFtZS0+cGFnZSgpLT5hcHBsaWNhdGlvbkNh Y2hlU3RvcmFnZSgpLmNhbGN1bGF0ZVJlbWFpbmluZ1NpemVGb3JPcmlnaW5FeGNsdWRpbmdDYWNo ZShtX29yaWdpbi5nZXQoKSwgbV9uZXdlc3RDYWNoZS5nZXQoKSwgbV9hdmFpbGFibGVTcGFjZUlu UXVvdGEpKSB7CiAgICAgICAgIC8vIEZhaWxlZCB0byBkZXRlcm1pbmUgd2hhdCBpcyBsZWZ0IGlu IHRoZSBxdW90YS4gRmFsbGJhY2sgdG8gYWxsb3dpbmcgYW55dGhpbmcuCiAgICAgICAgIG1fYXZh aWxhYmxlU3BhY2VJblF1b3RhID0gQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6Om5vUXVvdGEoKTsK ICAgICB9CkBAIC04NDEsNyArODQ3LDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNo ZWNrSWZMb2FkSXNDb21wbGV0ZSgpCiAKICAgICAgICAgLy8gVGhlIHN0b3JhZ2UgY291bGQgaGF2 ZSBiZWVuIG1hbnVhbGx5IGVtcHRpZWQgYnkgdGhlIHVzZXIuCiAgICAgICAgIGlmICghbV9zdG9y YWdlSUQpCi0gICAgICAgICAgICBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCku c3RvcmVOZXdlc3RDYWNoZSh0aGlzKTsKKyAgICAgICAgICAgIG1fc3RvcmFnZS0+c3RvcmVOZXdl c3RDYWNoZSh0aGlzKTsKIAogICAgICAgICBwb3N0TGlzdGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2Fj aGVIb3N0OjpOT1VQREFURV9FVkVOVCwgbV9hc3NvY2lhdGVkRG9jdW1lbnRMb2FkZXJzKTsKICAg ICAgICAgYnJlYWs7CkBAIC04NjYsNyArODcyLDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3Jv dXA6OmNoZWNrSWZMb2FkSXNDb21wbGV0ZSgpCiAgICAgICAgICAgICAvLyB0aGUgbWF4aW11bSBz aXplLiBJbiBzdWNoIGEgY2FzZSwgbV9tYW5pZmVzdFJlc291cmNlIG1heSBiZSAwLCBhcwogICAg ICAgICAgICAgLy8gdGhlIG1hbmlmZXN0IHdhcyBhbHJlYWR5IHNldCBvbiB0aGUgbmV3ZXN0IGNh Y2hlIG9iamVjdC4KICAgICAgICAgICAgIEFTU0VSVChtX2NhY2hlQmVpbmdVcGRhdGVkLT5tYW5p ZmVzdFJlc291cmNlKCkpOwotICAgICAgICAgICAgQVNTRVJUKEFwcGxpY2F0aW9uQ2FjaGVTdG9y YWdlOjpzaW5nbGV0b24oKS5pc01heGltdW1TaXplUmVhY2hlZCgpKTsKKyAgICAgICAgICAgIEFT U0VSVChtX3N0b3JhZ2UtPmlzTWF4aW11bVNpemVSZWFjaGVkKCkpOwogICAgICAgICAgICAgQVNT RVJUKG1fY2FsbGVkUmVhY2hlZE1heEFwcENhY2hlU2l6ZSk7CiAgICAgICAgIH0KIApAQCAtODc1 LDE2ICs4ODEsMTUgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNoZWNrSWZMb2FkSXND b21wbGV0ZSgpCiAgICAgICAgIC8vIElmIHdlIGV4Y2VlZGVkIHRoZSBvcmlnaW4gcXVvdGEgd2hp bGUgZG93bmxvYWRpbmcgd2UgY2FuIHJlcXVlc3QgYSBxdW90YQogICAgICAgICAvLyBpbmNyZWFz ZSBub3csIGJlZm9yZSB3ZSBhdHRlbXB0IHRvIHN0b3JlIHRoZSBjYWNoZS4KICAgICAgICAgaW50 NjRfdCB0b3RhbFNwYWNlTmVlZGVkOwotICAgICAgICBhdXRvJiBjYWNoZVN0b3JhZ2UgPSBBcHBs aWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCk7Ci0gICAgICAgIGlmICghY2FjaGVTdG9y YWdlLmNoZWNrT3JpZ2luUXVvdGEodGhpcywgb2xkTmV3ZXN0Q2FjaGUuZ2V0KCksIG1fY2FjaGVC ZWluZ1VwZGF0ZWQuZ2V0KCksIHRvdGFsU3BhY2VOZWVkZWQpKQorICAgICAgICBpZiAoIW1fc3Rv cmFnZS0+Y2hlY2tPcmlnaW5RdW90YSh0aGlzLCBvbGROZXdlc3RDYWNoZS5nZXQoKSwgbV9jYWNo ZUJlaW5nVXBkYXRlZC5nZXQoKSwgdG90YWxTcGFjZU5lZWRlZCkpCiAgICAgICAgICAgICBkaWRS ZWFjaE9yaWdpblF1b3RhKHRvdGFsU3BhY2VOZWVkZWQpOwogCiAgICAgICAgIEFwcGxpY2F0aW9u Q2FjaGVTdG9yYWdlOjpGYWlsdXJlUmVhc29uIGZhaWx1cmVSZWFzb247CiAgICAgICAgIHNldE5l d2VzdENhY2hlKG1fY2FjaGVCZWluZ1VwZGF0ZWQucmVsZWFzZSgpKTsKLSAgICAgICAgaWYgKGNh Y2hlU3RvcmFnZS5zdG9yZU5ld2VzdENhY2hlKHRoaXMsIG9sZE5ld2VzdENhY2hlLmdldCgpLCBm YWlsdXJlUmVhc29uKSkgeworICAgICAgICBpZiAobV9zdG9yYWdlLT5zdG9yZU5ld2VzdENhY2hl KHRoaXMsIG9sZE5ld2VzdENhY2hlLmdldCgpLCBmYWlsdXJlUmVhc29uKSkgewogICAgICAgICAg ICAgLy8gTmV3IGNhY2hlIHN0b3JlZCwgbm93IHJlbW92ZSB0aGUgb2xkIGNhY2hlLgogICAgICAg ICAgICAgaWYgKG9sZE5ld2VzdENhY2hlKQotICAgICAgICAgICAgICAgIGNhY2hlU3RvcmFnZS5y ZW1vdmUob2xkTmV3ZXN0Q2FjaGUuZ2V0KCkpOworICAgICAgICAgICAgICAgIG1fc3RvcmFnZS0+ cmVtb3ZlKG9sZE5ld2VzdENhY2hlLmdldCgpKTsKIAogICAgICAgICAgICAgLy8gRmlyZSB0aGUg ZmluYWwgcHJvZ3Jlc3MgZXZlbnQuCiAgICAgICAgICAgICBBU1NFUlQobV9wcm9ncmVzc0RvbmUg PT0gbV9wcm9ncmVzc1RvdGFsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9h cHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9h cHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuaAppbmRleCA1ZWQwZmU3MjY2MzFlYjRhNDMw N2UzZjAwNTg3NTA1NmVkZjBjYzRmLi45ZmY2ODdjYTJhM2NkNTJhOGM0YTVjNDI1OWNjZmIyOGI4 NmEwMDljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGlj YXRpb25DYWNoZUdyb3VwLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0Fw cGxpY2F0aW9uQ2FjaGVHcm91cC5oCkBAIC0zOCw2ICszOCw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogY2xhc3MgQXBwbGljYXRpb25DYWNoZTsKIGNsYXNzIEFwcGxpY2F0aW9uQ2FjaGVSZXNv dXJjZTsKK2NsYXNzIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOwogY2xhc3MgRG9jdW1lbnQ7CiBj bGFzcyBEb2N1bWVudExvYWRlcjsKIGNsYXNzIEZyYW1lOwpAQCAtNTIsNyArNTMsNyBAQCBlbnVt IEFwcGxpY2F0aW9uQ2FjaGVVcGRhdGVPcHRpb24gewogY2xhc3MgQXBwbGljYXRpb25DYWNoZUdy b3VwIDogUmVzb3VyY2VIYW5kbGVDbGllbnQgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEFw cGxpY2F0aW9uQ2FjaGVHcm91cCk7IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgot ICAgIGV4cGxpY2l0IEFwcGxpY2F0aW9uQ2FjaGVHcm91cChjb25zdCBVUkwmIG1hbmlmZXN0VVJM KTsKKyAgICBleHBsaWNpdCBBcHBsaWNhdGlvbkNhY2hlR3JvdXAoUmVmPEFwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlPiYmLCBjb25zdCBVUkwmIG1hbmlmZXN0VVJMKTsKICAgICB2aXJ0dWFsIH5BcHBs aWNhdGlvbkNhY2hlR3JvdXAoKTsKICAgICAKICAgICBlbnVtIFVwZGF0ZVN0YXR1cyB7IElkbGUs IENoZWNraW5nLCBEb3dubG9hZGluZyB9OwpAQCAtMTI5LDcgKzEzMCw5IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBhc3NvY2lhdGVEb2N1bWVudExvYWRlcldpdGhDYWNoZShEb2N1bWVudExvYWRlcios IEFwcGxpY2F0aW9uQ2FjaGUqKTsKICAgICAKICAgICB2b2lkIHN0b3BMb2FkaW5nKCk7Ci0gICAg CisKKyAgICBSZWY8QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U+IG1fc3RvcmFnZTsKKwogICAgIFVS TCBtX21hbmlmZXN0VVJMOwogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gbV9vcmlnaW47CiAg ICAgVXBkYXRlU3RhdHVzIG1fdXBkYXRlU3RhdHVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5jcHAKaW5kZXgg YzRjZjdhNjE2YTBmNWYxMjRhZDJiMzlkYTZiYThlY2UyZmJjMTEwMC4uNzExMjEzZTM0ODNiNmE0 NTdkYTUyY2U0YmQ0MzU4NmIxMzQ1OGVhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwCkBAIC0xMjgs NyArMTI4LDcgQEAgQXBwbGljYXRpb25DYWNoZUdyb3VwKiBBcHBsaWNhdGlvbkNhY2hlU3RvcmFn ZTo6bG9hZENhY2hlR3JvdXAoY29uc3QgVVJMJiBtYW5pZmUKICAgICBpZiAoIWNhY2hlKQogICAg ICAgICByZXR1cm4gMDsKICAgICAgICAgCi0gICAgQXBwbGljYXRpb25DYWNoZUdyb3VwKiBncm91 cCA9IG5ldyBBcHBsaWNhdGlvbkNhY2hlR3JvdXAobWFuaWZlc3RVUkwpOworICAgIEFwcGxpY2F0 aW9uQ2FjaGVHcm91cCogZ3JvdXAgPSBuZXcgQXBwbGljYXRpb25DYWNoZUdyb3VwKCp0aGlzLCBt YW5pZmVzdFVSTCk7CiAgICAgICAKICAgICBncm91cC0+c2V0U3RvcmFnZUlEKHN0YXRpY19jYXN0 PHVuc2lnbmVkPihzdGF0ZW1lbnQuZ2V0Q29sdW1uSW50NjQoMCkpKTsKICAgICBncm91cC0+c2V0 TmV3ZXN0Q2FjaGUoY2FjaGUucmVsZWFzZSgpKTsKQEAgLTE1Miw3ICsxNTIsNyBAQCBBcHBsaWNh dGlvbkNhY2hlR3JvdXAqIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpmaW5kT3JDcmVhdGVDYWNo ZUdyb3VwKGNvbnN0IFVSTAogICAgIAogICAgIC8vIElmIHRoZSBncm91cCB3YXMgbm90IGZvdW5k IHdlIG5lZWQgdG8gY3JlYXRlIGl0CiAgICAgaWYgKCFncm91cCkgewotICAgICAgICBncm91cCA9 IG5ldyBBcHBsaWNhdGlvbkNhY2hlR3JvdXAobWFuaWZlc3RVUkwpOworICAgICAgICBncm91cCA9 IG5ldyBBcHBsaWNhdGlvbkNhY2hlR3JvdXAoKnRoaXMsIG1hbmlmZXN0VVJMKTsKICAgICAgICAg bV9jYWNoZUhvc3RTZXQuYWRkKHVybEhvc3RIYXNoKG1hbmlmZXN0VVJMKSk7CiAgICAgfQogICAg IApAQCAtMjUyLDcgKzI1Miw3IEBAIEFwcGxpY2F0aW9uQ2FjaGVHcm91cCogQXBwbGljYXRpb25D YWNoZVN0b3JhZ2U6OmNhY2hlR3JvdXBGb3JVUkwoY29uc3QgVVJMJiB1cmwpCiAgICAgICAgIGlm IChyZXNvdXJjZS0+dHlwZSgpICYgQXBwbGljYXRpb25DYWNoZVJlc291cmNlOjpGb3JlaWduKQog ICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgQXBwbGljYXRpb25DYWNoZUdyb3VwKiBn cm91cCA9IG5ldyBBcHBsaWNhdGlvbkNhY2hlR3JvdXAobWFuaWZlc3RVUkwpOworICAgICAgICBB cHBsaWNhdGlvbkNhY2hlR3JvdXAqIGdyb3VwID0gbmV3IEFwcGxpY2F0aW9uQ2FjaGVHcm91cCgq dGhpcywgbWFuaWZlc3RVUkwpOwogICAgICAgICAKICAgICAgICAgZ3JvdXAtPnNldFN0b3JhZ2VJ RChzdGF0aWNfY2FzdDx1bnNpZ25lZD4oc3RhdGVtZW50LmdldENvbHVtbkludDY0KDApKSk7CiAg ICAgICAgIGdyb3VwLT5zZXROZXdlc3RDYWNoZShjYWNoZS5yZWxlYXNlKCkpOwpAQCAtMzIyLDcg KzMyMiw3IEBAIEFwcGxpY2F0aW9uQ2FjaGVHcm91cCogQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6 OmZhbGxiYWNrQ2FjaGVHcm91cEZvclVSTChjb25zdCBVCiAgICAgICAgIGlmIChjYWNoZS0+cmVz b3VyY2VGb3JVUkwoZmFsbGJhY2tVUkwpLT50eXBlKCkgJiBBcHBsaWNhdGlvbkNhY2hlUmVzb3Vy Y2U6OkZvcmVpZ24pCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBBcHBsaWNhdGlv bkNhY2hlR3JvdXAqIGdyb3VwID0gbmV3IEFwcGxpY2F0aW9uQ2FjaGVHcm91cChtYW5pZmVzdFVS TCk7CisgICAgICAgIEFwcGxpY2F0aW9uQ2FjaGVHcm91cCogZ3JvdXAgPSBuZXcgQXBwbGljYXRp b25DYWNoZUdyb3VwKCp0aGlzLCBtYW5pZmVzdFVSTCk7CiAgICAgICAgIAogICAgICAgICBncm91 cC0+c2V0U3RvcmFnZUlEKHN0YXRpY19jYXN0PHVuc2lnbmVkPihzdGF0ZW1lbnQuZ2V0Q29sdW1u SW50NjQoMCkpKTsKICAgICAgICAgZ3JvdXAtPnNldE5ld2VzdENhY2hlKGNhY2hlLnJlbGVhc2Uo KSk7Cg==