143505 2015-04-07 17:18:19 -0700 Open WebSockets should not prevent a page from entering PageCache 2015-04-15 15:43:05 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=142612 InRadar P2 Normal --- 143806 1 cdumez cdumez ap barraclough commit-queue kling oldest_to_newest 1083495 0 cdumez 2015-04-07 17:18:19 -0700 Open WebSockets should not prevent a page from entering PageCache. This is currently causing mobile.nytimes.com to not be page-cacheable. We could close the WebSocket when entering the page cache and fire the "close" event after resuming, similarly to what we did for XMLHttpRequest in Bug 142612. Radar: <rdar://problem/19923085> 1083496 1 250319 cdumez 2015-04-07 17:27:52 -0700 Created attachment 250319 Patch 1083521 2 250319 ap 2015-04-07 19:45:06 -0700 Comment on attachment 250319 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250319&action=review > Source/WebCore/Modules/websockets/WebSocket.cpp:481 > + m_channel->suspend(); Is DocumentWillBecomeInactive the only reason for which canSuspend is respected, or are you changing the behavior for other suspension reasons too? If the latter, how did you confirm that it's right? 1083528 3 250319 cdumez 2015-04-07 20:23:16 -0700 Comment on attachment 250319 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250319&action=review >> Source/WebCore/Modules/websockets/WebSocket.cpp:481 >> + m_channel->suspend(); > > Is DocumentWillBecomeInactive the only reason for which canSuspend is respected, or are you changing the behavior for other suspension reasons too? If the latter, how did you confirm that it's right? I am not changing the behavior for other suspensions than page cache as far as I know. canSuspend() is only called from ScriptExecutionContext::canSuspendActiveDOMObjects(), which is only called from PageCache::canCachePageContainingThisFrame(). When PageCache::canCache() returns true, we call PageCache::add() which constructs a CachedPage and CachedFrame. In the CachedFrame constructor, we call Document::suspendActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive); This is the only place this ReasonForSuspension is used. Also note the following comment in ActiveDOMObject.h: virtual bool canSuspend() const = 0; // Returning false in canSuspend() will prevent the page from entering the PageCache. This time the comment seems accurate :) 1083529 4 ap 2015-04-07 20:32:28 -0700 Makes sense! We should upgrade the comment to a function name (something like canSuspendForPageCache). And ActiveDOMObject::DocumentWillBecomeInactive is a suspicious name too. 1083530 5 cdumez 2015-04-07 20:36:54 -0700 (In reply to comment #4) > Makes sense! We should upgrade the comment to a function name (something > like canSuspendForPageCache). And > ActiveDOMObject::DocumentWillBecomeInactive is a suspicious name too. Good idea, I'll do the renaming in a follow-up patch. 1083541 6 250319 commit-queue 2015-04-07 21:25:19 -0700 Comment on attachment 250319 Patch Clearing flags on attachment: 250319 Committed r182517: <http://trac.webkit.org/changeset/182517> 1083542 7 commit-queue 2015-04-07 21:25:26 -0700 All reviewed patches have been landed. Closing bug. 250319 2015-04-07 17:27:52 -0700 2015-04-07 21:25:19 -0700 Patch bug-143505-20150407172702.patch text/plain 9394 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM1Njk4MTkzOTE3NGU5 YTE5NTc4MTZjYzc0OWU3MGE5NmI0OWYzYS4uMWMwNzY5NzE4OGMyNmZmZWIzZDA5MmRlMTA3YTA2 MGY2OTA3ODlmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTA0LTA3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3BlbiBXZWJTb2NrZXRzIHNo b3VsZCBub3QgcHJldmVudCBhIHBhZ2UgZnJvbSBlbnRlcmluZyBQYWdlQ2FjaGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzUwNQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTk5MjMwODU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgT3BlbiBXZWJTb2NrZXRzIHNob3VsZCBub3QgcHJldmVudCBhIHBh Z2UgZnJvbSBlbnRlcmluZyBQYWdlQ2FjaGUuIFRoaXMKKyAgICAgICAgaXMgY3VycmVudGx5IGNh dXNpbmcgbW9iaWxlLm55dGltZXMuY29tIHRvIG5vdCBiZSBwYWdlLWNhY2hlYWJsZS4KKworICAg ICAgICBJbiB0aGlzIHBhdGNoLCBXZSBjbG9zZSBvcGVuIFdlYlNvY2tldHMgd2hlbiBlbnRlcmlu ZyB0aGUgcGFnZSBjYWNoZQorICAgICAgICBhbmQgZmlyZSB0aGUgImNsb3NlIiBldmVudHMgYWZ0 ZXIgcmVzdW1pbmcsIHNpbWlsYXJseSB0byB3aGF0IHdlIGRpZAorICAgICAgICBmb3IgWE1MSHR0 cFJlcXVlc3QgaW4gcjE4MTQ4MC4gVGhpcyBnaXZlcyBhIGNoYW5jZSBmb3IgdGhlIGNvbnRlbnQg dG8KKyAgICAgICAgaGFuZGxlIHRoZSAnY2xvc2UnIGV2ZW50ICh3aXRoIHdhc0NsZWFuIGJlaW5n IGZhbHNlIGFuZCBjb2RlIGJlaW5nCisgICAgICAgIDEwMDYpIGluIG9yZGVyIHRvIHJlb3BlbiB0 aGUgY29ubmVjdGlvbiBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy93 ZWJzb2NrZXQvdGVzdHMvaHliaS9jbG9zZWQtd2hlbi1lbnRlcmluZy1wYWdlLWNhY2hlLmh0bWwK KworICAgICAgICAqIE1vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V2ViU29ja2V0OjpXZWJTb2NrZXQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29j a2V0OjpjYW5TdXNwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldDo6c3VzcGVuZCk6 CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXQ6OnJlc3VtZSk6CisgICAgICAgIChXZWJDb3Jl OjpXZWJTb2NrZXQ6OnJlc3VtZVRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29j a2V0OjpkaWRDbG9zZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5o OgorCiAyMDE1LTAyLTI1ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFVwZGF0ZSB0cmFjayBzaXplcyBhZnRlciBk aXN0cmlidXRpbmcgZXh0cmEgc3BhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJz b2NrZXRzL1dlYlNvY2tldC5jcHAKaW5kZXggNTc4NzhlNzYyYWE4ZmE4NTE2NzBjNTNlMWU5NmYx ODcwNTNkMzQ4MS4uMjYzOTYxYWNmNmY3ZGVlZjgzMjUyMTFhMjE1Yzk3MTAxNGM5YjEzZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAKQEAg LTE0Niw2ICsxNDYsNyBAQCBXZWJTb2NrZXQ6OldlYlNvY2tldChTY3JpcHRFeGVjdXRpb25Db250 ZXh0JiBjb250ZXh0KQogICAgICwgbV9iaW5hcnlUeXBlKEJpbmFyeVR5cGVCbG9iKQogICAgICwg bV9zdWJwcm90b2NvbCgiIikKICAgICAsIG1fZXh0ZW5zaW9ucygiIikKKyAgICAsIG1fcmVzdW1l VGltZXIoKnRoaXMsICZXZWJTb2NrZXQ6OnJlc3VtZVRpbWVyRmlyZWQpCiB7CiB9CiAKQEAgLTQ2 MiwxOSArNDYzLDM5IEBAIHZvaWQgV2ViU29ja2V0Ojpjb250ZXh0RGVzdHJveWVkKCkKIAogYm9v bCBXZWJTb2NrZXQ6OmNhblN1c3BlbmQoKSBjb25zdAogewotICAgIHJldHVybiAhbV9jaGFubmVs OworICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlNvY2tldDo6c3VzcGVuZChSZWFzb25G b3JTdXNwZW5zaW9uKQordm9pZCBXZWJTb2NrZXQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lv biByZWFzb24pCiB7Ci0gICAgaWYgKG1fY2hhbm5lbCkKLSAgICAgICAgbV9jaGFubmVsLT5zdXNw ZW5kKCk7CisgICAgaWYgKG1fcmVzdW1lVGltZXIuaXNBY3RpdmUoKSkKKyAgICAgICAgbV9yZXN1 bWVUaW1lci5zdG9wKCk7CisKKyAgICBpZiAobV9jaGFubmVsKSB7CisgICAgICAgIGlmIChyZWFz b24gPT0gQWN0aXZlRE9NT2JqZWN0OjpEb2N1bWVudFdpbGxCZWNvbWVJbmFjdGl2ZSkgeworICAg ICAgICAgICAgLy8gVGhlIHBhZ2Ugd2lsbCBlbnRlciB0aGUgcGFnZSBjYWNoZSwgY2xvc2UgdGhl IGNoYW5uZWwgYnV0IG9ubHkgZmlyZSB0aGUgY2xvc2UgZXZlbnQgYWZ0ZXIgcmVzdW1pbmcuCisg ICAgICAgICAgICBtX3Nob3VsZERlbGF5Q2xvc2VFdmVudCA9IHRydWU7CisgICAgICAgICAgICAv LyBUaGlzIHdpbGwgY2F1c2UgZGlkQ2xvc2UoKSB0byBiZSBjYWxsZWQuCisgICAgICAgICAgICBt X2NoYW5uZWwtPmZhaWwoIldlYlNvY2tldCBpcyBjbG9zZWQgZHVlIHRvIHN1c3BlbnNpb24uIik7 CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbV9jaGFubmVsLT5zdXNwZW5kKCk7CisgICAg fQogfQogCiB2b2lkIFdlYlNvY2tldDo6cmVzdW1lKCkKIHsKICAgICBpZiAobV9jaGFubmVsKQog ICAgICAgICBtX2NoYW5uZWwtPnJlc3VtZSgpOworICAgIGVsc2UgaWYgKG1fcGVuZGluZ0Nsb3Nl RXZlbnQgJiYgIW1fcmVzdW1lVGltZXIuaXNBY3RpdmUoKSkgeworICAgICAgICAvLyBGaXJlIHRo ZSBjbG9zZSBldmVudCBpbiBhIHRpbWVyIGFzIHdlIGFyZSBub3QgYWxsb3dlZCB0byBleGVjdXRl IGFyYml0cmFyeSBKUyBmcm9tIHJlc3VtZSgpLgorICAgICAgICBtX3Jlc3VtZVRpbWVyLnN0YXJ0 T25lU2hvdCgwKTsKKyAgICB9Cit9CisKK3ZvaWQgV2ViU29ja2V0OjpyZXN1bWVUaW1lckZpcmVk KCkKK3sKKyAgICBBU1NFUlQobV9wZW5kaW5nQ2xvc2VFdmVudCk7CisgICAgZGlzcGF0Y2hFdmVu dChXVEY6Om1vdmUobV9wZW5kaW5nQ2xvc2VFdmVudCkpOwogfQogCiB2b2lkIFdlYlNvY2tldDo6 c3RvcCgpCkBAIC01NjUsMTEgKzU4NiwxNyBAQCB2b2lkIFdlYlNvY2tldDo6ZGlkQ2xvc2UodW5z aWduZWQgbG9uZyB1bmhhbmRsZWRCdWZmZXJlZEFtb3VudCwgQ2xvc2luZ0hhbmRzaGFrZQogICAg IG1fc3RhdGUgPSBDTE9TRUQ7CiAgICAgbV9idWZmZXJlZEFtb3VudCA9IHVuaGFuZGxlZEJ1ZmZl cmVkQW1vdW50OwogICAgIEFTU0VSVChzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOworCiAgICAg UmVmUHRyPENsb3NlRXZlbnQ+IGV2ZW50ID0gQ2xvc2VFdmVudDo6Y3JlYXRlKHdhc0NsZWFuLCBj b2RlLCByZWFzb24pOwotICAgIGRpc3BhdGNoRXZlbnQoZXZlbnQpOworICAgIGlmIChtX3Nob3Vs ZERlbGF5Q2xvc2VFdmVudCkgeworICAgICAgICBtX3BlbmRpbmdDbG9zZUV2ZW50ID0gV1RGOjpt b3ZlKGV2ZW50KTsKKyAgICAgICAgbV9zaG91bGREZWxheUNsb3NlRXZlbnQgPSBmYWxzZTsKKyAg ICB9IGVsc2UKKyAgICAgICAgZGlzcGF0Y2hFdmVudChldmVudCk7CisKICAgICBpZiAobV9jaGFu bmVsKSB7CiAgICAgICAgIG1fY2hhbm5lbC0+ZGlzY29ubmVjdCgpOwotICAgICAgICBtX2NoYW5u ZWwgPSAwOworICAgICAgICBtX2NoYW5uZWwgPSBudWxscHRyOwogICAgIH0KICAgICBpZiAoaGFz UGVuZGluZ0FjdGl2aXR5KCkpCiAgICAgICAgIEFjdGl2ZURPTU9iamVjdDo6dW5zZXRQZW5kaW5n QWN0aXZpdHkodGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNv Y2tldHMvV2ViU29ja2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2Vi U29ja2V0LmgKaW5kZXggZDNjM2JhYTVkNWFkZDcwYzAzMjQ2Y2Q2YTE1Y2Q4MTZlNTY5YmNiNy4u OWE4ZGNmOTI5ZWYxMzM3YzIzZGQ0MmVkNWE0ZTk3YjM2OTFhMzU0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJTb2NrZXQuaApAQCAtNDYsNiArNDYsNyBAQAog bmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBCbG9iOworY2xhc3MgQ2xvc2VFdmVudDsKIGNs YXNzIFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOwogCiBjbGFzcyBXZWJTb2NrZXQgZmluYWwg OiBwdWJsaWMgUmVmQ291bnRlZDxXZWJTb2NrZXQ+LCBwdWJsaWMgRXZlbnRUYXJnZXRXaXRoSW5s aW5lRGF0YSwgcHVibGljIEFjdGl2ZURPTU9iamVjdCwgcHVibGljIFdlYlNvY2tldENoYW5uZWxD bGllbnQgewpAQCAtMTA4LDYgKzEwOSw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGlj aXQgV2ViU29ja2V0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmKTsKIAorICAgIHZvaWQgcmVzdW1l VGltZXJGaXJlZCgpOworCiAgICAgLy8gQWN0aXZlRE9NT2JqZWN0IEFQSS4KICAgICB2b2lkIGNv bnRleHREZXN0cm95ZWQoKSBvdmVycmlkZTsKICAgICBib29sIGNhblN1c3BlbmQoKSBjb25zdCBv dmVycmlkZTsKQEAgLTEzNSw2ICsxMzgsMTAgQEAgcHJpdmF0ZToKICAgICBCaW5hcnlUeXBlIG1f YmluYXJ5VHlwZTsKICAgICBTdHJpbmcgbV9zdWJwcm90b2NvbDsKICAgICBTdHJpbmcgbV9leHRl bnNpb25zOworCisgICAgVGltZXIgbV9yZXN1bWVUaW1lcjsKKyAgICBib29sIG1fc2hvdWxkRGVs YXlDbG9zZUV2ZW50IHsgZmFsc2UgfTsKKyAgICBSZWZQdHI8Q2xvc2VFdmVudD4gbV9wZW5kaW5n Q2xvc2VFdmVudDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4MzgxNDUx ZjI2YjNmNjY1N2Q4NzRiNWFhOWFiZDJkMTEzZDEzODQ2Li5jMjVmZTNjMjU2NDBlYzE1ZDM1ZWYy MjMyNGY5YWQ2YzhkMjM0Yzg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMDQtMDcgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBPcGVuIFdlYlNvY2tldHMg c2hvdWxkIG5vdCBwcmV2ZW50IGEgcGFnZSBmcm9tIGVudGVyaW5nIFBhZ2VDYWNoZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNTA1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xOTkyMzA4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBsYXlvdXQgdGVzdCB0byBjaGVjayB0aGF0IGFuIG9w ZW4gV2ViU29ja2V0IGRvZXMgbm90IHByZXZlbnQgYQorICAgICAgICBwYWdlIGZyb20gZW50ZXJp bmcgcGFnZSBjYWNoZSBhbmQgdGhhdCBhICdjbG9zZScgZXZlbnQgaXMgZmlyZWQgYWZ0ZXIKKyAg ICAgICAgcmVzdW1pbmcgKHJlc3RvcmluZyBmcm9tIHRoZSBwYWdlIGNhY2hlKS4KKworICAgICAg ICAqIGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvY2xvc2VkLXdoZW4tZW50ZXJpbmct cGFnZS1jYWNoZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvd2Vi c29ja2V0L3Rlc3RzL2h5YmkvY2xvc2VkLXdoZW4tZW50ZXJpbmctcGFnZS1jYWNoZS5odG1sOiBB ZGRlZC4KKwogMjAxNS0wMi0yNSAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlh LmNvbT4KIAogICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBVcGRhdGUgdHJhY2sgc2l6ZXMgYWZ0 ZXIgZGlzdHJpYnV0aW5nIGV4dHJhIHNwYWNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL2Nsb3NlZC13aGVuLWVudGVyaW5nLXBhZ2UtY2Fj aGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMv aHliaS9jbG9zZWQtd2hlbi1lbnRlcmluZy1wYWdlLWNhY2hlLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4xNmUyZTE0YjFkYTMzMWViYTU3ZWQ5ZjJjZGZlZmViYzk4MWQ2MDMxCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9jbG9z ZWQtd2hlbi1lbnRlcmluZy1wYWdlLWNhY2hlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE4IEBA CitDT05TT0xFIE1FU1NBR0U6IFdlYlNvY2tldCBjb25uZWN0aW9uIHRvICd3czovLzEyNy4wLjAu MTo4ODgwL3dlYnNvY2tldC90ZXN0cy9oeWJpL2VjaG8nIGZhaWxlZDogV2ViU29ja2V0IGlzIGNs b3NlZCBkdWUgdG8gc3VzcGVuc2lvbi4KK1Rlc3QgdGhhdCBhbiBvcGVuIFdlYlNvY2tldCBkb2Vz IG5vdCBwcmV2ZW50IGEgcGFnZSBmcm9tIGVudGVyaW5nIHBhZ2UgY2FjaGUuCisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworCitwYWdlc2hvdyAtIG5vdCBmcm9tIGNhY2hlCitwYWdlaGlk ZSAtIGVudGVyaW5nIGNhY2hlCitwYWdlc2hvdyAtIGZyb20gY2FjaGUKK1BBU1MgUGFnZSBkaWQg ZW50ZXIgYW5kIHdhcyByZXN0b3JlZCBmcm9tIHRoZSBwYWdlIGNhY2hlCitQQVNTIFdlYlNvY2tl dCB3YXMgY2xvc2VkCitQQVNTIHdhc1Jlc3RvcmVkRnJvbVBhZ2VDYWNoZSBpcyB0cnVlCitQQVNT IGNsb3NlRXZlbnQud2FzQ2xlYW4gaXMgZmFsc2UKK1BBU1MgY2xvc2VFdmVudC5jb2RlIGlzIDEw MDYKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL2Ns b3NlZC13aGVuLWVudGVyaW5nLXBhZ2UtY2FjaGUuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvY2xvc2VkLXdoZW4tZW50ZXJpbmctcGFnZS1jYWNoZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjA0MjlkMTI3NjhlMDNiNGU1OWYzYTA5MTc4YjMyY2E0OTg5ZjQ1ZjcK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cy9oeWJpL2Nsb3NlZC13aGVuLWVudGVyaW5nLXBhZ2UtY2FjaGUuaHRtbApAQCAtMCwwICsxLDUz IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8c2NyaXB0IHNyYz0iL2pzLXRl c3QtcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbigiVGVzdCB0aGF0IGFuIG9wZW4gV2ViU29ja2V0IGRvZXMgbm90IHByZXZlbnQgYSBwYWdl IGZyb20gZW50ZXJpbmcgcGFnZSBjYWNoZS4iKTsKKword2luZG93LmpzVGVzdElzQXN5bmMgPSB0 cnVlOworaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIub3ZlcnJpZGVQcmVm ZXJlbmNlKCJXZWJLaXRVc2VzUGFnZUNhY2hlUHJlZmVyZW5jZUtleSIsIDEpOworCit2YXIgd2Fz UmVzdG9yZWRGcm9tUGFnZUNhY2hlID0gZmFsc2U7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVy KCJwYWdlc2hvdyIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgZGVidWcoInBhZ2VzaG93IC0gIiAr IChldmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZnJvbSBjYWNoZSIpOworCisgICAg aWYgKGV2ZW50LnBlcnNpc3RlZCkgeworICAgICAgICB0ZXN0UGFzc2VkKCJQYWdlIGRpZCBlbnRl ciBhbmQgd2FzIHJlc3RvcmVkIGZyb20gdGhlIHBhZ2UgY2FjaGUiKTsKKyAgICAgICAgd2FzUmVz dG9yZWRGcm9tUGFnZUNhY2hlID0gdHJ1ZTsKKyAgICB9Cit9LCBmYWxzZSk7CisKK3dpbmRvdy5h ZGRFdmVudExpc3RlbmVyKCJwYWdlaGlkZSIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgZGVidWco InBhZ2VoaWRlIC0gIiArIChldmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZW50ZXJp bmcgY2FjaGUiKTsKKyAgICBpZiAoIWV2ZW50LnBlcnNpc3RlZCkgeworICAgICAgICB0ZXN0RmFp bGVkKCJQYWdlIGRpZCBub3QgZW50ZXIgdGhlIHBhZ2UgY2FjaGUuIik7CisgICAgICAgIGZpbmlz aEpTVGVzdCgpOworICAgIH0KK30sIGZhbHNlKTsKKword2luZG93LmFkZEV2ZW50TGlzdGVuZXIo J2xvYWQnLCBmdW5jdGlvbigpIHsKKyAgICB3cyA9IG5ldyBXZWJTb2NrZXQoIndzOi8vMTI3LjAu MC4xOjg4ODAvd2Vic29ja2V0L3Rlc3RzL2h5YmkvZWNobyIpOworICAgIHdzLm9uY2xvc2UgPSBm dW5jdGlvbihldikgeworICAgICAgICB0ZXN0UGFzc2VkKCJXZWJTb2NrZXQgd2FzIGNsb3NlZCIp OworICAgICAgICBzaG91bGRCZVRydWUoIndhc1Jlc3RvcmVkRnJvbVBhZ2VDYWNoZSIpOworICAg ICAgICBjbG9zZUV2ZW50ID0gZXY7CisgICAgICAgIHNob3VsZEJlRmFsc2UoImNsb3NlRXZlbnQu d2FzQ2xlYW4iKTsKKyAgICAgICAgc2hvdWxkQmUoImNsb3NlRXZlbnQuY29kZSIsICIxMDA2Iik7 CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgIH07CisKKyAgICAvLyBUaGlzIG5lZWRzIHRv IGhhcHBlbiBpbiBhIHNldFRpbWVvdXQgYmVjYXVzZSBhIG5hdmlnYXRpb24gaW5zaWRlIHRoZSBv bmxvYWQgaGFuZGxlciB3b3VsZAorICAgIC8vIG5vdCBjcmVhdGUgYSBoaXN0b3J5IGVudHJ5Lgor ICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAvLyBGb3JjZSBhIGJhY2sgbmF2aWdh dGlvbiBiYWNrIHRvIHRoaXMgcGFnZS4KKyAgICAgIHdpbmRvdy5sb2NhdGlvbi5ocmVmID0gIi9u YXZpZ2F0aW9uL3Jlc291cmNlcy9wYWdlLWNhY2hlLWhlbHBlci5odG1sIjsKKyAgICB9LCAwKTsK K30sIGZhbHNlKTsKKworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL2pzLXRlc3QtcmVzb3VyY2Vz L2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==