53383 2011-01-29 14:47:48 -0800 Add WKPageCopyPendingURL API; returns the last URL requested for load via API before reaching provisional state 2011-01-30 00:30:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 342146 0 mjs 2011-01-29 14:47:48 -0800 Add WKPageCopyPendingURL API; returns the last URL requested for load via API before reaching provisional state 342150 1 80577 mjs 2011-01-29 14:52:01 -0800 Created attachment 80577 Patch 342189 2 80585 mjs 2011-01-29 20:04:31 -0800 Created attachment 80585 Patch 342191 3 80585 ggaren 2011-01-29 20:53:17 -0800 Comment on attachment 80585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80585&action=review The distinction between the dual concepts of "pending" and "provisional" is very subtle here. You should consider giving the two more distinctive names in the future. I want to make a suggestion, but I'm not sure exactly why a requested URL doesn't immediately enter the provisional state. r=me > Source/WebKit2/ChangeLog:6 > + Add WKPageCopyPendingURL API; returns the last URL requested for load via API before reaching provisional state > + https://bugs.webkit.org/show_bug.cgi?id=53383 I had a hard time parsing this sentence. I think you mean, "returns the last API-requested URL even if that URL hasn't reached the provisional state yet." 342212 4 mjs 2011-01-30 00:30:35 -0800 Committed r77085: <http://trac.webkit.org/changeset/77085> 80577 2011-01-29 14:52:01 -0800 2011-01-29 20:04:28 -0800 Patch bug-53383-20110129145200.patch text/plain 6540 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3MDcxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDEtMjkgIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgV0tQYWdlQ29weVBlbmRpbmdVUkwgQVBJOyByZXR1cm5z IHRoZSBsYXN0IFVSTCByZXF1ZXN0ZWQgZm9yIGxvYWQgdmlhIEFQSSBiZWZvcmUgcmVhY2hpbmcg cHJvdmlzaW9uYWwgc3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzMzgzCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoK KyAgICAgICAgKFdLUGFnZUNvcHlQZW5kaW5nVVJMKTogUmV0cmlldmUgdGhlIHBlbmRpbmcgVVJM LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2Fk VVJMKTogU2V0IHBlbmRpbmcgVVJMLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omxv YWRVUkxSZXF1ZXN0KTogZGl0dG8KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWxv YWQpOiBkaXR0bworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmdvRm9yd2FyZCk6IGRp dHRvCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29CYWNrKTogZGl0dG8KKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KTogQ2xlYXIKKyAgICAgICAgcGVuZGluZyBVUkw7IGNsaWVudHMgc2hvdWxkIGxvb2sgYXQgdGhl IHByb3Zpc2lvbmFsIFVSTCBub3cuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6IENsZWFyCisgICAgICAgIHBlbmRpbmcgVVJM IGlmIGl0IGRvZXNuJ3QgbWF0Y2ggdGhlIHBvbGljeSBVUkw7IHRoaXMgbWVhbnMgd2UKKyAgICAg ICAgd2VyZSBpbnRlcnJ1cHRlZCBieSBhbm90aGVyIGxvYWQuCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBlbmRpbmdV UkwpOiBIZWxwZXIgZnVuY3Rpb24uCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2xl YXJQZW5kaW5nVVJMKTogZGl0dG8KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRQ ZW5kaW5nVVJMKTogZGl0dG8KKwogMjAxMS0wMS0yOCAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1 dHRAYXBwbGUuY29tPgogCiAgICAgICAgIERvd25sb2FkcyBpbiBXSzIgb24gV2luZG93cyBzaG91 bGQgd3JpdGUgcmVzdW1lIGRhdGEgdG8gYnVuZGxlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gNzcwNzEpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIwLDYgKzMy MCw4IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGEKIAogdm9pZCBX ZWJQYWdlUHJveHk6OmxvYWRVUkwoY29uc3QgU3RyaW5nJiB1cmwpCiB7CisgICAgc2V0UGVuZGlu Z1VSTCh1cmwpOworCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQ cm9jZXNzKCk7CiAKQEAgLTMzMCw2ICszMzIsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFVS TChjb25zdCBTdHJpbmcmCiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkVVJMUmVxdWVzdChXZWJV UkxSZXF1ZXN0KiB1cmxSZXF1ZXN0KQogeworICAgIHNldFBlbmRpbmdVUkwodXJsUmVxdWVzdC0+ cmVzb3VyY2VSZXF1ZXN0KCkudXJsKCkpOworCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAg IHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAKQEAgLTM3Myw2ICszNzcsOCBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6c3RvcExvYWRpbmcoKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVsb2FkKGJvb2wg cmVsb2FkRnJvbU9yaWdpbikKIHsKKyAgICBzZXRQZW5kaW5nVVJMKG1fYmFja0ZvcndhcmRMaXN0 LT5jdXJyZW50SXRlbSgpLT51cmwoKSk7CisKICAgICBpZiAoIWlzVmFsaWQoKSkgewogICAgICAg ICByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50 SXRlbSgpKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzgzLDE0ICszODksMTYgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnJlbG9hZChib29sIHJlbG9hZEZybwogCiB2b2lkIFdlYlBhZ2VQcm94eTo6Z29G b3J3YXJkKCkKIHsKKyAgICBpZiAoaXNWYWxpZCgpICYmICFjYW5Hb0ZvcndhcmQoKSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgc2V0UGVuZGluZ1VSTChtX2JhY2tGb3J3YXJkTGlzdC0+Zm9yd2Fy ZEl0ZW0oKS0+dXJsKCkpOworCiAgICAgaWYgKCFpc1ZhbGlkKCkpIHsKICAgICAgICAgcmVhdHRh Y2hUb1dlYlByb2Nlc3NXaXRoSXRlbShtX2JhY2tGb3J3YXJkTGlzdC0+Zm9yd2FyZEl0ZW0oKSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIWNhbkdvRm9yd2FyZCgpKQotICAg ICAgICByZXR1cm47Ci0KICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Okdv Rm9yd2FyZChtX2JhY2tGb3J3YXJkTGlzdC0+Zm9yd2FyZEl0ZW0oKS0+aXRlbUlEKCkpLCBtX3Bh Z2VJRCk7CiB9CiAKQEAgLTQwMSwxNCArNDA5LDE2IEBAIGJvb2wgV2ViUGFnZVByb3h5OjpjYW5H b0ZvcndhcmQoKSBjb25zdAogCiB2b2lkIFdlYlBhZ2VQcm94eTo6Z29CYWNrKCkKIHsKKyAgICBp ZiAoaXNWYWxpZCgpICYmICFjYW5Hb0JhY2soKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgc2V0 UGVuZGluZ1VSTChtX2JhY2tGb3J3YXJkTGlzdC0+YmFja0l0ZW0oKS0+dXJsKCkpOworCiAgICAg aWYgKCFpc1ZhbGlkKCkpIHsKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbSht X2JhY2tGb3J3YXJkTGlzdC0+YmFja0l0ZW0oKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBpZiAoIWNhbkdvQmFjaygpKQotICAgICAgICByZXR1cm47Ci0KICAgICBwcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvQmFjayhtX2JhY2tGb3J3YXJkTGlzdC0+YmFja0l0 ZW0oKS0+aXRlbUlEKCkpLCBtX3BhZ2VJRCk7CiB9CiAKQEAgLTEyMDMsNiArMTIxMyw4IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hQcm9ncmVzcygpCiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFN0cmluZyYgdXJsLCBib29sIGxvYWRpbmdTdWJzdGl0dXRlRGF0YUZvclVucmVhY2hhYmxlVVJM LCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKKyAgICBjbGVhclBlbmRp bmdVUkwoKTsKKwogICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwogICAgIFdlYkNvbnRl eHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIGNvbnRleHQoKSk7 CiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCkBAIC0xNDI5LDYg KzE0NDEsOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZnJhbWVEaWRCZWNvbWVGcmFtZVNlCiAKIHZv aWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQzMl90IG9wYXF1ZU5hdmlnYXRpb25UeXBlLCB1aW50MzJfdCBvcGFxdWVN b2RpZmllcnMsIGludDMyX3Qgb3BhcXVlTW91c2VCdXR0b24sIGNvbnN0IFN0cmluZyYgdXJsLCB1 aW50NjRfdCBsaXN0ZW5lcklEKQogeworICAgIGlmICh1cmwgIT0gcGVuZGluZ1VSTCgpKQorICAg ICAgICBjbGVhclBlbmRpbmdVUkwoKTsKKwogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJv Y2VzcygpLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIApJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gNzcw NzEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcg Y29weSkKQEAgLTM3Miw2ICszNzIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBkcmF3UGFnZXNUb1BE RihXZWJGcmFtZVByb3h5KiwgdWludDMyX3QgZmlyc3QsIHVpbnQzMl90IGNvdW50LCBQYXNzUmVm UHRyPERhdGFDYWxsYmFjaz4pOwogI2VuZGlmCiAKKyAgICBjb25zdCBTdHJpbmcmIHBlbmRpbmdV UkwoKSBjb25zdCB7IHJldHVybiBtX3BlbmRpbmdVUkw7IH0KKwogcHJpdmF0ZToKICAgICBXZWJQ YWdlUHJveHkoUGFnZUNsaWVudCosIFdlYkNvbnRleHQqLCBXZWJQYWdlR3JvdXAqLCB1aW50NjRf dCBwYWdlSUQpOwogCkBAIC01NDQsNiArNTQ2LDkgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBT dHJpbmcgc3RhbmRhcmRVc2VyQWdlbnQoY29uc3QgU3RyaW5nJiBhcHBsaWNhdGlvbk5hbWUgPSBT dHJpbmcoKSk7CiAKKyAgICB2b2lkIGNsZWFyUGVuZGluZ1VSTCgpIHsgbV9wZW5kaW5nVVJMID0g U3RyaW5nKCk7IH0KKyAgICB2b2lkIHNldFBlbmRpbmdVUkwoY29uc3QgU3RyaW5nJiBwZW5kaW5n VVJMKSB7IG1fcGVuZGluZ1VSTCA9IHBlbmRpbmdVUkw7IH0KKwogICAgIFBhZ2VDbGllbnQqIG1f cGFnZUNsaWVudDsKICAgICBXZWJMb2FkZXJDbGllbnQgbV9sb2FkZXJDbGllbnQ7CiAgICAgV2Vi UG9saWN5Q2xpZW50IG1fcG9saWN5Q2xpZW50OwpAQCAtNjQzLDYgKzY0OCw4IEBAIHByaXZhdGU6 CiAKICAgICBib29sIG1fbWFpbkZyYW1lSGFzQ3VzdG9tUmVwcmVzZW50YXRpb247CiAgICAgV2Vi Q29yZTo6RHJhZ09wZXJhdGlvbiBtX2N1cnJlbnREcmFnT3BlcmF0aW9uOworCisgICAgU3RyaW5n IG1fcGVuZGluZ1VSTDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDc3MDcxKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQzNSwzICs0MzUsMTAgQEAgdm9pZCBXS1BhZ2VGb3JjZVJlcGFpbnQoV0tQYWdlUmVmIHBh Z2VSZQogewogICAgIHRvSW1wbChwYWdlUmVmKS0+Zm9yY2VSZXBhaW50KFZvaWRDYWxsYmFjazo6 Y3JlYXRlKGNvbnRleHQsIGNhbGxiYWNrKSk7CiB9CisKK1dLX0VYUE9SVCBXS1VSTFJlZiBXS1Bh Z2VDb3B5UGVuZGluZ1VSTChXS1BhZ2VSZWYgcGFnZVJlZikKK3sKKyAgICBpZiAodG9JbXBsKHBh Z2VSZWYpLT5wZW5kaW5nVVJMKCkuaXNOdWxsKCkpCisgICAgICAgIHJldHVybiAwOworICAgIHJl dHVybiB0b0NvcGllZFVSTEFQSSh0b0ltcGwocGFnZVJlZiktPnBlbmRpbmdVUkwoKSk7Cit9Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA3NzA3 MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBj b3B5KQpAQCAtMzQ0LDYgKzM0NCw4IEBAIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUdldENvbnRlbnRz QXNTdHJpbmcKIHR5cGVkZWYgdm9pZCAoKldLUGFnZUZvcmNlUmVwYWludEZ1bmN0aW9uKShXS0Vy cm9yUmVmLCB2b2lkKik7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VGb3JjZVJlcGFpbnQoV0tQYWdl UmVmIHBhZ2UsIHZvaWQqIGNvbnRleHQsIFdLUGFnZUZvcmNlUmVwYWludEZ1bmN0aW9uIGZ1bmN0 aW9uKTsKIAorV0tfRVhQT1JUIFdLVVJMUmVmIFdLUGFnZUNvcHlQZW5kaW5nVVJMKFdLUGFnZVJl ZiBwYWdlKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK 80585 2011-01-29 20:04:31 -0800 2011-01-29 20:53:17 -0800 Patch bug-53383-20110129200429.patch text/plain 7338 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3MDc3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDEtMjkgIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgV0tQYWdlQ29weVBlbmRpbmdVUkwgQVBJOyByZXR1cm5z IHRoZSBsYXN0IFVSTCByZXF1ZXN0ZWQgZm9yIGxvYWQgdmlhIEFQSSBiZWZvcmUgcmVhY2hpbmcg cHJvdmlzaW9uYWwgc3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzMzgzCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoK KyAgICAgICAgKFdLUGFnZUNvcHlQZW5kaW5nVVJMKTogUmV0cmlldmUgdGhlIHBlbmRpbmcgVVJM LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2Fk VVJMKTogU2V0IHBlbmRpbmcgVVJMLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omxv YWRVUkxSZXF1ZXN0KTogZGl0dG8KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWxv YWQpOiBkaXR0bworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmdvRm9yd2FyZCk6IGRp dHRvCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29CYWNrKTogZGl0dG8KKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojplc3RpbWF0ZWRQcm9ncmVzcyk6IEFzc3VtZSB0aGUg aW5pdGlhbAorICAgICAgICBwcm9ncmVzcyB2YWx1ZSB3aGVuIHRoZXJlIGlzIGEgcGVuZGluZyBV UkwuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExv YWRGb3JGcmFtZSk6IENsZWFyCisgICAgICAgIHBlbmRpbmcgVVJMOyBjbGllbnRzIHNob3VsZCBs b29rIGF0IHRoZSBwcm92aXNpb25hbCBVUkwgbm93LgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOiBDbGVhcgorICAgICAgICBw ZW5kaW5nIFVSTCBpZiBpdCBkb2Vzbid0IG1hdGNoIHRoZSBwb2xpY3kgVVJMOyB0aGlzIG1lYW5z IHdlCisgICAgICAgIHdlcmUgaW50ZXJydXB0ZWQgYnkgYW5vdGhlciBsb2FkLgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpwZW5kaW5nVVJMKTogSGVscGVyIGZ1bmN0aW9uLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmNsZWFyUGVuZGluZ1VSTCk6IGRpdHRvCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6c2V0UGVuZGluZ1VSTCk6IGRpdHRvCisKIDIwMTEtMDEtMjggIEpvbiBIb25leWN1dHQg IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBEb3dubG9hZHMgaW4gV0syIG9uIFdp bmRvd3Mgc2hvdWxkIHdyaXRlIHJlc3VtZSBkYXRhIHRvIGJ1bmRsZQpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDc3MDcxKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMyMCw2ICszMjAsOCBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhh CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFN0cmluZyYgdXJsKQogeworICAg IHNldFBlbmRpbmdVUkwodXJsKTsKKwogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0 dGFjaFRvV2ViUHJvY2VzcygpOwogCkBAIC0zMzAsNiArMzMyLDggQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmxvYWRVUkwoY29uc3QgU3RyaW5nJgogCiB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFVSTFJl cXVlc3QoV2ViVVJMUmVxdWVzdCogdXJsUmVxdWVzdCkKIHsKKyAgICBzZXRQZW5kaW5nVVJMKHVy bFJlcXVlc3QtPnJlc291cmNlUmVxdWVzdCgpLnVybCgpKTsKKwogICAgIGlmICghaXNWYWxpZCgp KQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogCkBAIC0zNzMsNiArMzc3LDggQEAg dm9pZCBXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OnJl bG9hZChib29sIHJlbG9hZEZyb21PcmlnaW4pCiB7CisgICAgc2V0UGVuZGluZ1VSTChtX2JhY2tG b3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+dXJsKCkpOworCiAgICAgaWYgKCFpc1ZhbGlkKCkp IHsKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShtX2JhY2tGb3J3YXJkTGlz dC0+Y3VycmVudEl0ZW0oKSk7CiAgICAgICAgIHJldHVybjsKQEAgLTM4MywxNCArMzg5LDE2IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpyZWxvYWQoYm9vbCByZWxvYWRGcm8KIAogdm9pZCBXZWJQYWdl UHJveHk6OmdvRm9yd2FyZCgpCiB7CisgICAgaWYgKGlzVmFsaWQoKSAmJiAhY2FuR29Gb3J3YXJk KCkpCisgICAgICAgIHJldHVybjsKKworICAgIHNldFBlbmRpbmdVUkwobV9iYWNrRm9yd2FyZExp c3QtPmZvcndhcmRJdGVtKCktPnVybCgpKTsKKwogICAgIGlmICghaXNWYWxpZCgpKSB7CiAgICAg ICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0obV9iYWNrRm9yd2FyZExpc3QtPmZvcndh cmRJdGVtKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFjYW5Hb0Zvcndh cmQoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpHb0ZvcndhcmQobV9iYWNrRm9yd2FyZExpc3QtPmZvcndhcmRJdGVtKCktPml0ZW1J RCgpKSwgbV9wYWdlSUQpOwogfQogCkBAIC00MDEsMTQgKzQwOSwxNiBAQCBib29sIFdlYlBhZ2VQ cm94eTo6Y2FuR29Gb3J3YXJkKCkgY29uc3QKIAogdm9pZCBXZWJQYWdlUHJveHk6OmdvQmFjaygp CiB7CisgICAgaWYgKGlzVmFsaWQoKSAmJiAhY2FuR29CYWNrKCkpCisgICAgICAgIHJldHVybjsK KworICAgIHNldFBlbmRpbmdVUkwobV9iYWNrRm9yd2FyZExpc3QtPmJhY2tJdGVtKCktPnVybCgp KTsKKwogICAgIGlmICghaXNWYWxpZCgpKSB7CiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNz V2l0aEl0ZW0obV9iYWNrRm9yd2FyZExpc3QtPmJhY2tJdGVtKCkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgaWYgKCFjYW5Hb0JhY2soKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAg cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb0JhY2sobV9iYWNrRm9yd2FyZExp c3QtPmJhY2tJdGVtKCktPml0ZW1JRCgpKSwgbV9wYWdlSUQpOwogfQogCkBAIC0xMTgwLDYgKzEx OTAsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlc3RvcmVGcmFtZUZyb21QYQogCiBzdGF0 aWMgY29uc3QgZG91YmxlIGluaXRpYWxQcm9ncmVzc1ZhbHVlID0gMC4xOwogCitkb3VibGUgV2Vi UGFnZVByb3h5Ojplc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0Cit7CisgICAgaWYgKCFwZW5kaW5n VVJMKCkuaXNOdWxsKCkpCisgICAgICAgIHJldHVybiBpbml0aWFsUHJvZ3Jlc3NWYWx1ZTsKKyAg ICByZXR1cm4gbV9lc3RpbWF0ZWRQcm9ncmVzczsgCit9CisKIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRTdGFydFByb2dyZXNzKCkKIHsKICAgICBtX2VzdGltYXRlZFByb2dyZXNzID0gaW5pdGlhbFBy b2dyZXNzVmFsdWU7CkBAIC0xMjAzLDYgKzEyMjAsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk RmluaXNoUHJvZ3Jlc3MoKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBs b2FkaW5nU3Vic3RpdHV0ZURhdGFGb3JVbnJlYWNoYWJsZVVSTCwgQ29yZUlQQzo6QXJndW1lbnRE ZWNvZGVyKiBhcmd1bWVudHMpCiB7CisgICAgY2xlYXJQZW5kaW5nVVJMKCk7CisKICAgICBSZWZQ dHI8QVBJT2JqZWN0PiB1c2VyRGF0YTsKICAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVy IG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBjb250ZXh0KCkpOwogICAgIGlmICghYXJndW1lbnRz LT5kZWNvZGUobWVzc2FnZURlY29kZXIpKQpAQCAtMTQyOSw2ICsxNDQ4LDkgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmZyYW1lRGlkQmVjb21lRnJhbWVTZQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih1aW50NjRfdCBmcmFtZUlELCB1aW50MzJfdCBv cGFxdWVOYXZpZ2F0aW9uVHlwZSwgdWludDMyX3Qgb3BhcXVlTW9kaWZpZXJzLCBpbnQzMl90IG9w YXF1ZU1vdXNlQnV0dG9uLCBjb25zdCBTdHJpbmcmIHVybCwgdWludDY0X3QgbGlzdGVuZXJJRCkK IHsKKyAgICBpZiAodXJsICE9IHBlbmRpbmdVUkwoKSkKKyAgICAgICAgY2xlYXJQZW5kaW5nVVJM KCk7CisKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3MoKS0+d2ViRnJhbWUoZnJh bWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDc3MDcxKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNDAsNyArMjQw LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q3VzdG9tVGV4dEVuY29kaW5nTmFtZShjb25zdCBT dHJpbmcmKTsKICAgICBTdHJpbmcgY3VzdG9tVGV4dEVuY29kaW5nTmFtZSgpIGNvbnN0IHsgcmV0 dXJuIG1fY3VzdG9tVGV4dEVuY29kaW5nTmFtZTsgfQogCi0gICAgZG91YmxlIGVzdGltYXRlZFBy b2dyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9lc3RpbWF0ZWRQcm9ncmVzczsgfQorICAgIGRvdWJs ZSBlc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0OwogCiAgICAgdm9pZCB0ZXJtaW5hdGVQcm9jZXNz KCk7CiAKQEAgLTM3Miw2ICszNzIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBkcmF3UGFnZXNUb1BE RihXZWJGcmFtZVByb3h5KiwgdWludDMyX3QgZmlyc3QsIHVpbnQzMl90IGNvdW50LCBQYXNzUmVm UHRyPERhdGFDYWxsYmFjaz4pOwogI2VuZGlmCiAKKyAgICBjb25zdCBTdHJpbmcmIHBlbmRpbmdV UkwoKSBjb25zdCB7IHJldHVybiBtX3BlbmRpbmdVUkw7IH0KKwogcHJpdmF0ZToKICAgICBXZWJQ YWdlUHJveHkoUGFnZUNsaWVudCosIFdlYkNvbnRleHQqLCBXZWJQYWdlR3JvdXAqLCB1aW50NjRf dCBwYWdlSUQpOwogCkBAIC01NDQsNiArNTQ2LDkgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBT dHJpbmcgc3RhbmRhcmRVc2VyQWdlbnQoY29uc3QgU3RyaW5nJiBhcHBsaWNhdGlvbk5hbWUgPSBT dHJpbmcoKSk7CiAKKyAgICB2b2lkIGNsZWFyUGVuZGluZ1VSTCgpIHsgbV9wZW5kaW5nVVJMID0g U3RyaW5nKCk7IH0KKyAgICB2b2lkIHNldFBlbmRpbmdVUkwoY29uc3QgU3RyaW5nJiBwZW5kaW5n VVJMKSB7IG1fcGVuZGluZ1VSTCA9IHBlbmRpbmdVUkw7IH0KKwogICAgIFBhZ2VDbGllbnQqIG1f cGFnZUNsaWVudDsKICAgICBXZWJMb2FkZXJDbGllbnQgbV9sb2FkZXJDbGllbnQ7CiAgICAgV2Vi UG9saWN5Q2xpZW50IG1fcG9saWN5Q2xpZW50OwpAQCAtNjQzLDYgKzY0OCw4IEBAIHByaXZhdGU6 CiAKICAgICBib29sIG1fbWFpbkZyYW1lSGFzQ3VzdG9tUmVwcmVzZW50YXRpb247CiAgICAgV2Vi Q29yZTo6RHJhZ09wZXJhdGlvbiBtX2N1cnJlbnREcmFnT3BlcmF0aW9uOworCisgICAgU3RyaW5n IG1fcGVuZGluZ1VSTDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDc3MDcxKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQzNSwzICs0MzUsMTAgQEAgdm9pZCBXS1BhZ2VGb3JjZVJlcGFpbnQoV0tQYWdlUmVmIHBh Z2VSZQogewogICAgIHRvSW1wbChwYWdlUmVmKS0+Zm9yY2VSZXBhaW50KFZvaWRDYWxsYmFjazo6 Y3JlYXRlKGNvbnRleHQsIGNhbGxiYWNrKSk7CiB9CisKK1dLX0VYUE9SVCBXS1VSTFJlZiBXS1Bh Z2VDb3B5UGVuZGluZ1VSTChXS1BhZ2VSZWYgcGFnZVJlZikKK3sKKyAgICBpZiAodG9JbXBsKHBh Z2VSZWYpLT5wZW5kaW5nVVJMKCkuaXNOdWxsKCkpCisgICAgICAgIHJldHVybiAwOworICAgIHJl dHVybiB0b0NvcGllZFVSTEFQSSh0b0ltcGwocGFnZVJlZiktPnBlbmRpbmdVUkwoKSk7Cit9Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA3NzA3 MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBj b3B5KQpAQCAtMzQ0LDYgKzM0NCw4IEBAIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUdldENvbnRlbnRz QXNTdHJpbmcKIHR5cGVkZWYgdm9pZCAoKldLUGFnZUZvcmNlUmVwYWludEZ1bmN0aW9uKShXS0Vy cm9yUmVmLCB2b2lkKik7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VGb3JjZVJlcGFpbnQoV0tQYWdl UmVmIHBhZ2UsIHZvaWQqIGNvbnRleHQsIFdLUGFnZUZvcmNlUmVwYWludEZ1bmN0aW9uIGZ1bmN0 aW9uKTsKIAorV0tfRVhQT1JUIFdLVVJMUmVmIFdLUGFnZUNvcHlQZW5kaW5nVVJMKFdLUGFnZVJl ZiBwYWdlKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK