110652 2013-02-22 15:31:48 -0800 add to HistoryItem a way to know if its underlying CachedPage has expired 2013-03-14 00:34:04 -0700 1 1 1 Unclassified WebKit History 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alice.barraclough alice.barraclough beidson buildbot ddkilzer joepeck rniwa oldest_to_newest 840064 0 alice.barraclough 2013-02-22 15:31:48 -0800 Add to HistoryItem a way to know if its underlying CachedPage has expired. This inevitably touches some existing code that has hard-coded the expiration time for a back/forward PageCached-item to 1800. It was okay to have hard-coded these because the FIXMEs made it okay. Fixmes make everything okay. 840080 1 189853 alice.barraclough 2013-02-22 15:54:49 -0800 Created attachment 189853 not for review, just running through bots 840181 2 189853 buildbot 2013-02-22 17:46:32 -0800 Comment on attachment 189853 not for review, just running through bots Attachment 189853 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16719342 840220 3 189888 alice.barraclough 2013-02-22 18:13:41 -0800 Created attachment 189888 patch 842205 4 189888 beidson 2013-02-26 11:17:30 -0800 Comment on attachment 189888 patch View in context: https://bugs.webkit.org/attachment.cgi?id=189888&action=review r+ with that change > Source/WebCore/history/CachedPage.cpp:56 > : m_timeStamp(currentTime()) > + , m_expiration(m_timeStamp + page->settings()->backForwardCacheExpirationInterval()) > , m_cachedMainFrame(CachedFrame::create(page->mainFrame())) Could this be m_expirationTime instead? > Source/WebCore/history/CachedPage.cpp:122 > +bool CachedPage::hasExpired() const > +{ > + return currentTime() > m_expiration; > +} If it was, this code would read more naturally. 855021 5 alice.barraclough 2013-03-14 00:34:04 -0700 committed r145789 189853 2013-02-22 15:54:49 -0800 2013-02-22 18:13:41 -0800 not for review, just running through bots 110652-hasCachedPageExpired-take1.patch text/plain 13355 alice.barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzgwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIyICBBbGljZSBC YXJyYWNsb3VnaCAgPGFsaWNlLmJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQg dG8gSGlzdG9yeUl0ZW0gYSB3YXkgdG8ga25vdyBpZiBpdHMgdW5kZXJseWluZyBDYWNoZWRQYWdl IGhhcyBleHBpcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTEwNjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJDb3JlLmV4cC5pbjogQWRkZWQgV2ViQ29yZTo6SGlzdG9yeUl0ZW06OmlzSW5Q YWdlQ2FjaGUgYW5kIGhhc0NhY2hlZFBhZ2VFeHBpcmVkLgorICAgICAgICAqIGhpc3RvcnkvQ2Fj aGVkUGFnZS5jcHA6IEFkZCBhIGRhdGEgbWVtYmVyLCBtX2V4cGlyYXRpb24sIGFuZCBhIGZ1bmN0 aW9uLCBoYXNFeHBpcmVkKCkuCisgICAgICAgICogaGlzdG9yeS9DYWNoZWRQYWdlLmg6CisgICAg ICAgICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5 SXRlbTo6aGFzQ2FjaGVkUGFnZUV4cGlyZWQpOiBBZGRlZC4gcmV0dXJucyBtX2NhY2hlZFBhZ2Un cyBleHBpcmF0aW9uIHN0YXRlLgorICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uaDoKKyAg ICAgICAgKiBoaXN0b3J5L1BhZ2VDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2Fj aGU6OmdldCk6ICBBZGRyZXNzIHRoZSBmaXhtZSBhYm91dCBub3QgdXNpbmcgV2ViS2l0QmFja0Zv cndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbEtleS4gCisgICAgICAgICogcGFnZS9TZXR0aW5n cy5pbjogQWRkIGJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwgdG8gdGhlIGF1dG9t YXRpY2FsbHkgZ2VuZXJhdGVkIHNldHRlcnMgZm9yIFNldHRpbmdzLgorCiAyMDEzLTAyLTIyICBL ZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk IGJ1aWxkIGZpeC4gQWRkZWQgbWlzc2luZyAjaWYgUExBVEZPUk0oQ0hST01JVU0pLgpJbmRleDog U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk1LDEyICsxMTk1LDE0IEBAIF9fWk5L N1dlYkNvcmUxMUhpc3RvcnlJdGVtMTFzY3JvbGxQb2ludEUKIF9fWk5LN1dlYkNvcmUxMUhpc3Rv cnlJdGVtMTJpc1RhcmdldEl0ZW1FdgogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0xMnJlZGly ZWN0VVJMc0V2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTEzZG9jdW1lbnRTdGF0ZUV2Citf X1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTEzaXNJblBhZ2VDYWNoZUV2CiBfX1pOSzdXZWJDb3Jl MTFIaXN0b3J5SXRlbTE0YWx0ZXJuYXRlVGl0bGVFdgogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0 ZW0xNWxhc3RWaXNpdGVkVGltZUV2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTE1cGFnZVNj YWxlRmFjdG9yRXYKIF9fWk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMTdvcmlnaW5hbFVSTFN0cmlu Z0V2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTE5Y2hpbGRJdGVtV2l0aFRhcmdldEVSS04z V1RGNlN0cmluZ0UKIF9fWk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMjBnZXRUcmFuc2llbnRQcm9w ZXJ0eUVSS04zV1RGNlN0cmluZ0UKK19fWk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMjBoYXNDYWNo ZWRQYWdlRXhwaXJlZEV2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTIxZW5jb2RlQmFja0Zv cndhcmRUcmVlRVJOM1dURjdFbmNvZGVyRQogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0zdXJs RXYKIF9fWk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtNGNvcHlFdgpJbmRleDogU291cmNlL1dlYkNv cmUvaGlzdG9yeS9DYWNoZWRQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0NhY2hlZFBhZ2UuY3BwCShyZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2ViQ29y ZS9oaXN0b3J5L0NhY2hlZFBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBA CiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIlBh Z2UuaCIKKyNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlZpc2l0ZWRMaW5rU3RhdGUu aCIKICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRl ZExlYWtDb3VudGVyLmg+CkBAIC01MSw2ICs1Miw3IEBAIFBhc3NSZWZQdHI8Q2FjaGVkUGFnZT4g Q2FjaGVkUGFnZTo6Y3JlYXQKIAogQ2FjaGVkUGFnZTo6Q2FjaGVkUGFnZShQYWdlKiBwYWdlKQog ICAgIDogbV90aW1lU3RhbXAoY3VycmVudFRpbWUoKSkKKyAgICAsIG1fZXhwaXJhdGlvbihtX3Rp bWVTdGFtcCArIHBhZ2UtPnNldHRpbmdzKCktPmJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50 ZXJ2YWwoKSkKICAgICAsIG1fY2FjaGVkTWFpbkZyYW1lKENhY2hlZEZyYW1lOjpjcmVhdGUocGFn ZS0+bWFpbkZyYW1lKCkpKQogICAgICwgbV9uZWVkU3R5bGVSZWNhbGNGb3JWaXNpdGVkTGlua3Mo ZmFsc2UpCiAgICAgLCBtX25lZWRzRnVsbFN0eWxlUmVjYWxjKGZhbHNlKQpAQCAtMTE0LDQgKzEx Niw5IEBAIHZvaWQgQ2FjaGVkUGFnZTo6ZGVzdHJveSgpCiAgICAgbV9jYWNoZWRNYWluRnJhbWUg PSAwOwogfQogCitib29sIENhY2hlZFBhZ2U6Omhhc0V4cGlyZWQoKSBjb25zdAoreworICAgIHJl dHVybiBjdXJyZW50VGltZSgpID4gbV9leHBpcmF0aW9uOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuaAkocmV2aXNpb24gMTQz NDMxKQorKysgU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRQYWdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ4LDYgKzQ4LDcgQEAgcHVibGljOgogICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVu dExvYWRlcigpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkTWFpbkZyYW1lLT5kb2N1bWVudExvYWRl cigpOyB9CiAKICAgICBkb3VibGUgdGltZVN0YW1wKCkgY29uc3QgeyByZXR1cm4gbV90aW1lU3Rh bXA7IH0KKyAgICBib29sIGhhc0V4cGlyZWQoKSBjb25zdDsKICAgICAKICAgICBDYWNoZWRGcmFt ZSogY2FjaGVkTWFpbkZyYW1lKCkgeyByZXR1cm4gbV9jYWNoZWRNYWluRnJhbWUuZ2V0KCk7IH0K IApAQCAtNTgsNiArNTksNyBAQCBwcml2YXRlOgogICAgIENhY2hlZFBhZ2UoUGFnZSopOwogCiAg ICAgZG91YmxlIG1fdGltZVN0YW1wOworICAgIGRvdWJsZSBtX2V4cGlyYXRpb247CiAgICAgUmVm UHRyPENhY2hlZEZyYW1lPiBtX2NhY2hlZE1haW5GcmFtZTsKICAgICBib29sIG1fbmVlZFN0eWxl UmVjYWxjRm9yVmlzaXRlZExpbmtzOwogICAgIGJvb2wgbV9uZWVkc0Z1bGxTdHlsZVJlY2FsYzsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCShyZXZpc2lvbiAxNDM0 MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjMwLDYgKzIzMCwxMSBAQCBjb25zdCBTdHJpbmcmIEhpc3RvcnlJdGVtOjphbHRl cm5hdGVUaXRsCiAgICAgcmV0dXJuIG1fZGlzcGxheVRpdGxlOwogfQogCitib29sIEhpc3RvcnlJ dGVtOjpoYXNDYWNoZWRQYWdlRXhwaXJlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY2FjaGVk UGFnZSA/IG1fY2FjaGVkUGFnZS0+aGFzRXhwaXJlZCgpIDogZmFsc2U7Cit9CisKIGRvdWJsZSBI aXN0b3J5SXRlbTo6bGFzdFZpc2l0ZWRUaW1lKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9sYXN0 VmlzaXRlZFRpbWU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCShyZXZp c2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgJKHdv cmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsNyBAQCBwdWJsaWM6IAogICAgIGNvbnN0IFN0cmlu ZyYgdGl0bGUoKSBjb25zdDsKICAgICAKICAgICBib29sIGlzSW5QYWdlQ2FjaGUoKSBjb25zdCB7 IHJldHVybiBtX2NhY2hlZFBhZ2U7IH0KKyAgICBib29sIGhhc0NhY2hlZFBhZ2VFeHBpcmVkKCkg Y29uc3Q7CiAgICAgCiAgICAgZG91YmxlIGxhc3RWaXNpdGVkVGltZSgpIGNvbnN0OwogICAgIApJ bmRleDogU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcAkocmV2aXNpb24gMTQzNDMxKQor KysgU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00NjcsMTAgKzQ2Nyw3IEBAIENhY2hlZFBhZ2UqIFBhZ2VDYWNoZTo6Z2V0KEhpc3RvcnlJdGVt KiAKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSA9 IGl0ZW0tPm1fY2FjaGVkUGFnZS5nZXQoKSkgewotICAgICAgICAvLyBGSVhNRTogMTgwMCBzaG91 bGQgbm90IGJlIGhhcmRjb2RlZCwgaXQgc2hvdWxkIGNvbWUgZnJvbQotICAgICAgICAvLyBXZWJL aXRCYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsS2V5IGluIFdlYktpdC4KLSAgICAg ICAgLy8gT3Igd2Ugc2hvdWxkIHJlbW92ZSBXZWJLaXRCYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlv bkludGVydmFsS2V5LgotICAgICAgICBpZiAoY3VycmVudFRpbWUoKSAtIGNhY2hlZFBhZ2UtPnRp bWVTdGFtcCgpIDw9IDE4MDApCisgICAgICAgIGlmICghY2FjaGVkUGFnZS0+aGFzRXhwaXJlZCgp KQogICAgICAgICAgICAgcmV0dXJuIGNhY2hlZFBhZ2U7CiAgICAgICAgIAogICAgICAgICBMT0co UGFnZUNhY2hlLCAiTm90IHJlc3RvcmluZyBwYWdlIGZvciAlcyBmcm9tIGJhY2svZm9yd2FyZCBj YWNoZSBiZWNhdXNlIGNhY2hlIGVudHJ5IGhhcyBleHBpcmVkIiwgaXRlbS0+dXJsKCkuc3RyaW5n KCkuYXNjaWkoKS5kYXRhKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5p bgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCShyZXZpc2lv biAxNDM0MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCSh3b3JraW5nIGNv cHkpCkBAIC0xODEsMyArMTgxLDUgQEAgdG91Y2hEcmFnRHJvcEVuYWJsZWQgaW5pdGlhbD1mYWxz ZQogdW5pZmllZFRleHRDaGVja2VyRW5hYmxlZCBpbml0aWFsPWRlZmF1bHRVbmlmaWVkVGV4dENo ZWNrZXJFbmFibGVkCiAKIGxvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkIGlu aXRpYWw9ZmFsc2UKKworYmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbCB0eXBlPWRv dWJsZSwgaW5pdGlhbD0xODAwCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDM4MDYpCisrKyBT b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAor MjAxMy0wMi0yMiAgQWxpY2UgQmFycmFjbG91Z2ggIDxhbGljZS5iYXJyYWNsb3VnaEBhcHBsZS5j b20+CisKKyAgICAgICAgQWRkIHRvIEhpc3RvcnlJdGVtIGEgd2F5IHRvIGtub3cgaWYgaXRzIHVu ZGVybHlpbmcgQ2FjaGVkUGFnZSBoYXMgZXhwaXJlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDY1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEhvb2sgdXAgaGFzQ2FjaGVkUGFnZUV4cGlyZWQgaW4g SW5qZWN0ZWRCdW5kbGUncyBCYWNrRm9yd2FyZExpc3RJdGVtLgorICAgICAgICAqIFdlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmNwcDoK KyAgICAgICAgKFdLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbUhhc0NhY2hlZFBhZ2VFeHBpcmVk KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFj a0ZvcndhcmRMaXN0SXRlbS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmg6CisgICAgICAgIChXZWJLaXQ6Oklu amVjdGVkQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbTo6aGFzQ2FjaGVkUGFnZUV4cGlyZWQpOgor CiAyMDEzLTAyLTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAg ICAgICAgTW92ZSBwbHVnaW5Mb2FkUG9saWN5IHRvIHRoZSBwYWdlIGxvYWRlciBjbGllbnQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGVCYWNrRm9yd2FyZExpc3RJdGVtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW0u aAkocmV2aXNpb24gMTQzNDMxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW0uaAkod29ya2luZyBjb3B5 KQpAQCAtNTQsNiArNTQsNyBAQCBwdWJsaWM6CiAgICAgY29uc3QgU3RyaW5nJiB0YXJnZXQoKSBj b25zdCB7IHJldHVybiBtX2l0ZW0tPnRhcmdldCgpOyB9CiAgICAgYm9vbCBpc1RhcmdldEl0ZW0o KSBjb25zdCB7IHJldHVybiBtX2l0ZW0tPmlzVGFyZ2V0SXRlbSgpOyB9CiAgICAgYm9vbCBpc0lu UGFnZUNhY2hlKCkgY29uc3QgeyByZXR1cm4gbV9pdGVtLT5pc0luUGFnZUNhY2hlKCk7IH0KKyAg ICBib29sIGhhc0NhY2hlZFBhZ2VFeHBpcmVkKCkgY29uc3QgeyByZXR1cm4gbV9pdGVtLT5oYXND YWNoZWRQYWdlRXhwaXJlZCgpOyB9CiAKICAgICBQYXNzUmVmUHRyPEltbXV0YWJsZUFycmF5PiBj aGlsZHJlbigpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1 bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCShyZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFja0Zvcndh cmRMaXN0SXRlbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDExIEBAIGJvb2wgV0tC dW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtSXNJblBhZ2UKICAgICByZXR1cm4gdG9JbXBsKGl0ZW1S ZWYpLT5pc0luUGFnZUNhY2hlKCk7CiB9CiAKK2Jvb2wgV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJ dGVtSGFzQ2FjaGVkUGFnZUV4cGlyZWQoV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0 ZW1SZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChpdGVtUmVmKS0+aGFzQ2FjaGVkUGFnZUV4cGly ZWQoKTsKK30KKwogV0tBcnJheVJlZiBXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1Db3B5Q2hp bGRyZW4oV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW1SZWYpCiB7CiAgICAgcmV0 dXJuIHRvQVBJKHRvSW1wbChpdGVtUmVmKS0+Y2hpbGRyZW4oKS5sZWFrUmVmKCkpOwpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUJh Y2tGb3J3YXJkTGlzdEl0ZW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbS5oCShy ZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9jL1dLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbS5oCSh3b3JraW5nIGNvcHkpCkBA IC00NCw2ICs0NCw3IEBAIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS0J1bmRsZUJhY2tGb3J3YXIK IFdLX0VYUE9SVCBib29sIFdLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbUlzVGFyZ2V0SXRlbShX S0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbSk7CiAKIFdLX0VYUE9SVCBib29sIFdL QnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbUlzSW5QYWdlQ2FjaGUoV0tCdW5kbGVCYWNrRm9yd2Fy ZExpc3RJdGVtUmVmIGl0ZW0pOworV0tfRVhQT1JUIGJvb2wgV0tCdW5kbGVCYWNrRm9yd2FyZExp c3RJdGVtSGFzQ2FjaGVkUGFnZUV4cGlyZWQoV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtUmVm IGl0ZW0pOwogCiBXS19FWFBPUlQgV0tBcnJheVJlZiBXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0 ZW1Db3B5Q2hpbGRyZW4oV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW0pOwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDM4MDYpCisrKyBTb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMy0wMi0yMiAg QWxpY2UgQmFycmFjbG91Z2ggIDxhbGljZS5iYXJyYWNsb3VnaEBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIHRvIEhpc3RvcnlJdGVtIGEgd2F5IHRvIGtub3cgaWYgaXRzIHVuZGVybHlpbmcgQ2Fj aGVkUGFnZSBoYXMgZXhwaXJlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExMDY1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbToKKyAgICAgICAgKC1bV2Vi SGlzdG9yeUl0ZW0gX2lzSW5QYWdlQ2FjaGVdKTogQWRkZWQuIEp1c3QgY2FsbHMgYW5kIHJldHVy bnMgY29yZSBpbXBsZSdzIGZ1bmN0aW9uLiAKKyAgICAgICAgKC1bV2ViSGlzdG9yeUl0ZW0gX2hh c0NhY2hlZFBhZ2VFeHBpcmVkXSk6IFNhbWUgdGhpbmcuIAorICAgICAgICAqIEhpc3RvcnkvV2Vi SGlzdG9yeUl0ZW1Qcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5t bToKKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgX2JhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9u SW50ZXJ2YWxdKTogQWRkcmVzcyBmaXhtZSwgbm93IHRoYXQgV2ViQ29yZTo6U2V0dGluZ3MKKyAg ICAgICAgaGFzIGdldHRlcnMgYW5kIHNldHRlcnMgd2l0aCBkZWZhdWx0IHZhbHVlLgorICAgICAg ICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXND aGFuZ2VkOl0pOiBjYWxsIHNldEJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwgc2lt aWxhciB0byBvdGhlciBzZXR0aW5ncy4KKwogMjAxMy0wMi0yMSAgR3J6ZWdvcnogQ3phamtvd3Nr aSAgPGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBBbGxvdyB0byByZXRyaWV2 ZSB0aGUgcmVxdWVzdCBkYXRhIGZyb20gYWJzdHJhY3QgVGV4dENoZWNraW5nUmVxdWVzdCB0byBi ZSBhY2Nlc3NpYmxlIGZvciBXSzIKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2Vi SGlzdG9yeUl0ZW0ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9X ZWJIaXN0b3J5SXRlbS5tbQkocmV2aXNpb24gMTQzNDMxKQorKysgU291cmNlL1dlYktpdC9tYWMv SGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQkod29ya2luZyBjb3B5KQpAQCAtNjM2LDYgKzYzNiwx NiBAQCAtIChzaXplX3QpX2dldFdlZWtseVZpc2l0Q291bnRzOihjb25zdCBpCiAgICAgcmV0dXJu IGNvcmVJdGVtLT53ZWVrbHlWaXNpdENvdW50cygpLnNpemUoKTsKIH0KIAorLSAoQk9PTClfaXNJ blBhZ2VDYWNoZQoreworICAgIHJldHVybiBjb3JlKF9wcml2YXRlKS0+aXNJblBhZ2VDYWNoZSgp OworfQorCistIChCT09MKV9oYXNDYWNoZWRQYWdlRXhwaXJlZAoreworICAgIHJldHVybiBjb3Jl KF9wcml2YXRlKS0+aGFzQ2FjaGVkUGFnZUV4cGlyZWQoKTsKK30KKwogQGVuZAogCiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW1Qcml2YXRlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbVByaXZhdGUu aAkocmV2aXNpb24gMTQzNDMxKQorKysgU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0 b3J5SXRlbVByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjQsNCArNjQsNyBAQCBAaW50ZXJm YWNlIFdlYkhpc3RvcnlJdGVtIChXZWJQcml2YXRlKQogLSAoc2l6ZV90KV9nZXREYWlseVZpc2l0 Q291bnRzOihjb25zdCBpbnQqKiljb3VudHM7CiAtIChzaXplX3QpX2dldFdlZWtseVZpc2l0Q291 bnRzOihjb25zdCBpbnQqKiljb3VudHM7CiAKKy0gKEJPT0wpX2lzSW5QYWdlQ2FjaGU7CistIChC T09MKV9oYXNDYWNoZWRQYWdlRXhwaXJlZDsKKwogQGVuZApJbmRleDogU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCShyZXZpc2lvbiAxNDM0MzEpCisrKyBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0xMDc4LDggKzEwNzgsNyBAQCAtICh2b2lkKXNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJM czooCiAKIC0gKE5TVGltZUludGVydmFsKV9iYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVy dmFsCiB7Ci0gICAgLy8gRklYTUU6IFRoZXJlJ3MgcHJvYmFibHkgbm8gZ29vZCByZWFzb24gdG8g cmVhZCBmcm9tIHRoZSBzdGFuZGFyZCB1c2VyIGRlZmF1bHRzIGluc3RlYWQgb2Ygc2VsZi4KLSAg ICByZXR1cm4gKE5TVGltZUludGVydmFsKVtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVm YXVsdHNdIGZsb2F0Rm9yS2V5OldlYktpdEJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2 YWxLZXldOworICAgIHJldHVybiAoTlNUaW1lSW50ZXJ2YWwpW3NlbGYgX2Zsb2F0VmFsdWVGb3JL ZXk6V2ViS2l0QmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbEtleV07CiB9CiAKIC0g KGZsb2F0KVBERlNjYWxlRmFjdG9yCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCShyZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0ODksNiArMTQ4OSw3IEBAIC0gKHZvaWQpX3ByZWZl cmVuY2VzQ2hhbmdlZDooV2ViUHJlZmVyZW4KICAgICBzZXR0aW5ncy0+c2V0RE9NUGFzdGVBbGxv d2VkKFtwcmVmZXJlbmNlcyBpc0RPTVBhc3RlQWxsb3dlZF0pOwogICAgIHNldHRpbmdzLT5zZXRV c2VzUGFnZUNhY2hlKFtzZWxmIHVzZXNQYWdlQ2FjaGVdKTsKICAgICBzZXR0aW5ncy0+c2V0UGFn ZUNhY2hlU3VwcG9ydHNQbHVnaW5zKFtwcmVmZXJlbmNlcyBwYWdlQ2FjaGVTdXBwb3J0c1BsdWdp bnNdKTsKKyAgICBzZXR0aW5ncy0+c2V0QmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZh bChbcHJlZmVyZW5jZXMgX2JhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWxdKTsKICAg ICBzZXR0aW5ncy0+c2V0U2hvd3NVUkxzSW5Ub29sVGlwcyhbcHJlZmVyZW5jZXMgc2hvd3NVUkxz SW5Ub29sVGlwc10pOwogICAgIHNldHRpbmdzLT5zZXRTaG93c1Rvb2xUaXBPdmVyVHJ1bmNhdGVk VGV4dChbcHJlZmVyZW5jZXMgc2hvd3NUb29sVGlwT3ZlclRydW5jYXRlZFRleHRdKTsKICAgICBz ZXR0aW5ncy0+c2V0RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZChbcHJlZmVyZW5jZXMgZGV2ZWxvcGVy RXh0cmFzRW5hYmxlZF0pOwo= 189888 2013-02-22 18:13:41 -0800 2013-02-26 11:17:30 -0800 patch 110652-hasCachedPageExpired-take2.patch text/plain 12994 alice.barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzgwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIyICBBbGljZSBC YXJyYWNsb3VnaCAgPGFsaWNlLmJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQg dG8gSGlzdG9yeUl0ZW0gYSB3YXkgdG8ga25vdyBpZiBpdHMgdW5kZXJseWluZyBDYWNoZWRQYWdl IGhhcyBleHBpcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTEwNjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJDb3JlLmV4cC5pbjogQWRkZWQgV2ViQ29yZTo6SGlzdG9yeUl0ZW06OmlzSW5Q YWdlQ2FjaGUgYW5kIGhhc0NhY2hlZFBhZ2VFeHBpcmVkLgorICAgICAgICAqIGhpc3RvcnkvQ2Fj aGVkUGFnZS5jcHA6IEFkZCBhIGRhdGEgbWVtYmVyLCBtX2V4cGlyYXRpb24sIGFuZCBhIGZ1bmN0 aW9uLCBoYXNFeHBpcmVkKCkuCisgICAgICAgICogaGlzdG9yeS9DYWNoZWRQYWdlLmg6CisgICAg ICAgICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5 SXRlbTo6aGFzQ2FjaGVkUGFnZUV4cGlyZWQpOiBBZGRlZC4gcmV0dXJucyBtX2NhY2hlZFBhZ2Un cyBleHBpcmF0aW9uIHN0YXRlLgorICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uaDoKKyAg ICAgICAgKiBoaXN0b3J5L1BhZ2VDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2Fj aGU6OmdldCk6ICBBZGRyZXNzIHRoZSBmaXhtZSBhYm91dCBub3QgdXNpbmcgV2ViS2l0QmFja0Zv cndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbEtleS4gCisgICAgICAgICogcGFnZS9TZXR0aW5n cy5pbjogQWRkIGJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwgdG8gdGhlIGF1dG9t YXRpY2FsbHkgZ2VuZXJhdGVkIHNldHRlcnMgZm9yIFNldHRpbmdzLgorCiAyMDEzLTAyLTIyICBL ZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk IGJ1aWxkIGZpeC4gQWRkZWQgbWlzc2luZyAjaWYgUExBVEZPUk0oQ0hST01JVU0pLgpJbmRleDog U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAxLDYgKzEyMDEsNyBAQAogX19aTks3 V2ViQ29yZTExSGlzdG9yeUl0ZW0xN29yaWdpbmFsVVJMU3RyaW5nRXYKIF9fWk5LN1dlYkNvcmUx MUhpc3RvcnlJdGVtMTljaGlsZEl0ZW1XaXRoVGFyZ2V0RVJLTjNXVEY2U3RyaW5nRQogX19aTks3 V2ViQ29yZTExSGlzdG9yeUl0ZW0yMGdldFRyYW5zaWVudFByb3BlcnR5RVJLTjNXVEY2U3RyaW5n RQorX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0yMGhhc0NhY2hlZFBhZ2VFeHBpcmVkRXYKIF9f Wk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMjFlbmNvZGVCYWNrRm9yd2FyZFRyZWVFUk4zV1RGN0Vu Y29kZXJFCiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTN1cmxFdgogX19aTks3V2ViQ29yZTEx SGlzdG9yeUl0ZW00Y29weUV2CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBh Z2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5j cHAJKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFn ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJGcmFtZVZp ZXcuaCIKICNpbmNsdWRlICJOb2RlLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgorI2luY2x1ZGUgIlNl dHRpbmdzLmgiCiAjaW5jbHVkZSAiVmlzaXRlZExpbmtTdGF0ZS5oIgogI2luY2x1ZGUgPHd0Zi9D dXJyZW50VGltZS5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkTGVha0NvdW50ZXIuaD4KQEAg LTUxLDYgKzUyLDcgQEAgUGFzc1JlZlB0cjxDYWNoZWRQYWdlPiBDYWNoZWRQYWdlOjpjcmVhdAog CiBDYWNoZWRQYWdlOjpDYWNoZWRQYWdlKFBhZ2UqIHBhZ2UpCiAgICAgOiBtX3RpbWVTdGFtcChj dXJyZW50VGltZSgpKQorICAgICwgbV9leHBpcmF0aW9uKG1fdGltZVN0YW1wICsgcGFnZS0+c2V0 dGluZ3MoKS0+YmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbCgpKQogICAgICwgbV9j YWNoZWRNYWluRnJhbWUoQ2FjaGVkRnJhbWU6OmNyZWF0ZShwYWdlLT5tYWluRnJhbWUoKSkpCiAg ICAgLCBtX25lZWRTdHlsZVJlY2FsY0ZvclZpc2l0ZWRMaW5rcyhmYWxzZSkKICAgICAsIG1fbmVl ZHNGdWxsU3R5bGVSZWNhbGMoZmFsc2UpCkBAIC0xMTQsNCArMTE2LDkgQEAgdm9pZCBDYWNoZWRQ YWdlOjpkZXN0cm95KCkKICAgICBtX2NhY2hlZE1haW5GcmFtZSA9IDA7CiB9CiAKK2Jvb2wgQ2Fj aGVkUGFnZTo6aGFzRXhwaXJlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGN1cnJlbnRUaW1lKCkg PiBtX2V4cGlyYXRpb247Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5oCShyZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2Vi Q29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBA QCBwdWJsaWM6CiAgICAgRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyKCkgY29uc3QgeyBy ZXR1cm4gbV9jYWNoZWRNYWluRnJhbWUtPmRvY3VtZW50TG9hZGVyKCk7IH0KIAogICAgIGRvdWJs ZSB0aW1lU3RhbXAoKSBjb25zdCB7IHJldHVybiBtX3RpbWVTdGFtcDsgfQorICAgIGJvb2wgaGFz RXhwaXJlZCgpIGNvbnN0OwogICAgIAogICAgIENhY2hlZEZyYW1lKiBjYWNoZWRNYWluRnJhbWUo KSB7IHJldHVybiBtX2NhY2hlZE1haW5GcmFtZS5nZXQoKTsgfQogCkBAIC01OCw2ICs1OSw3IEBA IHByaXZhdGU6CiAgICAgQ2FjaGVkUGFnZShQYWdlKik7CiAKICAgICBkb3VibGUgbV90aW1lU3Rh bXA7CisgICAgZG91YmxlIG1fZXhwaXJhdGlvbjsKICAgICBSZWZQdHI8Q2FjaGVkRnJhbWU+IG1f Y2FjaGVkTWFpbkZyYW1lOwogICAgIGJvb2wgbV9uZWVkU3R5bGVSZWNhbGNGb3JWaXNpdGVkTGlu a3M7CiAgICAgYm9vbCBtX25lZWRzRnVsbFN0eWxlUmVjYWxjOwpJbmRleDogU291cmNlL1dlYkNv cmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAJKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJjZS9XZWJD b3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzAsNiArMjMw LDExIEBAIGNvbnN0IFN0cmluZyYgSGlzdG9yeUl0ZW06OmFsdGVybmF0ZVRpdGwKICAgICByZXR1 cm4gbV9kaXNwbGF5VGl0bGU7CiB9CiAKK2Jvb2wgSGlzdG9yeUl0ZW06Omhhc0NhY2hlZFBhZ2VF eHBpcmVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9jYWNoZWRQYWdlID8gbV9jYWNoZWRQYWdl LT5oYXNFeHBpcmVkKCkgOiBmYWxzZTsKK30KKwogZG91YmxlIEhpc3RvcnlJdGVtOjpsYXN0Vmlz aXRlZFRpbWUoKSBjb25zdAogewogICAgIHJldHVybiBtX2xhc3RWaXNpdGVkVGltZTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgJKHJldmlzaW9uIDE0MzQzMSkKKysrIFNv dXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaAkod29ya2luZyBjb3B5KQpAQCAtMTAy LDYgKzEwMiw3IEBAIHB1YmxpYzogCiAgICAgY29uc3QgU3RyaW5nJiB0aXRsZSgpIGNvbnN0Owog ICAgIAogICAgIGJvb2wgaXNJblBhZ2VDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkUGFn ZTsgfQorICAgIGJvb2wgaGFzQ2FjaGVkUGFnZUV4cGlyZWQoKSBjb25zdDsKICAgICAKICAgICBk b3VibGUgbGFzdFZpc2l0ZWRUaW1lKCkgY29uc3Q7CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaGlz dG9yeS9QYWdlQ2FjaGUuY3BwCShyZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9o aXN0b3J5L1BhZ2VDYWNoZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2NywxMCArNDY3LDcgQEAg Q2FjaGVkUGFnZSogUGFnZUNhY2hlOjpnZXQoSGlzdG9yeUl0ZW0qIAogICAgICAgICByZXR1cm4g MDsKIAogICAgIGlmIChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlID0gaXRlbS0+bV9jYWNoZWRQYWdl LmdldCgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiAxODAwIHNob3VsZCBub3QgYmUgaGFyZGNvZGVk LCBpdCBzaG91bGQgY29tZSBmcm9tCi0gICAgICAgIC8vIFdlYktpdEJhY2tGb3J3YXJkQ2FjaGVF eHBpcmF0aW9uSW50ZXJ2YWxLZXkgaW4gV2ViS2l0LgotICAgICAgICAvLyBPciB3ZSBzaG91bGQg cmVtb3ZlIFdlYktpdEJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWxLZXkuCi0gICAg ICAgIGlmIChjdXJyZW50VGltZSgpIC0gY2FjaGVkUGFnZS0+dGltZVN0YW1wKCkgPD0gMTgwMCkK KyAgICAgICAgaWYgKCFjYWNoZWRQYWdlLT5oYXNFeHBpcmVkKCkpCiAgICAgICAgICAgICByZXR1 cm4gY2FjaGVkUGFnZTsKICAgICAgICAgCiAgICAgICAgIExPRyhQYWdlQ2FjaGUsICJOb3QgcmVz dG9yaW5nIHBhZ2UgZm9yICVzIGZyb20gYmFjay9mb3J3YXJkIGNhY2hlIGJlY2F1c2UgY2FjaGUg ZW50cnkgaGFzIGV4cGlyZWQiLCBpdGVtLT51cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4JKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE4MSwzICsxODEs NSBAQCB0b3VjaERyYWdEcm9wRW5hYmxlZCBpbml0aWFsPWZhbHNlCiB1bmlmaWVkVGV4dENoZWNr ZXJFbmFibGVkIGluaXRpYWw9ZGVmYXVsdFVuaWZpZWRUZXh0Q2hlY2tlckVuYWJsZWQKIAogbG9n c1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQgaW5pdGlhbD1mYWxzZQorCitiYWNr Rm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsIHR5cGU9ZG91YmxlLCBpbml0aWFsPTE4MDAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzgwNikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAyLTIyICBBbGljZSBC YXJyYWNsb3VnaCAgPGFsaWNlLmJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQg dG8gSGlzdG9yeUl0ZW0gYSB3YXkgdG8ga25vdyBpZiBpdHMgdW5kZXJseWluZyBDYWNoZWRQYWdl IGhhcyBleHBpcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTEwNjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSG9vayB1cCBoYXNDYWNoZWRQYWdlRXhwaXJlZCBpbiBJbmplY3RlZEJ1bmRsZSdzIEJh Y2tGb3J3YXJkTGlzdEl0ZW0uCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvYy9XS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwOgorICAgICAgICAoV0tCdW5kbGVC YWNrRm9yd2FyZExpc3RJdGVtSGFzQ2FjaGVkUGFnZUV4cGlyZWQpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmg6 CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZUJhY2tG b3J3YXJkTGlzdEl0ZW0uaDoKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVCYWNrRm9y d2FyZExpc3RJdGVtOjpoYXNDYWNoZWRQYWdlRXhwaXJlZCk6CisKIDIwMTMtMDItMjIgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHBsdWdpbkxv YWRQb2xpY3kgdG8gdGhlIHBhZ2UgbG9hZGVyIGNsaWVudApJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZUJhY2tGb3J3YXJkTGlzdEl0 ZW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbS5oCShyZXZpc2lvbiAxNDM0MzEp CisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVu ZGxlQmFja0ZvcndhcmRMaXN0SXRlbS5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw2ICs1NCw3IEBA IHB1YmxpYzoKICAgICBjb25zdCBTdHJpbmcmIHRhcmdldCgpIGNvbnN0IHsgcmV0dXJuIG1faXRl bS0+dGFyZ2V0KCk7IH0KICAgICBib29sIGlzVGFyZ2V0SXRlbSgpIGNvbnN0IHsgcmV0dXJuIG1f aXRlbS0+aXNUYXJnZXRJdGVtKCk7IH0KICAgICBib29sIGlzSW5QYWdlQ2FjaGUoKSBjb25zdCB7 IHJldHVybiBtX2l0ZW0tPmlzSW5QYWdlQ2FjaGUoKTsgfQorICAgIGJvb2wgaGFzQ2FjaGVkUGFn ZUV4cGlyZWQoKSBjb25zdCB7IHJldHVybiBtX2l0ZW0tPmhhc0NhY2hlZFBhZ2VFeHBpcmVkKCk7 IH0KIAogICAgIFBhc3NSZWZQdHI8SW1tdXRhYmxlQXJyYXk+IGNoaWxkcmVuKCkgY29uc3Q7CiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tC dW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFja0ZvcndhcmRMaXN0 SXRlbS5jcHAJKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNzIsNiArNzIsMTEgQEAgYm9vbCBXS0J1bmRsZUJhY2tGb3J3YXJkTGlz dEl0ZW1Jc0luUGFnZQogICAgIHJldHVybiB0b0ltcGwoaXRlbVJlZiktPmlzSW5QYWdlQ2FjaGUo KTsKIH0KIAorYm9vbCBXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1IYXNDYWNoZWRQYWdlRXhw aXJlZChXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbVJlZikKK3sKKyAgICByZXR1 cm4gdG9JbXBsKGl0ZW1SZWYpLT5oYXNDYWNoZWRQYWdlRXhwaXJlZCgpOworfQorCiBXS0FycmF5 UmVmIFdLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbUNvcHlDaGlsZHJlbihXS0J1bmRsZUJhY2tG b3J3YXJkTGlzdEl0ZW1SZWYgaXRlbVJlZikKIHsKICAgICByZXR1cm4gdG9BUEkodG9JbXBsKGl0 ZW1SZWYpLT5jaGlsZHJlbigpLmxlYWtSZWYoKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv QVBJL2MvV0tCdW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtLmgJKHJldmlzaW9uIDE0MzQzMSkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVC YWNrRm9yd2FyZExpc3RJdGVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDcgQEAgV0tf RVhQT1JUIFdLU3RyaW5nUmVmIFdLQnVuZGxlQmFja0ZvcndhcgogV0tfRVhQT1JUIGJvb2wgV0tC dW5kbGVCYWNrRm9yd2FyZExpc3RJdGVtSXNUYXJnZXRJdGVtKFdLQnVuZGxlQmFja0ZvcndhcmRM aXN0SXRlbVJlZiBpdGVtKTsKIAogV0tfRVhQT1JUIGJvb2wgV0tCdW5kbGVCYWNrRm9yd2FyZExp c3RJdGVtSXNJblBhZ2VDYWNoZShXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbSk7 CitXS19FWFBPUlQgYm9vbCBXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1IYXNDYWNoZWRQYWdl RXhwaXJlZChXS0J1bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbSk7CiAKIFdLX0VYUE9S VCBXS0FycmF5UmVmIFdLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbUNvcHlDaGlsZHJlbihXS0J1 bmRsZUJhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDE0MzgwNikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIyICBBbGljZSBCYXJyYWNsb3VnaCAg PGFsaWNlLmJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgdG8gSGlzdG9yeUl0 ZW0gYSB3YXkgdG8ga25vdyBpZiBpdHMgdW5kZXJseWluZyBDYWNoZWRQYWdlIGhhcyBleHBpcmVk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNjUy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBIaXN0 b3J5L1dlYkhpc3RvcnlJdGVtLm1tOgorICAgICAgICAoLVtXZWJIaXN0b3J5SXRlbSBfaXNJblBh Z2VDYWNoZV0pOiBBZGRlZC4gSnVzdCBjYWxscyBhbmQgcmV0dXJucyBjb3JlIGltcGxlJ3MgZnVu Y3Rpb24uIAorICAgICAgICAoLVtXZWJIaXN0b3J5SXRlbSBfaGFzQ2FjaGVkUGFnZUV4cGlyZWRd KTogU2FtZSB0aGluZy4gCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRlbVByaXZhdGUu aDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tOgorICAgICAgICAoLVtXZWJQ cmVmZXJlbmNlcyBfYmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbF0pOiBBZGRyZXNz IGZpeG1lLCBub3cgdGhhdCBXZWJDb3JlOjpTZXR0aW5ncworICAgICAgICBoYXMgZ2V0dGVycyBh bmQgc2V0dGVycyB3aXRoIGRlZmF1bHQgdmFsdWUuCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6IGNhbGwgc2V0 QmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbCBzaW1pbGFyIHRvIG90aGVyIHNldHRp bmdzLgorCiAyMDEzLTAyLTIxICBHcnplZ29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNh bXN1bmcuY29tPgogCiAgICAgICAgIEFsbG93IHRvIHJldHJpZXZlIHRoZSByZXF1ZXN0IGRhdGEg ZnJvbSBhYnN0cmFjdCBUZXh0Q2hlY2tpbmdSZXF1ZXN0IHRvIGJlIGFjY2Vzc2libGUgZm9yIFdL MgpJbmRleDogU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1tCShy ZXZpc2lvbiAxNDM0MzEpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJ dGVtLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MzYsNiArNjM2LDE2IEBAIC0gKHNpemVfdClfZ2V0 V2Vla2x5VmlzaXRDb3VudHM6KGNvbnN0IGkKICAgICByZXR1cm4gY29yZUl0ZW0tPndlZWtseVZp c2l0Q291bnRzKCkuc2l6ZSgpOwogfQogCistIChCT09MKV9pc0luUGFnZUNhY2hlCit7CisgICAg cmV0dXJuIGNvcmUoX3ByaXZhdGUpLT5pc0luUGFnZUNhY2hlKCk7Cit9CisKKy0gKEJPT0wpX2hh c0NhY2hlZFBhZ2VFeHBpcmVkCit7CisgICAgcmV0dXJuIGNvcmUoX3ByaXZhdGUpLT5oYXNDYWNo ZWRQYWdlRXhwaXJlZCgpOworfQorCiBAZW5kCiAKIApJbmRleDogU291cmNlL1dlYktpdC9tYWMv SGlzdG9yeS9XZWJIaXN0b3J5SXRlbVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtUHJpdmF0ZS5oCShyZXZpc2lvbiAxNDM0MzEp CisrKyBTb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtUHJpdmF0ZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC02NCw0ICs2NCw3IEBAIEBpbnRlcmZhY2UgV2ViSGlzdG9yeUl0ZW0g KFdlYlByaXZhdGUpCiAtIChzaXplX3QpX2dldERhaWx5VmlzaXRDb3VudHM6KGNvbnN0IGludCoq KWNvdW50czsKIC0gKHNpemVfdClfZ2V0V2Vla2x5VmlzaXRDb3VudHM6KGNvbnN0IGludCoqKWNv dW50czsKIAorLSAoQk9PTClfaXNJblBhZ2VDYWNoZTsKKy0gKEJPT0wpX2hhc0NhY2hlZFBhZ2VF eHBpcmVkOworCiBAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZl cmVuY2VzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJl ZmVyZW5jZXMubW0JKHJldmlzaW9uIDE0MzQzMSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViUHJlZmVyZW5jZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEwNzgsOCArMTA3OCw3IEBA IC0gKHZvaWQpc2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzOigKIAogLSAoTlNUaW1lSW50 ZXJ2YWwpX2JhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwKIHsKLSAgICAvLyBGSVhN RTogVGhlcmUncyBwcm9iYWJseSBubyBnb29kIHJlYXNvbiB0byByZWFkIGZyb20gdGhlIHN0YW5k YXJkIHVzZXIgZGVmYXVsdHMgaW5zdGVhZCBvZiBzZWxmLgotICAgIHJldHVybiAoTlNUaW1lSW50 ZXJ2YWwpW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gZmxvYXRGb3JLZXk6 V2ViS2l0QmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbEtleV07CisgICAgcmV0dXJu IChOU1RpbWVJbnRlcnZhbClbc2VsZiBfZmxvYXRWYWx1ZUZvcktleTpXZWJLaXRCYWNrRm9yd2Fy ZENhY2hlRXhwaXJhdGlvbkludGVydmFsS2V5XTsKIH0KIAogLSAoZmxvYXQpUERGU2NhbGVGYWN0 b3IKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDE0MzQz MSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTQ4OSw2ICsxNDg5LDcgQEAgLSAodm9pZClfcHJlZmVyZW5jZXNDaGFuZ2VkOihXZWJQ cmVmZXJlbgogICAgIHNldHRpbmdzLT5zZXRET01QYXN0ZUFsbG93ZWQoW3ByZWZlcmVuY2VzIGlz RE9NUGFzdGVBbGxvd2VkXSk7CiAgICAgc2V0dGluZ3MtPnNldFVzZXNQYWdlQ2FjaGUoW3NlbGYg dXNlc1BhZ2VDYWNoZV0pOwogICAgIHNldHRpbmdzLT5zZXRQYWdlQ2FjaGVTdXBwb3J0c1BsdWdp bnMoW3ByZWZlcmVuY2VzIHBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2luc10pOworICAgIHNldHRpbmdz LT5zZXRCYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsKFtwcmVmZXJlbmNlcyBfYmFj a0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbF0pOwogICAgIHNldHRpbmdzLT5zZXRTaG93 c1VSTHNJblRvb2xUaXBzKFtwcmVmZXJlbmNlcyBzaG93c1VSTHNJblRvb2xUaXBzXSk7CiAgICAg c2V0dGluZ3MtPnNldFNob3dzVG9vbFRpcE92ZXJUcnVuY2F0ZWRUZXh0KFtwcmVmZXJlbmNlcyBz aG93c1Rvb2xUaXBPdmVyVHJ1bmNhdGVkVGV4dF0pOwogICAgIHNldHRpbmdzLT5zZXREZXZlbG9w ZXJFeHRyYXNFbmFibGVkKFtwcmVmZXJlbmNlcyBkZXZlbG9wZXJFeHRyYXNFbmFibGVkXSk7Cg==