139759 2014-12-17 17:41:56 -0800 [iOS] Log why cached resources are being revalidated using FeatureCounter API 2014-12-18 09:21:15 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez barraclough commit-queue japhet kling koivisto oldest_to_newest 1056648 0 cdumez 2014-12-17 17:41:56 -0800 We should log why cached resources are being revalidated using FeatureCounter API. Radar: <rdar://problem/19288177> 1056713 1 243479 cdumez 2014-12-17 19:54:41 -0800 Created attachment 243479 Patch 1056786 2 243479 commit-queue 2014-12-18 09:21:09 -0800 Comment on attachment 243479 Patch Clearing flags on attachment: 243479 Committed r177499: <http://trac.webkit.org/changeset/177499> 1056787 3 commit-queue 2014-12-18 09:21:15 -0800 All reviewed patches have been landed. Closing bug. 243479 2014-12-17 19:54:41 -0800 2014-12-18 09:21:09 -0800 Patch bug-139759-20141217195442.patch text/plain 11682 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE5Nzk1ZGQ3ZjJmYzhh Y2Y1MWY3OGEwNjNiMThhZmMxOWU2MzY3Zi4uNWU1NjUxOWIwMGY5ZjE2OTcyY2JkYTJlODU1NjFl M2Q4NDZmYThiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9nIHdoeSBjYWNo ZWQgcmVzb3VyY2VzIGFyZSBiZWluZyByZXZhbGlkYXRlZCB1c2luZyBGZWF0dXJlQ291bnRlciBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTc1 OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTkyODgxNzc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTG9nIHdoeSBjYWNoZWQgcmVzb3VyY2VzIGFy ZSBiZWluZyByZXZhbGlkYXRlZCB1c2luZyBGZWF0dXJlQ291bnRlciBBUEkuCisgICAgICAgIEFs c28gbG9nIGlmIHJldmFsaWRhdGlvbiBpcyBzdWNjZXNzZnVsIG9yIG5vdC4KKworICAgICAgICBO byBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGxvYWRlci9TdWJy ZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6 d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpk aWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFnZTo6bXVzdFJldmFsaWRhdGVEdWVUb0Nh Y2hlSGVhZGVycyk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmg6CisgICAg ICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNhY2hlZFJlc291cmNlOjpmYWlsQmVmb3JlU3RhcnRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6 Q2FjaGVkUmVzb3VyY2U6Om11c3RSZXZhbGlkYXRlRHVlVG9DYWNoZUhlYWRlcnMpOgorICAgICAg ICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkUmVzb3VyY2U6OmxvYWRlcik6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpk ZXRlcm1pbmVSZXZhbGlkYXRpb25Qb2xpY3kpOgorICAgICAgICAqIHBsYXRmb3JtL0ZlYXR1cmVD b3VudGVyS2V5cy5oOgorCiAyMDE0LTEyLTE3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5j b20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5MjgyNTA4PiBXZWJLaXRMZWdhY3kgaXMg dW51c2FibGUgZHVlIHRvIGJhZCBkeWxpYiBpZGVudGlmaWVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAppbmRleCA5OTM0MjQ3YjQzNTA1ZTFiZTg4NTVkOGI4 MGU1ODZjNTlkM2EyZWNmLi40YzZkYjdmMWM4N2VlNDExOTMyYTg2ZGI0ODNmZWRiNDdlNDhlYmRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKQEAgLTMy LDYgKzMyLDcgQEAKICNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZUxvYWRlci5oIgogI2luY2x1ZGUg IkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIuaCIKKyNpbmNsdWRlICJGZWF0 dXJlQ291bnRlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIu aCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCkBAIC0xNTYsNiArMTU3LDcgQEAgdm9pZCBTdWJyZXNv dXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCwg Y29uc3QgUmVzb3UKICAgICAgICAgaWYgKG5ld1JlcXVlc3QuaXNDb25kaXRpb25hbCgpICYmIG1f cmVzb3VyY2UtPnJlc291cmNlVG9SZXZhbGlkYXRlKCkgJiYgbmV3UmVxdWVzdC51cmwoKSAhPSBt X3Jlc291cmNlLT5yZXNvdXJjZVRvUmV2YWxpZGF0ZSgpLT5yZXNwb25zZSgpLnVybCgpKSB7CiAg ICAgICAgICAgICBuZXdSZXF1ZXN0Lm1ha2VVbmNvbmRpdGlvbmFsKCk7CiAgICAgICAgICAgICBt ZW1vcnlDYWNoZSgpLnJldmFsaWRhdGlvbkZhaWxlZChtX3Jlc291cmNlKTsKKyAgICAgICAgICAg IEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKG1fZnJhbWUgPyBtX2ZyYW1lLT5wYWdlKCkg OiBudWxscHRyLCBGZWF0dXJlQ291bnRlckNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uRmFpbHVy ZUtleSk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmICghbV9kb2N1bWVudExvYWRl ci0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5jYW5SZXF1ZXN0KG1fcmVzb3VyY2UtPnR5cGUoKSwg bmV3UmVxdWVzdC51cmwoKSwgb3B0aW9ucygpKSkgewpAQCAtMjAyLDEyICsyMDQsMTQgQEAgdm9p ZCBTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKQogICAgICAgICAgICAgLy8gRXhpc3RpbmcgcmVzb3VyY2UgaXMgb2ss IGp1c3QgdXNlIGl0IHVwZGF0aW5nIHRoZSBleHBpcmF0aW9uIHRpbWUuCiAgICAgICAgICAgICBt X3Jlc291cmNlLT5zZXRSZXNwb25zZShyZXNwb25zZSk7CiAgICAgICAgICAgICBtZW1vcnlDYWNo ZSgpLnJldmFsaWRhdGlvblN1Y2NlZWRlZChtX3Jlc291cmNlLCByZXNwb25zZSk7CisgICAgICAg ICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShtX2ZyYW1lID8gbV9mcmFtZS0+cGFn ZSgpIDogbnVsbHB0ciwgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvblN1 Y2Nlc3NLZXkpOwogICAgICAgICAgICAgaWYgKCFyZWFjaGVkVGVybWluYWxTdGF0ZSgpKQogICAg ICAgICAgICAgICAgIFJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UocmVzcG9uc2Up OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIC8vIERpZCBub3QgZ2V0 IDMwNCByZXNwb25zZSwgY29udGludWUgYXMgYSByZWd1bGFyIHJlc291cmNlIGxvYWQuCiAgICAg ICAgIG1lbW9yeUNhY2hlKCkucmV2YWxpZGF0aW9uRmFpbGVkKG1fcmVzb3VyY2UpOworICAgICAg ICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShtX2ZyYW1lID8gbV9mcmFtZS0+cGFnZSgp IDogbnVsbHB0ciwgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvbkZhaWx1 cmVLZXkpOwogICAgIH0KIAogICAgIG1fcmVzb3VyY2UtPnJlc3BvbnNlUmVjZWl2ZWQocmVzcG9u c2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKaW5kZXgg MjBhOTg5NGE4NTI5ZWFmMGYxNzAyZDVmNzg5N2NlZDRiYzU5YmRlYS4uMTg0MGI3YjY5Y2U0NjM0 ZWEwNWI1N2Q4MzNkZjA5MDkyMDVhOTlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkSW1hZ2UuY3BwCkBAIC01MDgsNyArNTA4LDcgQEAgYm9vbCBDYWNoZWRJbWFnZTo6 aXNPcmlnaW5DbGVhbihTZWN1cml0eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4pCiAgICAgcmV0dXJu ICFzZWN1cml0eU9yaWdpbi0+dGFpbnRzQ2FudmFzKHJlc3BvbnNlKCkudXJsKCkpOwogfQogCi1i b29sIENhY2hlZEltYWdlOjptdXN0UmV2YWxpZGF0ZUR1ZVRvQ2FjaGVIZWFkZXJzKENhY2hlUG9s aWN5IHBvbGljeSkgY29uc3QKK2Jvb2wgQ2FjaGVkSW1hZ2U6Om11c3RSZXZhbGlkYXRlRHVlVG9D YWNoZUhlYWRlcnMoY29uc3QgQ2FjaGVkUmVzb3VyY2VMb2FkZXImIGNhY2hlZFJlc291cmNlTG9h ZGVyLCBDYWNoZVBvbGljeSBwb2xpY3kpIGNvbnN0CiB7CiAgICAgaWYgKFVOTElLRUxZKGlzTWFu dWFsbHlDYWNoZWQoKSkpIHsKICAgICAgICAgLy8gRG8gbm90IHJldmFsaWRhdGUgbWFudWFsbHkg Y2FjaGVkIGltYWdlcy4gVGhpcyBtZWNoYW5pc20gaXMgdXNlZCBhcyBhCkBAIC01MTgsNyArNTE4 LDcgQEAgYm9vbCBDYWNoZWRJbWFnZTo6bXVzdFJldmFsaWRhdGVEdWVUb0NhY2hlSGVhZGVycyhD YWNoZVBvbGljeSBwb2xpY3kpIGNvbnN0CiAgICAgICAgIC8vIGluY3VtYmVudCBvbiB0aGUgY2xp ZW50IHRvIG9ubHkgdXNlIHZhbGlkIHJlc291cmNlcy4KICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KLSAgICByZXR1cm4gQ2FjaGVkUmVzb3VyY2U6Om11c3RSZXZhbGlkYXRlRHVlVG9DYWNo ZUhlYWRlcnMocG9saWN5KTsKKyAgICByZXR1cm4gQ2FjaGVkUmVzb3VyY2U6Om11c3RSZXZhbGlk YXRlRHVlVG9DYWNoZUhlYWRlcnMoY2FjaGVkUmVzb3VyY2VMb2FkZXIsIHBvbGljeSk7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZEltYWdlLmgKaW5kZXggOTNlZjVmMDhjZDE1OGFjODE5OTZjMWZjMmM2YmZiODU1N2E3OTAyNC4u YTcwMzQyNzdmMGIzMDlmNjgxMWQ4MDc0NDY1YzI0ODg2ZDE2MzIwMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmgKQEAgLTg0LDcgKzg0LDcgQEAgcHVibGljOgog ICAgIHZvaWQgY29tcHV0ZUludHJpbnNpY0RpbWVuc2lvbnMoTGVuZ3RoJiBpbnRyaW5zaWNXaWR0 aCwgTGVuZ3RoJiBpbnRyaW5zaWNIZWlnaHQsIEZsb2F0U2l6ZSYgaW50cmluc2ljUmF0aW8pOwog CiAgICAgYm9vbCBpc01hbnVhbGx5Q2FjaGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc01hbnVhbGx5 Q2FjaGVkOyB9Ci0gICAgdmlydHVhbCBib29sIG11c3RSZXZhbGlkYXRlRHVlVG9DYWNoZUhlYWRl cnMoQ2FjaGVQb2xpY3kpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBtdXN0UmV2 YWxpZGF0ZUR1ZVRvQ2FjaGVIZWFkZXJzKGNvbnN0IENhY2hlZFJlc291cmNlTG9hZGVyJiwgQ2Fj aGVQb2xpY3kpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBsb2FkKENhY2hlZFJl c291cmNlTG9hZGVyKiwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJikgb3ZlcnJpZGU7CiAK ICAgICBib29sIGlzT3JpZ2luQ2xlYW4oU2VjdXJpdHlPcmlnaW4qKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCmluZGV4IDAyZDNmZTg2YmNhNmVh YmI4YTkxMjg0ZDdhZDA4ZTRmNWUyYjU1OGEuLjhlNzM3YTg2MmY2ZmJmNjRjYzFlOWJiN2JjMmJl MzE1ZWZjNmMyMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRSZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlLmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkNyb3NzT3JpZ2luQWNjZXNz Q29udHJvbC5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2Fk ZXIuaCIKKyNpbmNsdWRlICJGZWF0dXJlQ291bnRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVy LmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJIVFRQSGVhZGVy TmFtZXMuaCIKQEAgLTY3NiwyMSArNjc3LDI5IEBAIGJvb2wgQ2FjaGVkUmVzb3VyY2U6OmNhblVz ZUNhY2hlVmFsaWRhdG9yKCkgY29uc3QKICAgICByZXR1cm4gbV9yZXNwb25zZS5oYXNDYWNoZVZh bGlkYXRvckZpZWxkcygpOwogfQogCi1ib29sIENhY2hlZFJlc291cmNlOjptdXN0UmV2YWxpZGF0 ZUR1ZVRvQ2FjaGVIZWFkZXJzKENhY2hlUG9saWN5IGNhY2hlUG9saWN5KSBjb25zdAorYm9vbCBD YWNoZWRSZXNvdXJjZTo6bXVzdFJldmFsaWRhdGVEdWVUb0NhY2hlSGVhZGVycyhjb25zdCBDYWNo ZWRSZXNvdXJjZUxvYWRlciYgY2FjaGVkUmVzb3VyY2VMb2FkZXIsIENhY2hlUG9saWN5IGNhY2hl UG9saWN5KSBjb25zdAogeyAgICAKICAgICBBU1NFUlQoY2FjaGVQb2xpY3kgPT0gQ2FjaGVQb2xp Y3lSZXZhbGlkYXRlIHx8IGNhY2hlUG9saWN5ID09IENhY2hlUG9saWN5Q2FjaGUgfHwgY2FjaGVQ b2xpY3kgPT0gQ2FjaGVQb2xpY3lWZXJpZnkpOwogCi0gICAgaWYgKGNhY2hlUG9saWN5ID09IENh Y2hlUG9saWN5UmV2YWxpZGF0ZSkKKyAgICBpZiAoY2FjaGVQb2xpY3kgPT0gQ2FjaGVQb2xpY3lS ZXZhbGlkYXRlKSB7CisgICAgICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGNhY2hl ZFJlc291cmNlTG9hZGVyLmZyYW1lKCktPnBhZ2UoKSwgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNv dXJjZVJldmFsaWRhdGlvblJlYXNvblJlbG9hZEtleSk7CiAgICAgICAgIHJldHVybiB0cnVlOwor ICAgIH0KIAogICAgIGlmIChtX3Jlc3BvbnNlLmNhY2hlQ29udHJvbENvbnRhaW5zTm9DYWNoZSgp IHx8IG1fcmVzcG9uc2UuY2FjaGVDb250cm9sQ29udGFpbnNOb1N0b3JlKCkpIHsKICAgICAgICAg TE9HKFJlc291cmNlTG9hZGluZywgIkNhY2hlZFJlc291cmNlICVwIG11c3RSZXZhbGlkYXRlIGJl Y2F1c2Ugb2YgbV9yZXNwb25zZS5jYWNoZUNvbnRyb2xDb250YWluc05vQ2FjaGUoKSB8fCBtX3Jl c3BvbnNlLmNhY2hlQ29udHJvbENvbnRhaW5zTm9TdG9yZSgpXG4iLCB0aGlzKTsKKyAgICAgICAg aWYgKG1fcmVzcG9uc2UuY2FjaGVDb250cm9sQ29udGFpbnNOb1N0b3JlKCkpCisgICAgICAgICAg ICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShjYWNoZWRSZXNvdXJjZUxvYWRlci5mcmFt ZSgpLT5wYWdlKCksIEZlYXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFz b25Ob1N0b3JlS2V5KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgRkVBVFVSRV9DT1VOVEVS X0lOQ1JFTUVOVF9LRVkoY2FjaGVkUmVzb3VyY2VMb2FkZXIuZnJhbWUoKS0+cGFnZSgpLCBGZWF0 dXJlQ291bnRlckNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uUmVhc29uTm9DYWNoZUtleSk7CisK ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCiAgICAgaWYgKGNhY2hlUG9saWN5ID09IENh Y2hlUG9saWN5Q2FjaGUpIHsKICAgICAgICAgaWYgKG1fcmVzcG9uc2UuY2FjaGVDb250cm9sQ29u dGFpbnNNdXN0UmV2YWxpZGF0ZSgpICYmIGlzRXhwaXJlZCgpKSB7CiAgICAgICAgICAgICBMT0co UmVzb3VyY2VMb2FkaW5nLCAiQ2FjaGVkUmVzb3VyY2UgJXAgbXVzdFJldmFsaWRhdGUgYmVjYXVz ZSBvZiBjYWNoZVBvbGljeSA9PSBDYWNoZVBvbGljeUNhY2hlIGFuZCBtX3Jlc3BvbnNlLmNhY2hl Q29udHJvbENvbnRhaW5zTXVzdFJldmFsaWRhdGUoKSAmJiBpc0V4cGlyZWQoKVxuIiwgdGhpcyk7 CisgICAgICAgICAgICBGRUFUVVJFX0NPVU5URVJfSU5DUkVNRU5UX0tFWShjYWNoZWRSZXNvdXJj ZUxvYWRlci5mcmFtZSgpLT5wYWdlKCksIEZlYXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZh bGlkYXRpb25SZWFzb25NdXN0UmV2YWxpZGF0ZUlzRXhwaXJlZEtleSk7CiAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC02OTksNiAr NzA4LDcgQEAgYm9vbCBDYWNoZWRSZXNvdXJjZTo6bXVzdFJldmFsaWRhdGVEdWVUb0NhY2hlSGVh ZGVycyhDYWNoZVBvbGljeSBjYWNoZVBvbGljeSkgY28KICAgICAvLyBDYWNoZVBvbGljeVZlcmlm eQogICAgIGlmIChpc0V4cGlyZWQoKSkgewogICAgICAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAi Q2FjaGVkUmVzb3VyY2UgJXAgbXVzdFJldmFsaWRhdGUgYmVjYXVzZSBvZiBpc0V4cGlyZWQoKVxu IiwgdGhpcyk7CisgICAgICAgIEZFQVRVUkVfQ09VTlRFUl9JTkNSRU1FTlRfS0VZKGNhY2hlZFJl c291cmNlTG9hZGVyLmZyYW1lKCktPnBhZ2UoKSwgRmVhdHVyZUNvdW50ZXJDYWNoZWRSZXNvdXJj ZVJldmFsaWRhdGlvblJlYXNvbklzRXhwaXJlZEtleSk7CiAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaApp bmRleCBkODZhMWQ0YzNiYjRmYmUyY2ZjODExYjg0ODQ3YjU5ZjA0NDRhMDE4Li4zNzljODllYzY5 Mzc0OTJmYTMwMWNhMjliZGEzMmRjN2E4ZjdhNjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaApAQCAtMjI5LDcgKzIyOSw3IEBAIHB1YmxpYzoKICAg ICAKICAgICBib29sIGNhblVzZUNhY2hlVmFsaWRhdG9yKCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFs IGJvb2wgbXVzdFJldmFsaWRhdGVEdWVUb0NhY2hlSGVhZGVycyhDYWNoZVBvbGljeSkgY29uc3Q7 CisgICAgdmlydHVhbCBib29sIG11c3RSZXZhbGlkYXRlRHVlVG9DYWNoZUhlYWRlcnMoY29uc3Qg Q2FjaGVkUmVzb3VyY2VMb2FkZXImLCBDYWNoZVBvbGljeSkgY29uc3Q7CiAgICAgYm9vbCByZWRp cmVjdENoYWluQWxsb3dzUmV1c2UoKSBjb25zdDsKIAogICAgIGJvb2wgaXNDYWNoZVZhbGlkYXRv cigpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VUb1JldmFsaWRhdGU7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4 IDM3ZmE5OWM3N2M4ZGJlZjYwOTcxNTlhNTQ0ZDQ1ZmY1MjI5NjczNzAuLjQ1ZTU4ZDk0ZjkxNTcy ODM4ODI1NmQ4YWMzOGNjZTNkMGZjODNjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtNjU3LDcgKzY1Nyw3IEBA IENhY2hlZFJlc291cmNlTG9hZGVyOjpSZXZhbGlkYXRpb25Qb2xpY3kgQ2FjaGVkUmVzb3VyY2VM b2FkZXI6OmRldGVybWluZVJldmFsaWRhCiAgICAgICAgIHJldHVybiBVc2U7CiAKICAgICAvLyBD aGVjayBpZiB0aGUgY2FjaGUgaGVhZGVycyByZXF1aXJlcyB1cyB0byByZXZhbGlkYXRlIChjYWNo ZSBleHBpcmF0aW9uIGZvciBleGFtcGxlKS4KLSAgICBpZiAoZXhpc3RpbmdSZXNvdXJjZS0+bXVz dFJldmFsaWRhdGVEdWVUb0NhY2hlSGVhZGVycyhjYWNoZVBvbGljeSh0eXBlKSkpIHsKKyAgICBp ZiAoZXhpc3RpbmdSZXNvdXJjZS0+bXVzdFJldmFsaWRhdGVEdWVUb0NhY2hlSGVhZGVycygqdGhp cywgY2FjaGVQb2xpY3kodHlwZSkpKSB7CiAgICAgICAgIC8vIFNlZSBpZiB0aGUgcmVzb3VyY2Ug aGFzIHVzYWJsZSBFVGFnIG9yIExhc3QtbW9kaWZpZWQgaGVhZGVycy4KICAgICAgICAgaWYgKGV4 aXN0aW5nUmVzb3VyY2UtPmNhblVzZUNhY2hlVmFsaWRhdG9yKCkpCiAgICAgICAgICAgICByZXR1 cm4gUmV2YWxpZGF0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZlYXR1 cmVDb3VudGVyS2V5cy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJL ZXlzLmgKaW5kZXggMmNmZjM4MmQ0Y2Q1MzgyZWMxMWY1NmRiNzZmYjUzODY3YWM2ZDcwMS4uMWI0 YzAwMTNhMjhhZDYxZTQxY2M1ZWIxYzA5ODQ0YTkyZGM2MDhlYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vRmVhdHVyZUNvdW50ZXJLZXlzLmgKQEAgLTYxLDYgKzYxLDE1IEBAIHN0YXRp YyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlRmFpbHVyZVNhbWVMb2FkS2V5W10g PSAiY29tLmFwcGxlLldlYktpCiBzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlclBhZ2VD YWNoZUZhaWx1cmVLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LnBhZ2VDYWNoZS5mYWlsdXJlIjsK IHN0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyUGFnZUNhY2hlU3VjY2Vzc0tleVtdID0g ImNvbS5hcHBsZS5XZWJLaXQucGFnZUNhY2hlLnN1Y2Nlc3MiOwogCisvLyBDYWNoZWQgcmVzb3Vy Y2VzIHJldmFsaWRhdGlvbi4KK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1cmVDb3VudGVyQ2FjaGVk UmVzb3VyY2VSZXZhbGlkYXRpb25TdWNjZXNzS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5jYWNo ZWRSZXNvdXJjZVJldmFsaWRhdGlvbi5zdWNjZXNzIjsKK3N0YXRpYyBjb25zdCBjaGFyIEZlYXR1 cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25GYWlsdXJlS2V5W10gPSAiY29tLmFw cGxlLldlYktpdC5jYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvbi5mYWlsdXJlIjsKK3N0YXRpYyBj b25zdCBjaGFyIEZlYXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25S ZWxvYWRLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9u LnJlYXNvbi5yZWxvYWQiOworc3RhdGljIGNvbnN0IGNoYXIgRmVhdHVyZUNvdW50ZXJDYWNoZWRS ZXNvdXJjZVJldmFsaWRhdGlvblJlYXNvbk5vQ2FjaGVLZXlbXSA9ICJjb20uYXBwbGUuV2ViS2l0 LmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uLnJlYXNvbi5ub0NhY2hlIjsKK3N0YXRpYyBjb25z dCBjaGFyIEZlYXR1cmVDb3VudGVyQ2FjaGVkUmVzb3VyY2VSZXZhbGlkYXRpb25SZWFzb25Ob1N0 b3JlS2V5W10gPSAiY29tLmFwcGxlLldlYktpdC5jYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvbi5y ZWFzb24ubm9TdG9yZSI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlckNhY2hlZFJl c291cmNlUmV2YWxpZGF0aW9uUmVhc29uTXVzdFJldmFsaWRhdGVJc0V4cGlyZWRLZXlbXSA9ICJj b20uYXBwbGUuV2ViS2l0LmNhY2hlZFJlc291cmNlUmV2YWxpZGF0aW9uLnJlYXNvbi5tdXN0UmV2 YWxpZGF0ZUlzRXhwaXJlZCI7CitzdGF0aWMgY29uc3QgY2hhciBGZWF0dXJlQ291bnRlckNhY2hl ZFJlc291cmNlUmV2YWxpZGF0aW9uUmVhc29uSXNFeHBpcmVkS2V5W10gPSAiY29tLmFwcGxlLldl YktpdC5jYWNoZWRSZXNvdXJjZVJldmFsaWRhdGlvbi5yZWFzb24uaXNFeHBpcmVkIjsKKwogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRmVhdHVyZUNvdW50ZXJLZXlzX2gK