128536 2014-02-10 09:19:36 -0800 [wk2] REGRESSION (r162710): Open tab urls not restored after switching to new Safari build 2014-02-19 12:39:32 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca commit-queue ddkilzer mrowe oldest_to_newest 978909 0 thorton 2014-02-10 09:19:36 -0800 http://trac.webkit.org/changeset/162710 changed the WebBackForwardListCF serialization without providing a way to import sessions in the old format. <rdar://problem/15911839> 978949 1 223723 thorton 2014-02-10 10:25:05 -0800 Created attachment 223723 patch 979151 2 thorton 2014-02-10 17:05:40 -0800 Anders comments that he thinks we should just do the revert of CurrentSessionStateDataVersion and not fail the import if a SnapshotUUID doesn't exist, instead of bumping sessionHistoryCurrentVersion. 982475 3 224660 thorton 2014-02-19 11:45:30 -0800 Created attachment 224660 patch 982481 4 224661 thorton 2014-02-19 11:53:36 -0800 Created attachment 224661 flipped a condition 982503 5 224661 commit-queue 2014-02-19 12:39:29 -0800 Comment on attachment 224661 flipped a condition Clearing flags on attachment: 224661 Committed r164381: <http://trac.webkit.org/changeset/164381> 982504 6 commit-queue 2014-02-19 12:39:32 -0800 All reviewed patches have been landed. Closing bug. 223723 2014-02-10 10:25:05 -0800 2014-02-19 11:45:30 -0800 patch session.diff text/plain 11517 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNWE4ZGZkLi5kNjc0ZTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDItMTAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gUkVHUkVTU0lPTiAocjE2MjcxMCk6IE9wZW4gdGFiIHVybHMgbm90IHJl c3RvcmVkIGFmdGVyIHN3aXRjaGluZyB0byBuZXcgU2FmYXJpIGJ1aWxkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1MzYKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE1OTExODM5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9jZi9XZWJCYWNrRm9yd2FyZExpc3RDRi5jcHA6CisgICAgICAgIChXZWJLaXQ6 OnNlc3Npb25IaXN0b3J5Q3VycmVudFZlcnNpb24pOgorICAgICAgICBCdW1wIHRoZSBjdXJyZW50 IHZlcnNpb24gb2YgdGhlIHNlc3Npb24gaGlzdG9yeSByZXByZXNlbnRhdGlvbi4KKworICAgICAg ICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3Q6OnJlc3RvcmVGcm9tQ0ZEaWN0aW9uYXJ5UmVw cmVzZW50YXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3Q6OnJlc3Rv cmVGcm9tVjBDRkRpY3Rpb25hcnlSZXByZXNlbnRhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Oldl YkJhY2tGb3J3YXJkTGlzdDo6cmVzdG9yZUZyb21WMUNGRGljdGlvbmFyeVJlcHJlc2VudGF0aW9u KToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0OjpyZXN0b3JlRnJvbVYyQ0ZE aWN0aW9uYXJ5UmVwcmVzZW50YXRpb24pOgorICAgICAgICAoV2ViS2l0OjpleHRyYWN0QmFja0Zv cndhcmRMaXN0RW50cmllc0Zyb21BcnJheUZvclYxQW5kQmVsb3cpOgorICAgICAgICAoV2ViS2l0 OjpleHRyYWN0QmFja0ZvcndhcmRMaXN0RW50cmllc0Zyb21BcnJheUZvclYyKToKKyAgICAgICAg QWRkIHZlcnNpb25lZCBpbXBsZW1lbnRhdGlvbnMgb2YgImV4dHJhY3RCYWNrRm9yd2FyZExpc3RF bnRyaWVzRnJvbUFycmF5IiwKKyAgICAgICAgb25lIGZvciBWMSBhbmQgYmVmb3JlIHdoaWNoIGRv ZXNuJ3QgaGF2ZSBzbmFwc2hvdCBVVUlEcywgYW5kIG9uZSBmb3IgVjIKKyAgICAgICAgd2hpY2gg ZG9lcy4KKworICAgICAgICBNYWtlIHVzZSBvZiB0aGUgVjIgdmVyc2lvbiBpbiBhIG5ld2x5IGFk ZGVkIHJlc3RvcmVGcm9tVjJDRkRpY3Rpb25hcnlSZXByZXNlbnRhdGlvbi4KKworICAgICAgICAq IFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHA6CisgICAgICAgIEl0IHR1cm5zIG91dCB0 aGF0IHRoaXMgd2FzIHRoZSB3cm9uZyB2ZXJzaW9uIHRvIGJ1bXAsIGFuZCB3ZSBkb24ndCBzdXBw b3J0CisgICAgICAgIHJlYWRpbmcgZGlmZmVyZW50IHZlcnNpb25zIG9mIHRoZSBzZXNzaW9uIHN0 YXRlIGRhdGEuCisKIDIwMTQtMDItMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gY3JlYXRlIGEgd2VidmlldyBy ZWxhdGVkIHRvIGFub3RoZXIgb25lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQmFja0ZvcndhcmRMaXN0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmFj a0ZvcndhcmRMaXN0LmgKaW5kZXggYmYxM2QzYi4uNGQyYTMzNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuaApAQCAtNzcsNiArNzcsNyBAQCBwdWJs aWM6CiAgICAgYm9vbCByZXN0b3JlRnJvbUNGRGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKENGRGlj dGlvbmFyeVJlZik7CiAgICAgYm9vbCByZXN0b3JlRnJvbVYwQ0ZEaWN0aW9uYXJ5UmVwcmVzZW50 YXRpb24oQ0ZEaWN0aW9uYXJ5UmVmKTsKICAgICBib29sIHJlc3RvcmVGcm9tVjFDRkRpY3Rpb25h cnlSZXByZXNlbnRhdGlvbihDRkRpY3Rpb25hcnlSZWYpOworICAgIGJvb2wgcmVzdG9yZUZyb21W MkNGRGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKENGRGljdGlvbmFyeVJlZik7CiAjZW5kaWYKIAog cHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJCYWNr Rm9yd2FyZExpc3RDRi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViQmFja0Zv cndhcmRMaXN0Q0YuY3BwCmluZGV4IGVkMjIxMTcuLmNkNjUxZDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJCYWNrRm9yd2FyZExpc3RDRi5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYkJhY2tGb3J3YXJkTGlzdENGLmNwcApAQCAtNDcs NyArNDcsNyBAQCBzdGF0aWMgdWludDY0X3QgZ2VuZXJhdGVXZWJCYWNrRm9yd2FyZEl0ZW1JRCgp CiAKIHN0YXRpYyBDRk51bWJlclJlZiBzZXNzaW9uSGlzdG9yeUN1cnJlbnRWZXJzaW9uKCkKIHsK LSAgICBzdGF0aWMgQ0ZJbmRleCBjdXJyZW50VmVyc2lvbkFzQ0ZJbmRleCA9IDE7CisgICAgc3Rh dGljIENGSW5kZXggY3VycmVudFZlcnNpb25Bc0NGSW5kZXggPSAyOwogICAgIHJldHVybiBDRk51 bWJlckNyZWF0ZSgwLCBrQ0ZOdW1iZXJDRkluZGV4VHlwZSwgJmN1cnJlbnRWZXJzaW9uQXNDRklu ZGV4KTsKIH0KIApAQCAtNjAsNyArNjAsOCBAQCBzdGF0aWMgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhp c3RvcnlFbnRyeU9yaWdpbmFsVVJMS2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5RW50cgogc3Rh dGljIENGU3RyaW5nUmVmIHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5ID0gQ0ZTVFIoIlNlc3Np b25IaXN0b3J5RW50cnlEYXRhIik7CiBzdGF0aWMgQ0ZTdHJpbmdSZWYgc2Vzc2lvbkhpc3RvcnlF bnRyeVNuYXBzaG90VVVJREtleSA9IENGU1RSKCJTZXNzaW9uSGlzdG9yeUVudHJ5U25hcHNob3RV VUlEIik7CiAKLXN0YXRpYyBib29sIGV4dHJhY3RCYWNrRm9yd2FyZExpc3RFbnRyaWVzRnJvbUFy cmF5KENGQXJyYXlSZWYsIEJhY2tGb3J3YXJkTGlzdEl0ZW1WZWN0b3ImKTsKK3N0YXRpYyBib29s IGV4dHJhY3RCYWNrRm9yd2FyZExpc3RFbnRyaWVzRnJvbUFycmF5Rm9yVjFBbmRCZWxvdyhDRkFy cmF5UmVmLCBCYWNrRm9yd2FyZExpc3RJdGVtVmVjdG9yJik7CitzdGF0aWMgYm9vbCBleHRyYWN0 QmFja0ZvcndhcmRMaXN0RW50cmllc0Zyb21BcnJheUZvclYyKENGQXJyYXlSZWYsIEJhY2tGb3J3 YXJkTGlzdEl0ZW1WZWN0b3ImKTsKIAogc3RhdGljIENGRGljdGlvbmFyeVJlZiBjcmVhdGVFbXB0 eVNlc3Npb25IaXN0b3J5RGljdGlvbmFyeSgpCiB7CkBAIC0xNjgsNiArMTY5LDkgQEAgYm9vbCBX ZWJCYWNrRm9yd2FyZExpc3Q6OnJlc3RvcmVGcm9tQ0ZEaWN0aW9uYXJ5UmVwcmVzZW50YXRpb24o Q0ZEaWN0aW9uYXJ5UmVmIGQKICAgICBpZiAodmVyc2lvbiA9PSAxKQogICAgICAgICByZXR1cm4g cmVzdG9yZUZyb21WMUNGRGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKGRpY3Rpb25hcnkpOwogICAg IAorICAgIGlmICh2ZXJzaW9uID09IDIpCisgICAgICAgIHJldHVybiByZXN0b3JlRnJvbVYyQ0ZE aWN0aW9uYXJ5UmVwcmVzZW50YXRpb24oZGljdGlvbmFyeSk7CisgICAgCiAgICAgTE9HKFNlc3Np b25TdGF0ZSwgIldlYkJhY2tGb3J3YXJkTGlzdCBkaWN0aW9uYXJ5IHJlcHJlc2VudGF0aW9uIGhh cyBhbiBpbnZhbGlkIGN1cnJlbnQgdmVyc2lvbiAoJWxkKSIsIHZlcnNpb24pOwogICAgIHJldHVy biBmYWxzZTsKIH0KQEAgLTIxMiw3ICsyMTYsNyBAQCBib29sIFdlYkJhY2tGb3J3YXJkTGlzdDo6 cmVzdG9yZUZyb21WMENGRGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKENGRGljdGlvbmFyeVJlZgog ICAgIH0KICAgICAKICAgICBCYWNrRm9yd2FyZExpc3RJdGVtVmVjdG9yIGVudHJpZXM7Ci0gICAg aWYgKCFleHRyYWN0QmFja0ZvcndhcmRMaXN0RW50cmllc0Zyb21BcnJheShjZkVudHJpZXMsIGVu dHJpZXMpKSB7CisgICAgaWYgKCFleHRyYWN0QmFja0ZvcndhcmRMaXN0RW50cmllc0Zyb21BcnJh eUZvclYxQW5kQmVsb3coY2ZFbnRyaWVzLCBlbnRyaWVzKSkgewogICAgICAgICAvLyBleHRyYWN0 QmFja0ZvcndhcmRMaXN0RW50cmllc0Zyb21BcnJheSBoYXMgYWxyZWFkeSBsb2dnZWQgdGhlIGFw cHJvcHJpYXRlIGVycm9yIG1lc3NhZ2UuCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBA IC0yNjcsNyArMjcxLDcgQEAgYm9vbCBXZWJCYWNrRm9yd2FyZExpc3Q6OnJlc3RvcmVGcm9tVjFD RkRpY3Rpb25hcnlSZXByZXNlbnRhdGlvbihDRkRpY3Rpb25hcnlSZWYKICAgICB9CiAgICAgCiAg ICAgQmFja0ZvcndhcmRMaXN0SXRlbVZlY3RvciBlbnRyaWVzOwotICAgIGlmICghZXh0cmFjdEJh Y2tGb3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXkoY2ZFbnRyaWVzLCBlbnRyaWVzKSkgeworICAg IGlmICghZXh0cmFjdEJhY2tGb3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXlGb3JWMUFuZEJlbG93 KGNmRW50cmllcywgZW50cmllcykpIHsKICAgICAgICAgLy8gZXh0cmFjdEJhY2tGb3J3YXJkTGlz dEVudHJpZXNGcm9tQXJyYXkgaGFzIGFscmVhZHkgbG9nZ2VkIHRoZSBhcHByb3ByaWF0ZSBlcnJv ciBtZXNzYWdlLgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMjgwLDggKzI4NCw2 MyBAQCBib29sIFdlYkJhY2tGb3J3YXJkTGlzdDo6cmVzdG9yZUZyb21WMUNGRGljdGlvbmFyeVJl cHJlc2VudGF0aW9uKENGRGljdGlvbmFyeVJlZgogCiAgICAgcmV0dXJuIHRydWU7CiB9CisgICAg Citib29sIFdlYkJhY2tGb3J3YXJkTGlzdDo6cmVzdG9yZUZyb21WMkNGRGljdGlvbmFyeVJlcHJl c2VudGF0aW9uKENGRGljdGlvbmFyeVJlZiBkaWN0aW9uYXJ5KQoreworICAgIENGTnVtYmVyUmVm IGNmSW5kZXggPSAoQ0ZOdW1iZXJSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZGljdGlvbmFyeSwg c2Vzc2lvbkhpc3RvcnlDdXJyZW50SW5kZXhLZXkpOworICAgIGlmICghY2ZJbmRleCkgeworICAg ICAgICAvLyBObyBjdXJyZW50IGluZGV4IG1lYW5zIHRoZSBkaWN0aW9uYXJ5IHJlcHJlc2VudHMg YW4gZW1wdHkgc2Vzc2lvbi4KKyAgICAgICAgbV9oYXNDdXJyZW50SW5kZXggPSBmYWxzZTsKKyAg ICAgICAgbV9jdXJyZW50SW5kZXggPSAwOworICAgICAgICBtX2VudHJpZXMuY2xlYXIoKTsKKyAg ICAgICAgCisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICAKKyAgICBpZiAoQ0ZHZXRU eXBlSUQoY2ZJbmRleCkgIT0gQ0ZOdW1iZXJHZXRUeXBlSUQoKSkgeworICAgICAgICBMT0coU2Vz c2lvblN0YXRlLCAiV2ViQmFja0ZvcndhcmRMaXN0IGRpY3Rpb25hcnkgcmVwcmVzZW50YXRpb24g ZG9lcyBub3QgaGF2ZSBhIHZhbGlkIGN1cnJlbnQgaW5kZXgiKTsKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KKyAgICAKKyAgICBDRkluZGV4IGN1cnJlbnRDRkluZGV4OworICAgIGlmICgh Q0ZOdW1iZXJHZXRWYWx1ZShjZkluZGV4LCBrQ0ZOdW1iZXJDRkluZGV4VHlwZSwgJmN1cnJlbnRD RkluZGV4KSkgeworICAgICAgICBMT0coU2Vzc2lvblN0YXRlLCAiV2ViQmFja0ZvcndhcmRMaXN0 IGRpY3Rpb25hcnkgcmVwcmVzZW50YXRpb24gZG9lcyBub3QgaGF2ZSBhIGNvcnJlY3RseSB0eXBl ZCBjdXJyZW50IGluZGV4Iik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgCisg ICAgaWYgKGN1cnJlbnRDRkluZGV4IDwgMCkgeworICAgICAgICBMT0coU2Vzc2lvblN0YXRlLCAi V2ViQmFja0ZvcndhcmRMaXN0IGRpY3Rpb25hcnkgcmVwcmVzZW50YXRpb24gY29udGFpbnMgYW4g dW5leHBlY3RlZCBuZWdhdGl2ZSBjdXJyZW50IGluZGV4ICglbGQpIiwgY3VycmVudENGSW5kZXgp OworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIAorICAgIENGQXJyYXlSZWYgY2ZF bnRyaWVzID0gKENGQXJyYXlSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUoZGljdGlvbmFyeSwgc2Vz c2lvbkhpc3RvcnlFbnRyaWVzS2V5KTsKKyAgICBpZiAoIWNmRW50cmllcyB8fCBDRkdldFR5cGVJ RChjZkVudHJpZXMpICE9IENGQXJyYXlHZXRUeXBlSUQoKSkgeworICAgICAgICBMT0coU2Vzc2lv blN0YXRlLCAiV2ViQmFja0ZvcndhcmRMaXN0IGRpY3Rpb25hcnkgcmVwcmVzZW50YXRpb24gZG9l cyBub3QgaGF2ZSBhIHZhbGlkIGxpc3Qgb2YgZW50cmllcyIpOworICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgfQorICAgIAorICAgIENGSW5kZXggc2l6ZSA9IENGQXJyYXlHZXRDb3VudChjZkVu dHJpZXMpOworICAgIGlmIChjdXJyZW50Q0ZJbmRleCA+PSBzaXplKSB7CisgICAgICAgIExPRyhT ZXNzaW9uU3RhdGUsICJXZWJCYWNrRm9yd2FyZExpc3QgZGljdGlvbmFyeSByZXByZXNlbnRhdGlv biBjb250YWlucyBhbiBpbnZhbGlkIGN1cnJlbnQgaW5kZXggKCVsZCkgZm9yIHRoZSBudW1iZXIg b2YgZW50cmllcyAoJWxkKSIsIGN1cnJlbnRDRkluZGV4LCBzaXplKTsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0KKyAgICAKKyAgICBCYWNrRm9yd2FyZExpc3RJdGVtVmVjdG9yIGVudHJp ZXM7CisgICAgaWYgKCFleHRyYWN0QmFja0ZvcndhcmRMaXN0RW50cmllc0Zyb21BcnJheUZvclYy KGNmRW50cmllcywgZW50cmllcykpIHsKKyAgICAgICAgLy8gZXh0cmFjdEJhY2tGb3J3YXJkTGlz dEVudHJpZXNGcm9tQXJyYXkgaGFzIGFscmVhZHkgbG9nZ2VkIHRoZSBhcHByb3ByaWF0ZSBlcnJv ciBtZXNzYWdlLgorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIAorICAgIEFTU0VS VChlbnRyaWVzLnNpemUoKSA9PSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oc2l6ZSkpOworICAgIAor ICAgIG1faGFzQ3VycmVudEluZGV4ID0gdHJ1ZTsKKyAgICBtX2N1cnJlbnRJbmRleCA9IHN0YXRp Y19jYXN0PHVpbnQzMl90PihjdXJyZW50Q0ZJbmRleCk7CisgICAgbV9lbnRyaWVzID0gZW50cmll czsKKyAgICAKKyAgICByZXR1cm4gdHJ1ZTsKK30KIAotc3RhdGljIGJvb2wgZXh0cmFjdEJhY2tG b3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXkoQ0ZBcnJheVJlZiBjZkVudHJpZXMsIEJhY2tGb3J3 YXJkTGlzdEl0ZW1WZWN0b3ImIGVudHJpZXMpCitzdGF0aWMgYm9vbCBleHRyYWN0QmFja0Zvcndh cmRMaXN0RW50cmllc0Zyb21BcnJheUZvclYxQW5kQmVsb3coQ0ZBcnJheVJlZiBjZkVudHJpZXMs IEJhY2tGb3J3YXJkTGlzdEl0ZW1WZWN0b3ImIGVudHJpZXMpCiB7CiAgICAgQ0ZJbmRleCBzaXpl ID0gQ0ZBcnJheUdldENvdW50KGNmRW50cmllcyk7CiAKQEAgLTMxMSwyMyArMzcwLDY1IEBAIHN0 YXRpYyBib29sIGV4dHJhY3RCYWNrRm9yd2FyZExpc3RFbnRyaWVzRnJvbUFycmF5KENGQXJyYXlS ZWYgY2ZFbnRyaWVzLCBCYWNrRm9yCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg IH0KIAorICAgICAgICBDRkRhdGFSZWYgYmFja0ZvcndhcmREYXRhID0gKENGRGF0YVJlZilDRkRp Y3Rpb25hcnlHZXRWYWx1ZShlbnRyeURpY3Rpb25hcnksIHNlc3Npb25IaXN0b3J5RW50cnlEYXRh S2V5KTsKKyAgICAgICAgaWYgKCFiYWNrRm9yd2FyZERhdGEgfHwgQ0ZHZXRUeXBlSUQoYmFja0Zv cndhcmREYXRhKSAhPSBDRkRhdGFHZXRUeXBlSUQoKSkgeworICAgICAgICAgICAgTE9HKFNlc3Np b25TdGF0ZSwgIldlYkJhY2tGb3J3YXJkTGlzdCBlbnRyeSBhdCBpbmRleCAlaSBkb2VzIG5vdCBo YXZlIGJhY2svZm9yd2FyZCBkYXRhIiwgKGludClpKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgfQorCisgICAgICAgIGVudHJpZXMuYXBwZW5kKFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW06OmNyZWF0ZShvcmlnaW5hbFVSTCwgZW50cnlVUkwsIGVudHJ5VGl0bGUsIENGRGF0YUdl dEJ5dGVQdHIoYmFja0ZvcndhcmREYXRhKSwgQ0ZEYXRhR2V0TGVuZ3RoKGJhY2tGb3J3YXJkRGF0 YSksIGdlbmVyYXRlV2ViQmFja0ZvcndhcmRJdGVtSUQoKSkpOworICAgIH0KKworICAgIHJldHVy biB0cnVlOworfQorICAgIAorc3RhdGljIGJvb2wgZXh0cmFjdEJhY2tGb3J3YXJkTGlzdEVudHJp ZXNGcm9tQXJyYXlGb3JWMihDRkFycmF5UmVmIGNmRW50cmllcywgQmFja0ZvcndhcmRMaXN0SXRl bVZlY3RvciYgZW50cmllcykKK3sKKyAgICBDRkluZGV4IHNpemUgPSBDRkFycmF5R2V0Q291bnQo Y2ZFbnRyaWVzKTsKKyAgICAKKyAgICBlbnRyaWVzLnJlc2VydmVDYXBhY2l0eShzaXplKTsKKyAg ICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKKyAgICAgICAgQ0ZEaWN0aW9u YXJ5UmVmIGVudHJ5RGljdGlvbmFyeSA9IChDRkRpY3Rpb25hcnlSZWYpQ0ZBcnJheUdldFZhbHVl QXRJbmRleChjZkVudHJpZXMsIGkpOworICAgICAgICBpZiAoIWVudHJ5RGljdGlvbmFyeSB8fCBD RkdldFR5cGVJRChlbnRyeURpY3Rpb25hcnkpICE9IENGRGljdGlvbmFyeUdldFR5cGVJRCgpKSB7 CisgICAgICAgICAgICBMT0coU2Vzc2lvblN0YXRlLCAiV2ViQmFja0ZvcndhcmRMaXN0IGVudHJ5 IGFycmF5IGRvZXMgbm90IGhhdmUgYSB2YWxpZCBlbnRyeSBhdCBpbmRleCAlaSIsIChpbnQpaSk7 CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IENGU3RyaW5nUmVmIGVudHJ5VVJMID0gKENGU3RyaW5nUmVmKUNGRGljdGlvbmFyeUdldFZhbHVl KGVudHJ5RGljdGlvbmFyeSwgc2Vzc2lvbkhpc3RvcnlFbnRyeVVSTEtleSk7CisgICAgICAgIGlm ICghZW50cnlVUkwgfHwgQ0ZHZXRUeXBlSUQoZW50cnlVUkwpICE9IENGU3RyaW5nR2V0VHlwZUlE KCkpIHsKKyAgICAgICAgICAgIExPRyhTZXNzaW9uU3RhdGUsICJXZWJCYWNrRm9yd2FyZExpc3Qg ZW50cnkgYXQgaW5kZXggJWkgZG9lcyBub3QgaGF2ZSBhIHZhbGlkIFVSTCIsIChpbnQpaSk7Cisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIENG U3RyaW5nUmVmIGVudHJ5VGl0bGUgPSAoQ0ZTdHJpbmdSZWYpQ0ZEaWN0aW9uYXJ5R2V0VmFsdWUo ZW50cnlEaWN0aW9uYXJ5LCBzZXNzaW9uSGlzdG9yeUVudHJ5VGl0bGVLZXkpOworICAgICAgICBp ZiAoIWVudHJ5VGl0bGUgfHwgQ0ZHZXRUeXBlSUQoZW50cnlUaXRsZSkgIT0gQ0ZTdHJpbmdHZXRU eXBlSUQoKSkgeworICAgICAgICAgICAgTE9HKFNlc3Npb25TdGF0ZSwgIldlYkJhY2tGb3J3YXJk TGlzdCBlbnRyeSBhdCBpbmRleCAlaSBkb2VzIG5vdCBoYXZlIGEgdmFsaWQgdGl0bGUiLCAoaW50 KWkpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAgIAorICAg ICAgICBDRlN0cmluZ1JlZiBvcmlnaW5hbFVSTCA9IChDRlN0cmluZ1JlZilDRkRpY3Rpb25hcnlH ZXRWYWx1ZShlbnRyeURpY3Rpb25hcnksIHNlc3Npb25IaXN0b3J5RW50cnlPcmlnaW5hbFVSTEtl eSk7CisgICAgICAgIGlmICghb3JpZ2luYWxVUkwgfHwgQ0ZHZXRUeXBlSUQob3JpZ2luYWxVUkwp ICE9IENGU3RyaW5nR2V0VHlwZUlEKCkpIHsKKyAgICAgICAgICAgIExPRyhTZXNzaW9uU3RhdGUs ICJXZWJCYWNrRm9yd2FyZExpc3QgZW50cnkgYXQgaW5kZXggJWkgZG9lcyBub3QgaGF2ZSBhIHZh bGlkIG9yaWdpbmFsIFVSTCIsIChpbnQpaSk7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIH0KKyAgICAgICAgCiAgICAgICAgIENGU3RyaW5nUmVmIHNuYXBzaG90VVVJRCA9IChD RlN0cmluZ1JlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShlbnRyeURpY3Rpb25hcnksIHNlc3Npb25I aXN0b3J5RW50cnlTbmFwc2hvdFVVSURLZXkpOwogICAgICAgICBpZiAoIXNuYXBzaG90VVVJRCB8 fCBDRkdldFR5cGVJRChzbmFwc2hvdFVVSUQpICE9IENGU3RyaW5nR2V0VHlwZUlEKCkpIHsKICAg ICAgICAgICAgIExPRyhTZXNzaW9uU3RhdGUsICJXZWJCYWNrRm9yd2FyZExpc3QgZW50cnkgYXQg aW5kZXggJWkgZG9lcyBub3QgaGF2ZSBhIHZhbGlkIHNuYXBzaG90IFVVSUQiLCAoaW50KWkpOwog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0KKyAgICAgICAgCiAgICAgICAg IENGRGF0YVJlZiBiYWNrRm9yd2FyZERhdGEgPSAoQ0ZEYXRhUmVmKUNGRGljdGlvbmFyeUdldFZh bHVlKGVudHJ5RGljdGlvbmFyeSwgc2Vzc2lvbkhpc3RvcnlFbnRyeURhdGFLZXkpOwogICAgICAg ICBpZiAoIWJhY2tGb3J3YXJkRGF0YSB8fCBDRkdldFR5cGVJRChiYWNrRm9yd2FyZERhdGEpICE9 IENGRGF0YUdldFR5cGVJRCgpKSB7CiAgICAgICAgICAgICBMT0coU2Vzc2lvblN0YXRlLCAiV2Vi QmFja0ZvcndhcmRMaXN0IGVudHJ5IGF0IGluZGV4ICVpIGRvZXMgbm90IGhhdmUgYmFjay9mb3J3 YXJkIGRhdGEiLCAoaW50KWkpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9 Ci0KKyAgICAgICAgCiAgICAgICAgIGF1dG8gaXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06 OmNyZWF0ZShvcmlnaW5hbFVSTCwgZW50cnlVUkwsIGVudHJ5VGl0bGUsIENGRGF0YUdldEJ5dGVQ dHIoYmFja0ZvcndhcmREYXRhKSwgQ0ZEYXRhR2V0TGVuZ3RoKGJhY2tGb3J3YXJkRGF0YSksIGdl bmVyYXRlV2ViQmFja0ZvcndhcmRJdGVtSUQoKSk7CiAgICAgICAgIGl0ZW0tPnNldFNuYXBzaG90 VVVJRChzbmFwc2hvdFVVSUQpOwogICAgICAgICBlbnRyaWVzLmFwcGVuZChpdGVtKTsKICAgICB9 Ci0KKyAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAKaW5kZXggYzE5MTM1YS4uMzNiYjUxNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5Q0YuY3BwCkBAIC00NCw3 ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogc3RhdGljIENGU3RyaW5nUmVmIHNlc3Npb25I aXN0b3J5S2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5Iik7CiBzdGF0aWMgQ0ZTdHJpbmdSZWYg cHJvdmlzaW9uYWxVUkxLZXkgPSBDRlNUUigiUHJvdmlzaW9uYWxVUkwiKTsKIAotc3RhdGljIGNv bnN0IFVJbnQzMiBDdXJyZW50U2Vzc2lvblN0YXRlRGF0YVZlcnNpb24gPSAzOworc3RhdGljIGNv bnN0IFVJbnQzMiBDdXJyZW50U2Vzc2lvblN0YXRlRGF0YVZlcnNpb24gPSAyOwogCiBQYXNzUmVm UHRyPEFQSTo6RGF0YT4gV2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGVEYXRhKFdlYlBhZ2VQcm94 eVNlc3Npb25TdGF0ZUZpbHRlckNhbGxiYWNrIGZpbHRlciwgdm9pZCogY29udGV4dCkgY29uc3QK IHsK 224660 2014-02-19 11:45:30 -0800 2014-02-19 11:53:36 -0800 patch restore.diff text/plain 3324 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3NjUyZjExLi43YmI1OWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDItMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gUkVHUkVTU0lPTiAocjE2MjcxMCk6IE9wZW4gdGFiIHVybHMgbm90IHJl c3RvcmVkIGFmdGVyIHN3aXRjaGluZyB0byBuZXcgU2FmYXJpIGJ1aWxkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1MzYKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE1OTExODM5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL2NmL1dlYkJhY2tGb3J3YXJkTGlzdENGLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6ZXh0cmFjdEJhY2tGb3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXkpOgor ICAgICAgICBEb24ndCBmYWlsIHRvIGV4dHJhY3QgYW4gZW50cnkgaWYgaXQgZG9lc24ndCBoYXZl IGEgc25hcHNob3QgVVVJRC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlD Ri5jcHA6CisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IHRoaXMgd2FzIHRoZSB3cm9uZyB2ZXJz aW9uIHRvIGJ1bXAsIGFuZCB3ZSBkb24ndCBzdXBwb3J0CisgICAgICAgIHJlYWRpbmcgZGlmZmVy ZW50IHZlcnNpb25zIG9mIHRoZSBzZXNzaW9uIHN0YXRlIGRhdGEuCisKIDIwMTQtMDItMTkgIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBGZWF0dXJlRGVm aW5lcyBmb3IgaW1hZ2UgY29udHJvbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9jZi9XZWJCYWNrRm9yd2FyZExpc3RDRi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvY2YvV2ViQmFja0ZvcndhcmRMaXN0Q0YuY3BwCmluZGV4IGVkMjIxMTcuLjE1OWU0ZjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJCYWNrRm9yd2FyZExpc3RD Ri5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYkJhY2tGb3J3YXJkTGlz dENGLmNwcApAQCAtMzExLDEyICszMTEsNiBAQCBzdGF0aWMgYm9vbCBleHRyYWN0QmFja0Zvcndh cmRMaXN0RW50cmllc0Zyb21BcnJheShDRkFycmF5UmVmIGNmRW50cmllcywgQmFja0ZvcgogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKLSAgICAgICAgQ0ZTdHJpbmdSZWYg c25hcHNob3RVVUlEID0gKENGU3RyaW5nUmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGVudHJ5RGlj dGlvbmFyeSwgc2Vzc2lvbkhpc3RvcnlFbnRyeVNuYXBzaG90VVVJREtleSk7Ci0gICAgICAgIGlm ICghc25hcHNob3RVVUlEIHx8IENGR2V0VHlwZUlEKHNuYXBzaG90VVVJRCkgIT0gQ0ZTdHJpbmdH ZXRUeXBlSUQoKSkgewotICAgICAgICAgICAgTE9HKFNlc3Npb25TdGF0ZSwgIldlYkJhY2tGb3J3 YXJkTGlzdCBlbnRyeSBhdCBpbmRleCAlaSBkb2VzIG5vdCBoYXZlIGEgdmFsaWQgc25hcHNob3Qg VVVJRCIsIChpbnQpaSk7Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLQog ICAgICAgICBDRkRhdGFSZWYgYmFja0ZvcndhcmREYXRhID0gKENGRGF0YVJlZilDRkRpY3Rpb25h cnlHZXRWYWx1ZShlbnRyeURpY3Rpb25hcnksIHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5KTsK ICAgICAgICAgaWYgKCFiYWNrRm9yd2FyZERhdGEgfHwgQ0ZHZXRUeXBlSUQoYmFja0ZvcndhcmRE YXRhKSAhPSBDRkRhdGFHZXRUeXBlSUQoKSkgewogICAgICAgICAgICAgTE9HKFNlc3Npb25TdGF0 ZSwgIldlYkJhY2tGb3J3YXJkTGlzdCBlbnRyeSBhdCBpbmRleCAlaSBkb2VzIG5vdCBoYXZlIGJh Y2svZm9yd2FyZCBkYXRhIiwgKGludClpKTsKQEAgLTMyNCw3ICszMTgsMTEgQEAgc3RhdGljIGJv b2wgZXh0cmFjdEJhY2tGb3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXkoQ0ZBcnJheVJlZiBjZkVu dHJpZXMsIEJhY2tGb3IKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gaXRlbSA9IFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShvcmlnaW5hbFVSTCwgZW50cnlVUkwsIGVudHJ5VGl0bGUs IENGRGF0YUdldEJ5dGVQdHIoYmFja0ZvcndhcmREYXRhKSwgQ0ZEYXRhR2V0TGVuZ3RoKGJhY2tG b3J3YXJkRGF0YSksIGdlbmVyYXRlV2ViQmFja0ZvcndhcmRJdGVtSUQoKSk7Ci0gICAgICAgIGl0 ZW0tPnNldFNuYXBzaG90VVVJRChzbmFwc2hvdFVVSUQpOworCisgICAgICAgIENGU3RyaW5nUmVm IHNuYXBzaG90VVVJRCA9IChDRlN0cmluZ1JlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShlbnRyeURp Y3Rpb25hcnksIHNlc3Npb25IaXN0b3J5RW50cnlTbmFwc2hvdFVVSURLZXkpOworICAgICAgICBp ZiAoc25hcHNob3RVVUlEICYmIENGR2V0VHlwZUlEKHNuYXBzaG90VVVJRCkgIT0gQ0ZTdHJpbmdH ZXRUeXBlSUQoKSkKKyAgICAgICAgICAgIGl0ZW0tPnNldFNuYXBzaG90VVVJRChzbmFwc2hvdFVV SUQpOworCiAgICAgICAgIGVudHJpZXMuYXBwZW5kKGl0ZW0pOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAKaW5kZXggYzE5MTM1YS4u MzNiYjUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQ cm94eUNGLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5 Q0YuY3BwCkBAIC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogc3RhdGljIENGU3Ry aW5nUmVmIHNlc3Npb25IaXN0b3J5S2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5Iik7CiBzdGF0 aWMgQ0ZTdHJpbmdSZWYgcHJvdmlzaW9uYWxVUkxLZXkgPSBDRlNUUigiUHJvdmlzaW9uYWxVUkwi KTsKIAotc3RhdGljIGNvbnN0IFVJbnQzMiBDdXJyZW50U2Vzc2lvblN0YXRlRGF0YVZlcnNpb24g PSAzOworc3RhdGljIGNvbnN0IFVJbnQzMiBDdXJyZW50U2Vzc2lvblN0YXRlRGF0YVZlcnNpb24g PSAyOwogCiBQYXNzUmVmUHRyPEFQSTo6RGF0YT4gV2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGVE YXRhKFdlYlBhZ2VQcm94eVNlc3Npb25TdGF0ZUZpbHRlckNhbGxiYWNrIGZpbHRlciwgdm9pZCog Y29udGV4dCkgY29uc3QKIHsK 224661 2014-02-19 11:53:36 -0800 2014-02-19 12:39:29 -0800 flipped a condition restore.diff text/plain 3324 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3NjUyZjExLi43YmI1OWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDItMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gUkVHUkVTU0lPTiAocjE2MjcxMCk6IE9wZW4gdGFiIHVybHMgbm90IHJl c3RvcmVkIGFmdGVyIHN3aXRjaGluZyB0byBuZXcgU2FmYXJpIGJ1aWxkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1MzYKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzE1OTExODM5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL2NmL1dlYkJhY2tGb3J3YXJkTGlzdENGLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6ZXh0cmFjdEJhY2tGb3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXkpOgor ICAgICAgICBEb24ndCBmYWlsIHRvIGV4dHJhY3QgYW4gZW50cnkgaWYgaXQgZG9lc24ndCBoYXZl IGEgc25hcHNob3QgVVVJRC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlD Ri5jcHA6CisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IHRoaXMgd2FzIHRoZSB3cm9uZyB2ZXJz aW9uIHRvIGJ1bXAsIGFuZCB3ZSBkb24ndCBzdXBwb3J0CisgICAgICAgIHJlYWRpbmcgZGlmZmVy ZW50IHZlcnNpb25zIG9mIHRoZSBzZXNzaW9uIHN0YXRlIGRhdGEuCisKIDIwMTQtMDItMTkgIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBGZWF0dXJlRGVm aW5lcyBmb3IgaW1hZ2UgY29udHJvbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9jZi9XZWJCYWNrRm9yd2FyZExpc3RDRi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvY2YvV2ViQmFja0ZvcndhcmRMaXN0Q0YuY3BwCmluZGV4IGVkMjIxMTcuLjI5MjRmZWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJCYWNrRm9yd2FyZExpc3RD Ri5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYkJhY2tGb3J3YXJkTGlz dENGLmNwcApAQCAtMzExLDEyICszMTEsNiBAQCBzdGF0aWMgYm9vbCBleHRyYWN0QmFja0Zvcndh cmRMaXN0RW50cmllc0Zyb21BcnJheShDRkFycmF5UmVmIGNmRW50cmllcywgQmFja0ZvcgogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKLSAgICAgICAgQ0ZTdHJpbmdSZWYg c25hcHNob3RVVUlEID0gKENGU3RyaW5nUmVmKUNGRGljdGlvbmFyeUdldFZhbHVlKGVudHJ5RGlj dGlvbmFyeSwgc2Vzc2lvbkhpc3RvcnlFbnRyeVNuYXBzaG90VVVJREtleSk7Ci0gICAgICAgIGlm ICghc25hcHNob3RVVUlEIHx8IENGR2V0VHlwZUlEKHNuYXBzaG90VVVJRCkgIT0gQ0ZTdHJpbmdH ZXRUeXBlSUQoKSkgewotICAgICAgICAgICAgTE9HKFNlc3Npb25TdGF0ZSwgIldlYkJhY2tGb3J3 YXJkTGlzdCBlbnRyeSBhdCBpbmRleCAlaSBkb2VzIG5vdCBoYXZlIGEgdmFsaWQgc25hcHNob3Qg VVVJRCIsIChpbnQpaSk7Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLQog ICAgICAgICBDRkRhdGFSZWYgYmFja0ZvcndhcmREYXRhID0gKENGRGF0YVJlZilDRkRpY3Rpb25h cnlHZXRWYWx1ZShlbnRyeURpY3Rpb25hcnksIHNlc3Npb25IaXN0b3J5RW50cnlEYXRhS2V5KTsK ICAgICAgICAgaWYgKCFiYWNrRm9yd2FyZERhdGEgfHwgQ0ZHZXRUeXBlSUQoYmFja0ZvcndhcmRE YXRhKSAhPSBDRkRhdGFHZXRUeXBlSUQoKSkgewogICAgICAgICAgICAgTE9HKFNlc3Npb25TdGF0 ZSwgIldlYkJhY2tGb3J3YXJkTGlzdCBlbnRyeSBhdCBpbmRleCAlaSBkb2VzIG5vdCBoYXZlIGJh Y2svZm9yd2FyZCBkYXRhIiwgKGludClpKTsKQEAgLTMyNCw3ICszMTgsMTEgQEAgc3RhdGljIGJv b2wgZXh0cmFjdEJhY2tGb3J3YXJkTGlzdEVudHJpZXNGcm9tQXJyYXkoQ0ZBcnJheVJlZiBjZkVu dHJpZXMsIEJhY2tGb3IKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gaXRlbSA9IFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShvcmlnaW5hbFVSTCwgZW50cnlVUkwsIGVudHJ5VGl0bGUs IENGRGF0YUdldEJ5dGVQdHIoYmFja0ZvcndhcmREYXRhKSwgQ0ZEYXRhR2V0TGVuZ3RoKGJhY2tG b3J3YXJkRGF0YSksIGdlbmVyYXRlV2ViQmFja0ZvcndhcmRJdGVtSUQoKSk7Ci0gICAgICAgIGl0 ZW0tPnNldFNuYXBzaG90VVVJRChzbmFwc2hvdFVVSUQpOworCisgICAgICAgIENGU3RyaW5nUmVm IHNuYXBzaG90VVVJRCA9IChDRlN0cmluZ1JlZilDRkRpY3Rpb25hcnlHZXRWYWx1ZShlbnRyeURp Y3Rpb25hcnksIHNlc3Npb25IaXN0b3J5RW50cnlTbmFwc2hvdFVVSURLZXkpOworICAgICAgICBp ZiAoc25hcHNob3RVVUlEICYmIENGR2V0VHlwZUlEKHNuYXBzaG90VVVJRCkgPT0gQ0ZTdHJpbmdH ZXRUeXBlSUQoKSkKKyAgICAgICAgICAgIGl0ZW0tPnNldFNuYXBzaG90VVVJRChzbmFwc2hvdFVV SUQpOworCiAgICAgICAgIGVudHJpZXMuYXBwZW5kKGl0ZW0pOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQcm94eUNGLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9jZi9XZWJQYWdlUHJveHlDRi5jcHAKaW5kZXggYzE5MTM1YS4u MzNiYjUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dlYlBhZ2VQ cm94eUNGLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViUGFnZVByb3h5 Q0YuY3BwCkBAIC00NCw3ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogc3RhdGljIENGU3Ry aW5nUmVmIHNlc3Npb25IaXN0b3J5S2V5ID0gQ0ZTVFIoIlNlc3Npb25IaXN0b3J5Iik7CiBzdGF0 aWMgQ0ZTdHJpbmdSZWYgcHJvdmlzaW9uYWxVUkxLZXkgPSBDRlNUUigiUHJvdmlzaW9uYWxVUkwi KTsKIAotc3RhdGljIGNvbnN0IFVJbnQzMiBDdXJyZW50U2Vzc2lvblN0YXRlRGF0YVZlcnNpb24g PSAzOworc3RhdGljIGNvbnN0IFVJbnQzMiBDdXJyZW50U2Vzc2lvblN0YXRlRGF0YVZlcnNpb24g PSAyOwogCiBQYXNzUmVmUHRyPEFQSTo6RGF0YT4gV2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGVE YXRhKFdlYlBhZ2VQcm94eVNlc3Npb25TdGF0ZUZpbHRlckNhbGxiYWNrIGZpbHRlciwgdm9pZCog Y29udGV4dCkgY29uc3QKIHsK