60573 2011-05-10 13:28:53 -0700 [WebKit2] exceededDatabaseQuota function on WKPageUIClient needs to provide information about the usage for both the origin overall and the database in question 2011-05-11 08:56:55 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jberlin jberlin jberlin oldest_to_newest 401444 0 jberlin 2011-05-10 13:28:53 -0700 Currently, it only provides usage information for the database in question. To expose as much information as was available in the WK1 version, it needs to provide the usage information for the origin as well. <rdar://problem/8246352> 401652 1 93050 jberlin 2011-05-10 16:54:37 -0700 Created attachment 93050 Patch 402002 2 93050 jberlin 2011-05-11 08:56:47 -0700 Comment on attachment 93050 Patch Thanks for the review, Darin! Committed in http://trac.webkit.org/changeset/86231 93050 2011-05-10 16:54:37 -0700 2011-05-11 08:56:47 -0700 Patch addExceededDatabaseQuotaExtraParam.patch text/plain 13659 jberlin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MTc4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDUtMTAgIEplc3NpZSBC ZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbV2ViS2l0Ml0gZXhjZWVkZWREYXRhYmFzZVF1b3RhIGZ1bmN0 aW9uIG9uIFdLUGFnZVVJQ2xpZW50IG5lZWRzIHRvIHByb3ZpZGUgaW5mb3JtYXRpb24KKyAgICAg ICAgYWJvdXQgdGhlIHVzYWdlIGZvciBib3RoIHRoZSBvcmlnaW4gb3ZlcmFsbCBhbmQgdGhlIGRh dGFiYXNlIGluIHF1ZXN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjA1NzMKKworICAgICAgICBBZGQgdGhlIGN1cnJlbnRPcmlnaW5Vc2FnZSBw YXJhbWV0ZXIuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaDoK KyAgICAgICAgKENvcmVJUEM6OmNhbGxNZW1iZXJGdW5jdGlvbik6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL1dlYlVJQ2xp ZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6OmV4Y2VlZGVkRGF0YWJhc2VR dW90YSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlVJQ2xpZW50Lmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJDaHJvbWVDbGllbnQ6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSk6CisKIDIwMTEtMDUt MTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIFJvYmVuLgpJbmRleDogU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQ Qy9IYW5kbGVNZXNzYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGxhdGZvcm0v Q29yZUlQQy9IYW5kbGVNZXNzYWdlLmgJKHJldmlzaW9uIDg2MDMyKQorKysgU291cmNlL1dlYktp dDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1 Myw2ICsxNTMsMTIgQEAgdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1lbnRzNwog ICAgIChvYmplY3QtPipmdW5jdGlvbikoYXJncy5hcmd1bWVudDEsIGFyZ3MuYXJndW1lbnQyLCBh cmdzLmFyZ3VtZW50MywgYXJncy5hcmd1bWVudDQsIGFyZ3MuYXJndW1lbnQ1LCBhcmdzLmFyZ3Vt ZW50NiwgYXJncy5hcmd1bWVudDcsIHJlcGx5QXJncy5hcmd1bWVudDEpOwogfQogCit0ZW1wbGF0 ZTx0eXBlbmFtZSBDLCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAyLCB0eXBl bmFtZSBQMywgdHlwZW5hbWUgUDQsIHR5cGVuYW1lIFA1LCB0eXBlbmFtZSBQNiwgdHlwZW5hbWUg UDcsIHR5cGVuYW1lIFA4LCB0eXBlbmFtZSBSMT4KK3ZvaWQgY2FsbE1lbWJlckZ1bmN0aW9uKGNv bnN0IEFyZ3VtZW50czg8UDEsIFAyLCBQMywgUDQsIFA1LCBQNiwgUDcsIFA4PiYgYXJncywgQXJn dW1lbnRzMTxSMT4mIHJlcGx5QXJncywgQyogb2JqZWN0LCBNRiBmdW5jdGlvbikKK3sKKyAgICAo b2JqZWN0LT4qZnVuY3Rpb24pKGFyZ3MuYXJndW1lbnQxLCBhcmdzLmFyZ3VtZW50MiwgYXJncy5h cmd1bWVudDMsIGFyZ3MuYXJndW1lbnQ0LCBhcmdzLmFyZ3VtZW50NSwgYXJncy5hcmd1bWVudDYs IGFyZ3MuYXJndW1lbnQ3LCBhcmdzLmFyZ3VtZW50OCwgcmVwbHlBcmdzLmFyZ3VtZW50MSk7Cit9 CisKIHRlbXBsYXRlPHR5cGVuYW1lIEMsIHR5cGVuYW1lIE1GLCB0eXBlbmFtZSBQMSwgdHlwZW5h bWUgUDIsIHR5cGVuYW1lIFAzLCB0eXBlbmFtZSBQNCwgdHlwZW5hbWUgUjEsIHR5cGVuYW1lIFIy Pgogdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1lbnRzNDxQMSwgUDIsIFAzLCBQ ND4mIGFyZ3MsIEFyZ3VtZW50czI8UjEsIFIyPiYgcmVwbHlBcmdzLCBDKiBvYmplY3QsIE1GIGZ1 bmN0aW9uKQogewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAJKHJldmlzaW9uIDg2MDMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5MzMsMTQgKzI5MzMsMTQgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZFJlY2VpdmVBdXRoZW50aWNhdAogICAgIG1fbG9hZGVyQ2xpZW50LmRpZFJl Y2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUodGhpcywgZnJhbWUsIGF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlLmdldCgpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmV4Y2VlZGVk RGF0YWJhc2VRdW90YSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlO YW1lLCB1aW50NjRfdCBjdXJyZW50UXVvdGEsIHVpbnQ2NF90IGN1cnJlbnRVc2FnZSwgdWludDY0 X3QgZXhwZWN0ZWRVc2FnZSwgdWludDY0X3QmIG5ld1F1b3RhKQordm9pZCBXZWJQYWdlUHJveHk6 OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG9y aWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcm IGRpc3BsYXlOYW1lLCB1aW50NjRfdCBjdXJyZW50UXVvdGEsIHVpbnQ2NF90IGN1cnJlbnRPcmln aW5Vc2FnZSwgdWludDY0X3QgY3VycmVudERhdGFiYXNlVXNhZ2UsIHVpbnQ2NF90IGV4cGVjdGVk VXNhZ2UsIHVpbnQ2NF90JiBuZXdRdW90YSkKIHsKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9 IHByb2Nlc3MoKS0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7 CiAKICAgICBSZWZQdHI8V2ViU2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9IFdlYlNlY3VyaXR5T3Jp Z2luOjpjcmVhdGUob3JpZ2luSWRlbnRpZmllcik7CiAKLSAgICBuZXdRdW90YSA9IG1fdWlDbGll bnQuZXhjZWVkZWREYXRhYmFzZVF1b3RhKHRoaXMsIGZyYW1lLCBvcmlnaW4uZ2V0KCksIGRhdGFi YXNlTmFtZSwgZGlzcGxheU5hbWUsIGN1cnJlbnRRdW90YSwgY3VycmVudFVzYWdlLCBleHBlY3Rl ZFVzYWdlKTsKKyAgICBuZXdRdW90YSA9IG1fdWlDbGllbnQuZXhjZWVkZWREYXRhYmFzZVF1b3Rh KHRoaXMsIGZyYW1lLCBvcmlnaW4uZ2V0KCksIGRhdGFiYXNlTmFtZSwgZGlzcGxheU5hbWUsIGN1 cnJlbnRRdW90YSwgY3VycmVudE9yaWdpblVzYWdlLCBjdXJyZW50RGF0YWJhc2VVc2FnZSwgZXhw ZWN0ZWRVc2FnZSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0R2VvbG9jYXRpb25Q ZXJtaXNzaW9uRm9yRnJhbWUodWludDY0X3QgZ2VvbG9jYXRpb25JRCwgdWludDY0X3QgZnJhbWVJ RCwgU3RyaW5nIG9yaWdpbklkZW50aWZpZXIpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4NjAzMikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNTk5LDcgKzU5OSw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBwYWdlRGlkU2Nyb2xsKCk7CiAgICAgdm9pZCBydW5PcGVuUGFuZWwo dWludDY0X3QgZnJhbWVJRCwgY29uc3QgV2ViT3BlblBhbmVsUGFyYW1ldGVyczo6RGF0YSYpOwog ICAgIHZvaWQgcHJpbnRGcmFtZSh1aW50NjRfdCBmcmFtZUlEKTsKLSAgICB2b2lkIGV4Y2VlZGVk RGF0YWJhc2VRdW90YSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlO YW1lLCB1aW50NjRfdCBjdXJyZW50UXVvdGEsIHVpbnQ2NF90IGN1cnJlbnRVc2FnZSwgdWludDY0 X3QgZXhwZWN0ZWRVc2FnZSwgdWludDY0X3QmIG5ld1F1b3RhKTsKKyAgICB2b2lkIGV4Y2VlZGVk RGF0YWJhc2VRdW90YSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50 aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlO YW1lLCB1aW50NjRfdCBjdXJyZW50UXVvdGEsIHVpbnQ2NF90IGN1cnJlbnRPcmlnaW5Vc2FnZSwg dWludDY0X3QgY3VycmVudERhdGFiYXNlVXNhZ2UsIHVpbnQ2NF90IGV4cGVjdGVkVXNhZ2UsIHVp bnQ2NF90JiBuZXdRdW90YSk7CiAgICAgdm9pZCByZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9u Rm9yRnJhbWUodWludDY0X3QgZ2VvbG9jYXRpb25JRCwgdWludDY0X3QgZnJhbWVJRCwgU3RyaW5n IG9yaWdpbklkZW50aWZpZXIpOwogICAgIHZvaWQgcnVuTW9kYWwoKSB7IG1fdWlDbGllbnQucnVu TW9kYWwodGhpcyk7IH0KICAgICB2b2lkIGRpZENvbXBsZXRlUnViYmVyQmFuZEZvck1haW5GcmFt ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDg2MDMyKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkod29ya2lu ZyBjb3B5KQpAQCAtMTc3LDcgKzE3Nyw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAg ICAgRGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKHVpbnQ2NF90IGZyYW1lSUQsIFdl YkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIGNoYWxsZW5nZSwgdWludDY0X3QgY2hhbGxl bmdlSUQpCiAKICAgICAjIERhdGFiYXNlIG1lc3NhZ2VzCi0gICAgRXhjZWVkZWREYXRhYmFzZVF1 b3RhKHVpbnQ2NF90IGZyYW1lSUQsIFdURjo6U3RyaW5nIG9yaWdpbklkZW50aWZpZXIsIFdURjo6 U3RyaW5nIGRhdGFiYXNlTmFtZSwgV1RGOjpTdHJpbmcgZGF0YWJhc2VEaXNwbGF5TmFtZSwgdWlu dDY0X3QgY3VycmVudFF1b3RhLCB1aW50NjRfdCBjdXJyZW50VXNhZ2UsIHVpbnQ2NF90IGV4cGVj dGVkVXNhZ2UpIC0+ICh1aW50NjRfdCBuZXdRdW90YSkKKyAgICBFeGNlZWRlZERhdGFiYXNlUXVv dGEodWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcgb3JpZ2luSWRlbnRpZmllciwgV1RGOjpT dHJpbmcgZGF0YWJhc2VOYW1lLCBXVEY6OlN0cmluZyBkYXRhYmFzZURpc3BsYXlOYW1lLCB1aW50 NjRfdCBjdXJyZW50UXVvdGEsIHVpbnQ2NF90IGN1cnJlbnRPcmlnaW5Vc2FnZSwgdWludDY0X3Qg Y3VycmVudERhdGFiYXNlVXNhZ2UsIHVpbnQ2NF90IGV4cGVjdGVkVXNhZ2UpIC0+ICh1aW50NjRf dCBuZXdRdW90YSkKIAogICAgICMgR2VvbG9jYXRpb24gbWVzc2FnZXMKICAgICBSZXF1ZXN0R2Vv bG9jYXRpb25QZXJtaXNzaW9uRm9yRnJhbWUodWludDY0X3QgZ2VvbG9jYXRpb25JRCwgdWludDY0 X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcgb3JpZ2luSWRlbnRpZmllcikKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNwcAkocmV2aXNpb24gODYwMzIpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y ODksMTIgKzI4OSwxMiBAQCB2b2lkIFdlYlVJQ2xpZW50OjpwYWdlRGlkU2Nyb2xsKFdlYlBhZ2VQ CiAgICAgbV9jbGllbnQucGFnZURpZFNjcm9sbCh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50 SW5mbyk7CiB9CiAKLXVuc2lnbmVkIGxvbmcgbG9uZyBXZWJVSUNsaWVudDo6ZXhjZWVkZWREYXRh YmFzZVF1b3RhKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIFdlYlNl Y3VyaXR5T3JpZ2luKiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBT dHJpbmcmIGRhdGFiYXNlRGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50UXVv dGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBl eHBlY3RlZFVzYWdlKQordW5zaWduZWQgbG9uZyBsb25nIFdlYlVJQ2xpZW50OjpleGNlZWRlZERh dGFiYXNlUXVvdGEoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgV2Vi U2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0 IFN0cmluZyYgZGF0YWJhc2VEaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRR dW90YSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRPcmlnaW5Vc2FnZSwgdW5zaWduZWQgbG9u ZyBsb25nIGN1cnJlbnREYXRhYmFzZVVzYWdlLCB1bnNpZ25lZCBsb25nIGxvbmcgZXhwZWN0ZWRV c2FnZSkKIHsKICAgICBpZiAoIW1fY2xpZW50LmV4Y2VlZGVkRGF0YWJhc2VRdW90YSkKICAgICAg ICAgcmV0dXJuIGN1cnJlbnRRdW90YTsKIAotICAgIHJldHVybiBtX2NsaWVudC5leGNlZWRlZERh dGFiYXNlUXVvdGEodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkob3JpZ2luKSwgdG9B UEkoZGF0YWJhc2VOYW1lLmltcGwoKSksIHRvQVBJKGRhdGFiYXNlRGlzcGxheU5hbWUuaW1wbCgp KSwgY3VycmVudFF1b3RhLCBjdXJyZW50VXNhZ2UsIGV4cGVjdGVkVXNhZ2UsIG1fY2xpZW50LmNs aWVudEluZm8pOworICAgIHJldHVybiBtX2NsaWVudC5leGNlZWRlZERhdGFiYXNlUXVvdGEodG9B UEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkob3JpZ2luKSwgdG9BUEkoZGF0YWJhc2VOYW1l LmltcGwoKSksIHRvQVBJKGRhdGFiYXNlRGlzcGxheU5hbWUuaW1wbCgpKSwgY3VycmVudFF1b3Rh LCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdl LCBtX2NsaWVudC5jbGllbnRJbmZvKTsKIH0KIAogYm9vbCBXZWJVSUNsaWVudDo6cnVuT3BlblBh bmVsKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0IFdlYk9w ZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEmIHBhcmFtZXRlckRhdGEsIFdlYk9wZW5QYW5lbFJlc3Vs dExpc3RlbmVyUHJveHkqIGxpc3RlbmVyKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlVJQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlVJQ2xpZW50LmgJKHJldmlzaW9uIDg2MDMyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlVJQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTkzLDcgKzkzLDcgQEAgcHVibGljOgog ICAgIHZvaWQgZGlkRHJhdyhXZWJQYWdlUHJveHkqKTsKICAgICB2b2lkIHBhZ2VEaWRTY3JvbGwo V2ViUGFnZVByb3h5Kik7CiAKLSAgICB1bnNpZ25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFz ZVF1b3RhKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBXZWJTZWN1cml0eU9yaWdpbios IGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlRGlzcGxh eU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9u ZyBjdXJyZW50VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBleHBlY3RlZFVzYWdlKTsKKyAgICB1 bnNpZ25lZCBsb25nIGxvbmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdlYlBhZ2VQcm94eSosIFdl YkZyYW1lUHJveHkqLCBXZWJTZWN1cml0eU9yaWdpbiosIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VO YW1lLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlRGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9u ZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2luVXNhZ2UsIHVu c2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25n IGV4cGVjdGVkVXNhZ2UpOwogCiAgICAgYm9vbCBydW5PcGVuUGFuZWwoV2ViUGFnZVByb3h5Kiwg V2ViRnJhbWVQcm94eSosIGNvbnN0IFdlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEmLCBXZWJP cGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5Kik7CiAgICAgYm9vbCBkZWNpZGVQb2xpY3lGb3JH ZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkq LCBXZWJTZWN1cml0eU9yaWdpbiosIEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94eSop OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24g ODYwMzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHdvcmtp bmcgY29weSkKQEAgLTE3NSw3ICsxNzUsNyBAQCB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VTZXRJc1Jl c2l6YWJsZUNhbGxiCiB0eXBlZGVmIFdLUmVjdCAoKldLUGFnZUdldFdpbmRvd0ZyYW1lQ2FsbGJh Y2spKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9p ZCAoKldLUGFnZVNldFdpbmRvd0ZyYW1lQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1JlY3Qg ZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRlZiBib29sICgqV0tQYWdlUnVu QmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmlu Z1JlZiBtZXNzYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsK LXR5cGVkZWYgdW5zaWduZWQgbG9uZyBsb25nICgqV0tQYWdlRXhjZWVkZWREYXRhYmFzZVF1b3Rh Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1NlY3VyaXR5T3Jp Z2luUmVmIG9yaWdpbiwgV0tTdHJpbmdSZWYgZGF0YWJhc2VOYW1lLCBXS1N0cmluZ1JlZiBkaXNw bGF5TmFtZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRRdW90YSwgdW5zaWduZWQgbG9uZyBs b25nIGN1cnJlbnRVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UsIGNvbnN0 IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRlZiB1bnNpZ25lZCBsb25nIGxvbmcgKCpXS1BhZ2VF eGNlZWRlZERhdGFiYXNlUXVvdGFDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYg ZnJhbWUsIFdLU2VjdXJpdHlPcmlnaW5SZWYgb3JpZ2luLCBXS1N0cmluZ1JlZiBkYXRhYmFzZU5h bWUsIFdLU3RyaW5nUmVmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGxvbmcgY3VycmVudFF1 b3RhLCB1bnNpZ25lZCBsb25nIGxvbmcgY3VycmVudE9yaWdpblVzYWdlLCB1bnNpZ25lZCBsb25n IGxvbmcgY3VycmVudERhdGFiYXNlVXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBleHBlY3RlZFVz YWdlLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZVJ1bk9w ZW5QYW5lbENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tPcGVu UGFuZWxQYXJhbWV0ZXJzUmVmIHBhcmFtZXRlcnMsIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJS ZWYgbGlzdGVuZXIsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tQ YWdlRGVjaWRlUG9saWN5Rm9yR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdENhbGxiYWNrKShX S1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tTZWN1cml0eU9yaWdpblJlZiBvcmln aW4sIFdLR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFJlZiBwZXJtaXNzaW9uUmVxdWVzdCwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIGZsb2F0ICgqV0tQYWdlSGVhZGVySGVp Z2h0Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJldmlzaW9uIDg2 MDMyKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJv bWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MDYsOSArNTA2LDEwIEBAIHZvaWQgV2Vi Q2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXUKIAogICAgIERhdGFiYXNlRGV0YWlscyBk ZXRhaWxzID0gRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZGV0YWlsc0Zvck5hbWVBbmRPcmln aW4oZGF0YWJhc2VOYW1lLCBvcmlnaW4pOwogICAgIHVpbnQ2NF90IGN1cnJlbnRRdW90YSA9IERh dGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLnF1b3RhRm9yT3JpZ2luKG9yaWdpbik7CisgICAgdWlu dDY0X3QgY3VycmVudE9yaWdpblVzYWdlID0gRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkudXNh Z2VGb3JPcmlnaW4ob3JpZ2luKTsKICAgICB1aW50NjRfdCBuZXdRdW90YSA9IDA7CiAgICAgV2Vi UHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kU3luYygKLSAgICAgICAgTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6RXhjZWVkZWREYXRhYmFzZVF1b3RhKHdlYkZyYW1lLT5mcmFtZUlE KCksIG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCksIGRhdGFiYXNlTmFtZSwgZGV0YWlscy5k aXNwbGF5TmFtZSgpLCBjdXJyZW50UXVvdGEsIGRldGFpbHMuY3VycmVudFVzYWdlKCksIGRldGFp bHMuZXhwZWN0ZWRVc2FnZSgpKSwKKyAgICAgICAgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RXhj ZWVkZWREYXRhYmFzZVF1b3RhKHdlYkZyYW1lLT5mcmFtZUlEKCksIG9yaWdpbi0+ZGF0YWJhc2VJ ZGVudGlmaWVyKCksIGRhdGFiYXNlTmFtZSwgZGV0YWlscy5kaXNwbGF5TmFtZSgpLCBjdXJyZW50 UXVvdGEsIGN1cnJlbnRPcmlnaW5Vc2FnZSwgZGV0YWlscy5jdXJyZW50VXNhZ2UoKSwgZGV0YWls cy5leHBlY3RlZFVzYWdlKCkpLAogICAgICAgICBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpFeGNl ZWRlZERhdGFiYXNlUXVvdGE6OlJlcGx5KG5ld1F1b3RhKSwgbV9wYWdlLT5wYWdlSUQoKSk7CiAK ICAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5zZXRRdW90YShvcmlnaW4sIG5ld1F1b3Rh KTsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDg2MTc4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTEtMDUtMTAgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbV2Vi S2l0Ml0gZXhjZWVkZWREYXRhYmFzZVF1b3RhIGZ1bmN0aW9uIG9uIFdLUGFnZVVJQ2xpZW50IG5l ZWRzIHRvIHByb3ZpZGUgaW5mb3JtYXRpb24KKyAgICAgICAgYWJvdXQgdGhlIHVzYWdlIGZvciBi b3RoIHRoZSBvcmlnaW4gb3ZlcmFsbCBhbmQgdGhlIGRhdGFiYXNlIGluIHF1ZXN0aW9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1NzMKKworICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RS OjpleGNlZWRlZERhdGFiYXNlUXVvdGEpOgorCiAyMDExLTA1LTEwICBEYXZpZCBMZXZpbiAgPGxl dmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFq aS4KSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCShyZXZp c2lvbiA4NjAzMikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMDksNyArMTA5LDcgQEAgc3RhdGljIGJvb2wgcnVuQmVmb3Jl VW5sb2FkQ29uZmlybVBhbmVsKAogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgdW5zaWdu ZWQgbG9uZyBsb25nIGV4Y2VlZGVkRGF0YWJhc2VRdW90YShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYs IFdLU2VjdXJpdHlPcmlnaW5SZWYsIFdLU3RyaW5nUmVmLCBXS1N0cmluZ1JlZiwgdW5zaWduZWQg bG9uZyBsb25nLCB1bnNpZ25lZCBsb25nIGxvbmcsIHVuc2lnbmVkIGxvbmcgbG9uZywgY29uc3Qg dm9pZCopCitzdGF0aWMgdW5zaWduZWQgbG9uZyBsb25nIGV4Y2VlZGVkRGF0YWJhc2VRdW90YShX S1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLU2VjdXJpdHlPcmlnaW5SZWYsIFdLU3RyaW5nUmVmLCBX S1N0cmluZ1JlZiwgdW5zaWduZWQgbG9uZyBsb25nLCB1bnNpZ25lZCBsb25nIGxvbmcsIHVuc2ln bmVkIGxvbmcgbG9uZywgdW5zaWduZWQgbG9uZyBsb25nLCBjb25zdCB2b2lkKikKIHsKICAgICBz dGF0aWMgY29uc3QgdW5zaWduZWQgbG9uZyBsb25nIGRlZmF1bHRRdW90YSA9IDUgKiAxMDI0ICog MTAyNDsgICAgCiAgICAgcmV0dXJuIGRlZmF1bHRRdW90YTsK