47938 2010-10-19 15:32:56 -0700 Add alternateHTMLString and unreachableURL API to WebKit2 2010-10-19 16:28:49 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 sam webkit-unassigned abarth eric webkit.review.bot oldest_to_newest 296465 0 sam 2010-10-19 15:32:56 -0700 Add alternateHTMLString and unreachableURL API to WebKit2 296466 1 sam 2010-10-19 15:33:06 -0700 <rdar://problem/8557864> 296471 2 71212 sam 2010-10-19 15:41:51 -0700 Created attachment 71212 Patch 296473 3 webkit.review.bot 2010-10-19 15:43:35 -0700 Attachment 71212 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/WebPage/WebPage.cpp:327: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 296476 4 sam 2010-10-19 15:46:02 -0700 Landed in r70097. 296517 5 webkit.review.bot 2010-10-19 16:28:49 -0700 http://trac.webkit.org/changeset/70097 might have broken SnowLeopard Intel Release (Tests) 71212 2010-10-19 15:41:51 -0700 2010-10-19 15:43:02 -0700 Patch patch.diff text/plain 14911 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MDA5NikKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTUgQEAKKzIwMTAtMTAtMTkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYWx0 ZXJuYXRlSFRNTFN0cmluZyBhbmQgdW5yZWFjaGFibGVVUkwgQVBJIHRvIFdlYktpdDIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3OTM4CisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5jcHA6CisgICAgICAgIChXS0ZyYW1lQ29weVVu cmVhY2hhYmxlVVJMKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5oOgorICAg ICAgICBBZGQgYWNjZXNzb3IgZm9yIHRoZSB1bnJlYWNoYWJsZVVSTCBpZiBvbmUgaXMgc2V0LiBJ dCB3aWxsIG9ubHkgYmUKKyAgICAgICAgc2V0IGR1cmluZyBhIGxvYWRBbHRlcm5hdGVIVE1MU3Ry aW5nIGFuZCB3aWxsIGJlIHVuc2V0IG9uIHRoZSBuZXh0IG5vcm1hbAorICAgICAgICBkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIGNhbGwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZUxvYWRIVE1MU3RyaW5nKTogUmVtb3ZlIHdo aXRlc3BhY2UuCisgICAgICAgIChXS1BhZ2VMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICBBZGQgZnVuY3Rpb24gdG8g bG9hZCBhIHN0cmluZyBhcyAiYWx0ZXJuYXRlIiwgbWVhbnQgZm9yIHVzZSBhcyBlcnJvciBwYWdl cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5Lmg6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lUHJveHk6OnNldFVucmVhY2hhYmxlVVJMKTogCisgICAgICAgIChXZWJLaXQ6 OldlYkZyYW1lUHJveHk6OnVucmVhY2hhYmxlVVJMKToKKyAgICAgICAgQWRkIHNldHRlci9nZXR0 ZXIgZm9yIHRoZSB1bnJlYWNoYWJsZVVSTC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRBbHRlcm5hdGVI VE1MU3RyaW5nKToKKyAgICAgICAgUGx1bWIgdGhyb3VnaCB0aGUgY2FsbCB0byBsb2FkQWx0ZXJu YXRlSFRNTFN0cmluZyB0byB0aGUgV2ViUHJvY2VzcworICAgICAgICBhbmQgc2V0IHRoZSBtYWlu IGZyYW1lJ3MgdW5yZWFjaGFibGVVUkwuIFRoaXMgZG9lcyBub3RoaW5nIGlmIG5vIHBhZ2VzCisg ICAgICAgIGhhdmUgZXZlciBiZWVuIGxvYWRlZCBpbiB0aGlzIHBhZ2UuCisKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAg ICAgICAgSWYgdGhpcyBpcyBub3QgYSBwcm92aXNpb25hbCBsb2FkIG9mIHN1YnN0aXR1dGUgZGF0 YSBmb3IgYW4gdW5yZWFjaGFibGVVUkwKKyAgICAgICAgKGUuZy4gc29tZW9uZSB3aG8gY2FsbGVk IFdLUGFnZUxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKSwgcmVzZXQgdGhlCisgICAgICAgIGZyYW1l J3MgdW5yZWFjaGFibGVVUkwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAg VXBkYXRlIGZ1bmN0aW9uIHNpZ25hdHVyZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgorICAg ICAgICBQYXNzIHdoZXRoZXIgb3Igbm90IHRoaXMgaXMgYSBsb2FkIG9mIFN1YnN0aXR1dGVEYXRh IGZvciBhbiB1bnJlYWNoYWJsZVVSTAorICAgICAgICB0byB0aGUgVUlQcm9jZXNzLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpsb2FkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRBbHRlcm5h dGVIVE1MU3RyaW5nKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorICAgICAg ICBQbHVtYiB0aHJvdWdoIHRoZSBsb2FkaW5nIG9mIHRoZSBhbHRlcm5hdGUgSFRNTCBzdHJpbmcu IAorCiAyMDEwLTEwLTE5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFdlYktpdDIvVUlQcm9j ZXNzL1dlYkZyYW1lUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJG cmFtZVByb3h5LmgJKHJldmlzaW9uIDcwMDYxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJh bWVQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC03NCw2ICs3NCw5IEBAIHB1YmxpYzoKICAgICBj b25zdCBTdHJpbmcmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsOyB9CiAgICAgY29uc3QgU3Ry aW5nJiBwcm92aXNpb25hbFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9uYWxVUkw7IH0K IAorICAgIHZvaWQgc2V0VW5yZWFjaGFibGVVUkwoY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVS TCkgeyBtX3VucmVhY2hhYmxlVVJMID0gdW5yZWFjaGFibGVVUkw7IH0KKyAgICBjb25zdCBTdHJp bmcmIHVucmVhY2hhYmxlVVJMKCkgY29uc3QgeyByZXR1cm4gbV91bnJlYWNoYWJsZVVSTDsgfQor CiAgICAgdm9pZCBzZXRNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSB7IG1fTUlNRVR5 cGUgPSBtaW1lVHlwZTsgfQogICAgIGNvbnN0IFN0cmluZyYgbWltZVR5cGUoKSBjb25zdCB7IHJl dHVybiBtX01JTUVUeXBlOyB9CiAKQEAgLTEwMSw2ICsxMDQsNyBAQCBwcml2YXRlOgogICAgIExv YWRTdGF0ZSBtX2xvYWRTdGF0ZTsKICAgICBTdHJpbmcgbV91cmw7CiAgICAgU3RyaW5nIG1fcHJv dmlzaW9uYWxVUkw7CisgICAgU3RyaW5nIG1fdW5yZWFjaGFibGVVUkw7CiAgICAgU3RyaW5nIG1f TUlNRVR5cGU7CiAgICAgUmVmUHRyPFdlYkNlcnRpZmljYXRlSW5mbz4gbV9jZXJ0aWZpY2F0ZUlu Zm87CiAgICAgUmVmUHRyPFdlYkZyYW1lTGlzdGVuZXJQcm94eT4gbV9hY3RpdmVMaXN0ZW5lcjsK SW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gNzAwNjIpCisrKyBX ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjIs NiArMjYyLDE4IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkSFRNTFN0cmluZyhjb25zdCAKICAg ICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRIVE1MU3RyaW5nKGh0bWxT dHJpbmcsIGJhc2VVUkwpLCBtX3BhZ2VJRCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpsb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCkKK3sKKyAgICBpZiAoIWlz VmFsaWQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFtX21haW5GcmFtZSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgbV9tYWluRnJhbWUtPnNldFVucmVhY2hhYmxlVVJMKHVucmVhY2hh YmxlVVJMKTsKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRBbHRl cm5hdGVIVE1MU3RyaW5nKGh0bWxTdHJpbmcsIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMKSwgbV9w YWdlSUQpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFBsYWluVGV4dFN0cmluZyhjb25z dCBTdHJpbmcmIHN0cmluZykKIHsKICAgICBpZiAoIWlzVmFsaWQoKSkKQEAgLTYxNSw3ICs2Mjcs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoUHJvZ3Jlc3MoKQogICAgIG1fbG9hZGVy Q2xpZW50LmRpZEZpbmlzaFByb2dyZXNzKHRoaXMpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmIHVybCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCit2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFt ZUlELCBjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBsb2FkaW5nU3Vic3RpdHV0ZURhdGFGb3JVbnJl YWNoYWJsZVVSTCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAg UmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7CiAgICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVj b2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgcGFnZU5hbWVzcGFjZSgpLT5jb250ZXh0KCkp OwpAQCAtNjI0LDYgKzYzNiw5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lv bmFsTG8KIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2VzcygpLT53ZWJGcmFtZShm cmFtZUlEKTsKIAorICAgIGlmICghbG9hZGluZ1N1YnN0aXR1dGVEYXRhRm9yVW5yZWFjaGFibGVV UkwpCisgICAgICAgIGZyYW1lLT5zZXRVbnJlYWNoYWJsZVVSTChTdHJpbmcoKSk7CisKICAgICBm cmFtZS0+ZGlkU3RhcnRQcm92aXNpb25hbExvYWQodXJsKTsKICAgICBtX2xvYWRlckNsaWVudC5k aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHRoaXMsIGZyYW1lLCB1c2VyRGF0YS5nZXQo KSk7CiB9CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gNzAwNjIpCisr KyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTI1 LDYgKzEyNSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGxvYWRVUkwoY29uc3QgU3RyaW5nJik7CiAg ICAgdm9pZCBsb2FkVVJMUmVxdWVzdChXZWJVUkxSZXF1ZXN0Kik7CiAgICAgdm9pZCBsb2FkSFRN TFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCk7 CisgICAgdm9pZCBsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJp bmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCk7 CiAgICAgdm9pZCBsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nKTsKIAog ICAgIHZvaWQgc3RvcExvYWRpbmcoKTsKQEAgLTIzMyw3ICsyMzQsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlk Q3JlYXRlU3ViRnJhbWUodWludDY0X3QgZnJhbWVJRCk7CiAKLSAgICB2b2lkIGRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiwgQ29y ZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CisgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYsIGJvb2wgbG9hZGluZ1N1 YnN0aXR1dGVEYXRhRm9yVW5yZWFjaGFibGVVUkwsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rlciop OwogICAgIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiwgQ29yZUlQQzo6QXJndW1lbnRE ZWNvZGVyKik7CiAgICAgdm9pZCBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciopOwogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZy YW1lSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFBsYXRmb3JtQ2VydGlmaWNhdGVJ bmZvJiwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiA3MDA2MikKKysrIFdlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNjYs NyArNjYsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIERpZEZpcnN0VmlzdWFs bHlOb25FbXB0eUxheW91dEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6SW5qZWN0 ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpCiAgICAgRGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgV1RG OjpTdHJpbmcgdXJsLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVz ZXJEYXRhKQogICAgIERpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeSh1aW50NjRfdCBmcmFtZUlE LCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKQotICAg IERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgV1RGOjpT dHJpbmcgdXJsLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJE YXRhKQorICAgIERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgV1RGOjpTdHJpbmcgdXJsLCBib29sIGxvYWRpbmdTdWJzdGl0dXRlRGF0YUZvclVucmVhY2hh YmxlVVJMLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRh KQogICAgIERpZFJlY2VpdmVUaXRsZUZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdURjo6U3Ry aW5nIHRpdGxlLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJE YXRhKQogCiAgICAgIyBGb3JtcyBtZXNzYWdlcy4KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL RnJhbWUuY3BwCShyZXZpc2lvbiA3MDA2MSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL RnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Niw2ICs2NiwxMSBAQCBXS1VSTFJlZiBXS0Zy YW1lQ29weVVSTChXS0ZyYW1lUmVmIGZyYW1lCiAgICAgcmV0dXJuIHRvQ29waWVkVVJMQVBJKHRv SW1wbChmcmFtZVJlZiktPnVybCgpKTsKIH0KIAorV0tVUkxSZWYgV0tGcmFtZUNvcHlVbnJlYWNo YWJsZVVSTChXS0ZyYW1lUmVmIGZyYW1lUmVmKQoreworICAgIHJldHVybiB0b0NvcGllZFVSTEFQ SSh0b0ltcGwoZnJhbWVSZWYpLT51bnJlYWNoYWJsZVVSTCgpKTsKK30KKwogV0tTdHJpbmdSZWYg V0tGcmFtZUNvcHlNSU1FVHlwZShXS0ZyYW1lUmVmIGZyYW1lUmVmKQogewogICAgIHJldHVybiB0 b0NvcGllZEFQSSh0b0ltcGwoZnJhbWVSZWYpLT5taW1lVHlwZSgpKTsKSW5kZXg6IFdlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS0ZyYW1lLmgJKHJldmlzaW9uIDcwMDYxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tGcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1MCw4IEBAIFdLX0VYUE9S VCBXS0ZyYW1lTG9hZFN0YXRlIFdLRnJhbWVHZXRGcmEKIFdLX0VYUE9SVCBXS1VSTFJlZiBXS0Zy YW1lQ29weVByb3Zpc2lvbmFsVVJMKFdLRnJhbWVSZWYgZnJhbWUpOwogV0tfRVhQT1JUIFdLVVJM UmVmIFdLRnJhbWVDb3B5VVJMKFdLRnJhbWVSZWYgZnJhbWUpOwogCitXS19FWFBPUlQgV0tVUkxS ZWYgV0tGcmFtZUNvcHlVbnJlYWNoYWJsZVVSTChXS0ZyYW1lUmVmIGZyYW1lKTsKKwogV0tfRVhQ T1JUIFdLU3RyaW5nUmVmIFdLRnJhbWVDb3B5TUlNRVR5cGUoV0tGcmFtZVJlZiBmcmFtZSk7CiAK IFdLX0VYUE9SVCBXS1BhZ2VSZWYgV0tGcmFtZUdldFBhZ2UoV0tGcmFtZVJlZiBmcmFtZSk7Cklu ZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDcwMDYxKQorKysgV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTksNyAr NTksMTIgQEAgdm9pZCBXS1BhZ2VMb2FkVVJMUmVxdWVzdChXS1BhZ2VSZWYgcGFnZQogCiB2b2lk IFdLUGFnZUxvYWRIVE1MU3RyaW5nKFdLUGFnZVJlZiBwYWdlUmVmLCBXS1N0cmluZ1JlZiBodG1s U3RyaW5nUmVmLCBXS1VSTFJlZiBiYXNlVVJMUmVmKQogewotICAgIHRvSW1wbChwYWdlUmVmKS0+ bG9hZEhUTUxTdHJpbmcodG9XVEZTdHJpbmcoaHRtbFN0cmluZ1JlZiksIHRvV1RGU3RyaW5nKGJh c2VVUkxSZWYpKTsgICAgCisgICAgdG9JbXBsKHBhZ2VSZWYpLT5sb2FkSFRNTFN0cmluZyh0b1dU RlN0cmluZyhodG1sU3RyaW5nUmVmKSwgdG9XVEZTdHJpbmcoYmFzZVVSTFJlZikpOworfQorCit2 b2lkIFdLUGFnZUxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKFdLUGFnZVJlZiBwYWdlUmVmLCBXS1N0 cmluZ1JlZiBodG1sU3RyaW5nUmVmLCBXS1VSTFJlZiBiYXNlVVJMUmVmLCBXS1VSTFJlZiB1bnJl YWNoYWJsZVVSTFJlZikKK3sKKyAgICB0b0ltcGwocGFnZVJlZiktPmxvYWRBbHRlcm5hdGVIVE1M U3RyaW5nKHRvV1RGU3RyaW5nKGh0bWxTdHJpbmdSZWYpLCB0b1dURlN0cmluZyhiYXNlVVJMUmVm KSwgdG9XVEZTdHJpbmcodW5yZWFjaGFibGVVUkxSZWYpKTsKIH0KIAogdm9pZCBXS1BhZ2VMb2Fk UGxhaW5UZXh0U3RyaW5nKFdLUGFnZVJlZiBwYWdlUmVmLCBXS1N0cmluZ1JlZiBwbGFpblRleHRT dHJpbmdSZWYpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24gNzAwNjIp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAt MTgzLDYgKzE4Myw3IEBAIFdLX0VYUE9SVCBXS1BhZ2VOYW1lc3BhY2VSZWYgV0tQYWdlR2V0UGEK IFdLX0VYUE9SVCB2b2lkIFdLUGFnZUxvYWRVUkwoV0tQYWdlUmVmIHBhZ2UsIFdLVVJMUmVmIHVy bCk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VMb2FkVVJMUmVxdWVzdChXS1BhZ2VSZWYgcGFnZSwg V0tVUkxSZXF1ZXN0UmVmIHVybFJlcXVlc3QpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlTG9hZEhU TUxTdHJpbmcoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIGh0bWxTdHJpbmcsIFdLVVJMUmVm IGJhc2VVUkwpOworV0tfRVhQT1JUIHZvaWQgV0tQYWdlTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmco V0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIGh0bWxTdHJpbmcsIFdLVVJMUmVmIGJhc2VVUkws IFdLVVJMUmVmIHVucmVhY2hhYmxlVVJMKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUxvYWRQbGFp blRleHRTdHJpbmcoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHBsYWluVGV4dFN0cmluZyk7 CiAKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVN0b3BMb2FkaW5nKFdLUGFnZVJlZiBwYWdlKTsKSW5k ZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkocmV2aXNpb24gNzAwNjIpCisrKyBXZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOTgsOCArMjk4LDExIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh dGNoRGlkU3QKICAgICAvLyBOb3RpZnkgdGhlIGJ1bmRsZSBjbGllbnQuCiAgICAgd2ViUGFnZS0+ aW5qZWN0ZWRCdW5kbGVMb2FkZXJDbGllbnQoKS5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKHdlYlBhZ2UsIG1fZnJhbWUsIHVzZXJEYXRhKTsKIAorCisgICAgYm9vbCBsb2FkaW5nU3Vi c3RpdHV0ZURhdGFGb3JVbnJlYWNoYWJsZVVSTCA9ICFwcm92aXNpb25hbExvYWRlci0+dW5yZWFj aGFibGVVUkwoKS5pc051bGwoKTsKKwogICAgIC8vIE5vdGlmeSB0aGUgVUlQcm9jZXNzLgotICAg IFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpEaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQo KSwgdXJsLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YS5nZXQoKSkp LCB3ZWJQYWdlLT5wYWdlSUQoKSk7CisgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlv bigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCB1cmwsIGxvYWRpbmdTdWJzdGl0dXRlRGF0YUZv clVucmVhY2hhYmxlVVJMLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0 YS5nZXQoKSkpLCB3ZWJQYWdlLT5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKGNvbnN0IFN0cmluZyYgdGl0bGUpCkluZGV4 OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gNzAwNjEpCisr KyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzA2LDEwICszMDYsMTAgQEAgdm9pZCBXZWJQYWdlOjpsb2FkVVJMUmVxdWVzdChjb25zdCBS ZXNvdQogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPmxvYWQocmVxdWVz dCwgZmFsc2UpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWREYXRhKFBhc3NSZWZQdHI8U2hhcmVk QnVmZmVyPiBzaGFyZWRCdWZmZXIsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmlu ZyYgZW5jb2RpbmdOYW1lLCBjb25zdCBLVVJMJiBiYXNlVVJMLCBjb25zdCBLVVJMJiBmYWlsaW5n VVJMKQordm9pZCBXZWJQYWdlOjpsb2FkRGF0YShQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2hh cmVkQnVmZmVyLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5n TmFtZSwgY29uc3QgS1VSTCYgYmFzZVVSTCwgY29uc3QgS1VSTCYgdW5yZWFjaGFibGVVUkwpCiB7 CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoYmFzZVVSTCk7Ci0gICAgU3Vic3RpdHV0ZURh dGEgc3Vic3RpdHV0ZURhdGEoc2hhcmVkQnVmZmVyLCBNSU1FVHlwZSwgZW5jb2RpbmdOYW1lLCBm YWlsaW5nVVJMKTsKKyAgICBTdWJzdGl0dXRlRGF0YSBzdWJzdGl0dXRlRGF0YShzaGFyZWRCdWZm ZXIsIE1JTUVUeXBlLCBlbmNvZGluZ05hbWUsIHVucmVhY2hhYmxlVVJMKTsKICAgICBtX21haW5G cmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5sb2FkKHJlcXVlc3QsIHN1YnN0aXR1dGVEYXRh LCBmYWxzZSk7CiB9CiAKQEAgLTMyMCw2ICszMjAsMTQgQEAgdm9pZCBXZWJQYWdlOjpsb2FkSFRN TFN0cmluZyhjb25zdCBTdHJpbgogICAgIGxvYWREYXRhKHNoYXJlZEJ1ZmZlciwgInRleHQvaHRt bCIsICJ1dGYtMTYiLCBiYXNlVVJMLCBLVVJMKCkpOwogfQogCit2b2lkIFdlYlBhZ2U6OmxvYWRB bHRlcm5hdGVIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5n JiBiYXNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMU3RyaW5nKQorewor ICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3Jl YXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hhcmFjdGVycygp KSwgaHRtbFN0cmluZy5sZW5ndGgoKSAqIHNpemVvZihVQ2hhcikpOworICAgIEtVUkwgYmFzZVVS TCA9IGJhc2VVUkxTdHJpbmcuaXNFbXB0eSgpID8gYmxhbmtVUkwoKSA6IEtVUkwoS1VSTCgpLCBi YXNlVVJMU3RyaW5nKTsKKyAgICBLVVJMIHVucmVhY2hhYmxlVVJMID0gdW5yZWFjaGFibGVVUkxT dHJpbmcuaXNFbXB0eSgpID8gS1VSTCgpIDogS1VSTChLVVJMKCksIHVucmVhY2hhYmxlVVJMU3Ry aW5nKSAgOworICAgIGxvYWREYXRhKHNoYXJlZEJ1ZmZlciwgInRleHQvaHRtbCIsICJ1dGYtMTYi LCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCk7Cit9CisKIHZvaWQgV2ViUGFnZTo6bG9hZFBsYWlu VGV4dFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZykKIHsKICAgICBSZWZQdHI8U2hhcmVkQnVm ZmVyPiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0 PGNvbnN0IGNoYXIqPihzdHJpbmcuY2hhcmFjdGVycygpKSwgc3RyaW5nLmxlbmd0aCgpICogc2l6 ZW9mKFVDaGFyKSk7CkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZp c2lvbiA3MDA2MSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29y a2luZyBjb3B5KQpAQCAtMTg5LDYgKzE4OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBsb2FkVVJM KGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgbG9hZFVSTFJlcXVlc3QoY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgdm9pZCBsb2FkSFRNTFN0cmluZyhjb25zdCBTdHJpbmcm IGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCk7CisgICAgdm9pZCBsb2FkQWx0ZXJu YXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFz ZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCk7CiAgICAgdm9pZCBsb2FkUGxhaW5U ZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgcmVsb2FkKGJvb2wgcmVsb2FkRnJv bU9yaWdpbik7CiAgICAgdm9pZCBnb0ZvcndhcmQodWludDY0X3QpOwpJbmRleDogV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCShyZXZpc2lvbiA3MDA2 MSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdv cmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDggQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSB7CiAgICAg R29CYWNrKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQogICAgIEdvRm9yd2FyZCh1aW50NjRf dCBiYWNrRm9yd2FyZEl0ZW1JRCkKICAgICBHb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGJh Y2tGb3J3YXJkSXRlbUlEKQotICAgIExvYWRIVE1MU3RyaW5nKFdURjo6U3RyaW5nIGh0bWxTdHJp bmcsIFdURjo6U3RyaW5nIHVybCkKKyAgICBMb2FkSFRNTFN0cmluZyhXVEY6OlN0cmluZyBodG1s U3RyaW5nLCBXVEY6OlN0cmluZyBiYXNlVVJMKQorICAgIExvYWRBbHRlcm5hdGVIVE1MU3RyaW5n KFdURjo6U3RyaW5nIGh0bWxTdHJpbmcsIFdURjo6U3RyaW5nIGJhc2VVUkwsIFdURjo6U3RyaW5n IHVucmVhY2hhYmxlVVJMKTsgCiAgICAgTG9hZFBsYWluVGV4dFN0cmluZyhXVEY6OlN0cmluZyBz dHJpbmcpCiAgICAgTG9hZFVSTChXVEY6OlN0cmluZyB1cmwpCiAgICAgTG9hZFVSTFJlcXVlc3Qo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QpCg==