58765 2011-04-18 00:44:33 -0700 WebSocket: Add assertion for SocketStreamError::failingURL. 2011-04-19 21:51:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yutak yutak ap commit-queue ukai oldest_to_newest 387570 0 yutak 2011-04-18 00:44:33 -0700 Currently SocketStreamError holds "failingURL" but it is not necessary; SocketStreamHandleClient (== WebSocketChannel) should be aware of it. 387572 1 90000 yutak 2011-04-18 01:00:08 -0700 Created attachment 90000 Patch 387613 2 90000 ukai 2011-04-18 03:28:05 -0700 Comment on attachment 90000 Patch LGTM 387751 3 90000 ap 2011-04-18 08:52:04 -0700 Comment on attachment 90000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90000&action=review > Source/WebCore/websockets/WebSocketChannel.cpp:222 > + m_context->addMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, 0, m_handshake.url(), 0); What if the error happened before handshake (e.g. DNS resolution failed)? What guarantees that m_handshake.url() will be already set (and that we won't break that in the future)? 388315 4 90000 yutak 2011-04-18 23:16:21 -0700 Comment on attachment 90000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90000&action=review >> Source/WebCore/websockets/WebSocketChannel.cpp:222 >> + m_context->addMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, 0, m_handshake.url(), 0); > > What if the error happened before handshake (e.g. DNS resolution failed)? What guarantees that m_handshake.url() will be already set (and that we won't break that in the future)? WebSocketHandshake::m_url is initialized in the constructor, and m_handshake persists for the same duration as WebSocketChannel, so "m_handshake.url()" will always return the right URL. An existing test http/tests/inspector/console-websocket-error.html checks the exact case you mentioned (DNS resolution failure), so I think we can guarantee the validness of this statement as long as the test passes. However, I agree that the usage of "m_handshake.url()" is a bit confusing. Do you think it's okay to add a m_url member variable to WebSocketChannel to make the code clearer? It adds small amount of memory usage for each WS connection, but I assume it is negligible. 388316 5 ap 2011-04-18 23:23:53 -0700 I didn't think about it a lot, but the current solution seems the most straightforward to me. Having a failing URL member in SocketStreamError matches what we have in HTTP, so it's easiest to grasp and remember. 388320 6 yutak 2011-04-18 23:34:48 -0700 I'm also OK with keeping failingURL in SocketStreamError (abondoning this change). Ukai-san, do you have any comments on this? 388322 7 ukai 2011-04-18 23:37:23 -0700 (In reply to comment #6) > I'm also OK with keeping failingURL in SocketStreamError (abondoning this change). > > Ukai-san, do you have any comments on this? For now, websocket doesn't support redirection, so requesting URL should be the same as failing URL. Is there any plan to add redirection support in WebSocket protocol? 388333 8 yutak 2011-04-18 23:57:08 -0700 No, redirection will not happen anytime soon. Then, how about adding an ASSERT that checks if m_handshake.url() is equal to error.failingURL(), instead of removing failingURL? This adds another sanity check, and we'll be able to drop it happily when redirection is implemented. 388336 9 ukai 2011-04-19 00:08:33 -0700 (In reply to comment #8) > No, redirection will not happen anytime soon. > > Then, how about adding an ASSERT that checks if m_handshake.url() is equal to error.failingURL(), instead of removing failingURL? This adds another sanity check, and we'll be able to drop it happily when redirection is implemented. Sounds good to me to adding an ASSERT. When redirection is implemented, I think we'll need failingURL to know on which connection the error is occurred. 388423 10 yutak 2011-04-19 05:14:29 -0700 OK, changing the bug summary to reflect the discussion. 388451 11 90188 yutak 2011-04-19 06:25:36 -0700 Created attachment 90188 Patch v2 389008 12 90188 ukai 2011-04-19 19:36:41 -0700 Comment on attachment 90188 Patch v2 LGTM 389050 13 commit-queue 2011-04-19 21:49:17 -0700 The commit-queue encountered the following flaky tests while processing attachment 90188: http/tests/appcache/credential-url.html bug 58962 (author: jchaffraix@webkit.org) The commit-queue is continuing to process your patch. 389051 14 90188 commit-queue 2011-04-19 21:51:28 -0700 Comment on attachment 90188 Patch v2 Clearing flags on attachment: 90188 Committed r84340: <http://trac.webkit.org/changeset/84340> 389052 15 commit-queue 2011-04-19 21:51:33 -0700 All reviewed patches have been landed. Closing bug. 90000 2011-04-18 01:00:08 -0700 2011-04-19 06:25:30 -0700 Patch bug-58765-20110418170004.patch text/plain 5816 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODQwNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYjEyYzNkZWUyY2ZjYTUw M2FmOTZkZTQ0YmM1MWVmZDQ0M2NjNmUyLi5mODUyZDQ2NGZhNzBhMjViYTg4MDhjNzllMDhiMjY1 YzA0YWRjOWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDQtMTggIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViU29ja2V0OiBSZW1vdmUgU29ja2V0U3RyZWFtRXJy b3I6OmZhaWxpbmdVUkwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01ODc2NQorCisgICAgICAgIFNvY2tldFN0cmVhbUhhbmRsZUNsaWVudCBzaG91bGQg YmUgYXdhcmUgb2YgdGhlIFVSTCB3aGljaCBpdCBpcyBjb25uZWN0aW5nIHRvLAorICAgICAgICB0 aHVzIHdlIGRvbid0IGhhdmUgdG8gc3RvcmUgZmFpbGluZ1VSTCBpbiBTb2NrZXRTdHJlYW1FcnJv ci4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlLgorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9Tb2NrZXRTdHJlYW1FcnJvckJhc2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U29ja2V0U3RyZWFtRXJyb3JCYXNlOjpjb21wYXJlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL1NvY2tldFN0cmVhbUVycm9yQmFzZS5oOgorICAgICAgICAoV2Vi Q29yZTo6U29ja2V0U3RyZWFtRXJyb3JCYXNlOjpTb2NrZXRTdHJlYW1FcnJvckJhc2UpOgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvU29ja2V0U3RyZWFtRXJyb3IuaDoKKyAgICAgICAg KFdlYkNvcmU6OlNvY2tldFN0cmVhbUVycm9yOjpTb2NrZXRTdHJlYW1FcnJvcik6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVDRk5ldC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6OnJlcG9ydEVycm9yVG9DbGllbnQpOgor ICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsKToKKwogMjAxMS0wNC0xNSAgS2VubmV0aCBS dXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQ2hyb21pdW0g TGludXggUmVsZWFzZSBidWlsZCBmaXggZHVlIHRvIHVudXNlZCB2YXJpYWJsZXMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1NvY2tldFN0cmVhbUVycm9yQmFz ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1NvY2tldFN0cmVhbUVycm9y QmFzZS5jcHAKaW5kZXggYmJiNWQ1NTNmNWIwMDBjZDRkNTNkNTAxYTU5OGRlZGYyOGQzOWZjZC4u NzY4MjkyNWVhNDZhNGQ4N2IyMGIwN2VjZTZiNTE3YzkxOTQyNTBiYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Tb2NrZXRTdHJlYW1FcnJvckJhc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvU29ja2V0U3RyZWFtRXJyb3JCYXNl LmNwcApAQCAtNTEsOSArNTEsNiBAQCBib29sIFNvY2tldFN0cmVhbUVycm9yQmFzZTo6Y29tcGFy ZShjb25zdCBTb2NrZXRTdHJlYW1FcnJvciYgYSwgY29uc3QgU29ja2V0U3RyZQogICAgIGlmIChh LmVycm9yQ29kZSgpICE9IGIuZXJyb3JDb2RlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgIGlmIChhLmZhaWxpbmdVUkwoKSAhPSBiLmZhaWxpbmdVUkwoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCiAgICAgaWYgKGEubG9jYWxpemVkRGVzY3JpcHRpb24oKSAhPSBiLmxvY2FsaXpl ZERlc2NyaXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Tb2NrZXRTdHJlYW1FcnJvckJhc2UuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvU29ja2V0U3RyZWFtRXJyb3JCYXNlLmgKaW5k ZXggZTZjYzU2N2QyNTBjMmQ0NTYxMzYxMmZiYWY5ZjljODQ1ZmM1OTRkMi4uZDk4OGVlODA3MDYx YTExOWQxMjdiZTgwZmIyYmM2NmM3YzY1MDdhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9Tb2NrZXRTdHJlYW1FcnJvckJhc2UuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1NvY2tldFN0cmVhbUVycm9yQmFzZS5oCkBAIC00Niw3ICs0 Niw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBpc051bGwoKSBjb25zdCB7 IHJldHVybiBtX2lzTnVsbDsgfQogCiAgICAgICAgIGludCBlcnJvckNvZGUoKSBjb25zdCB7IHJl dHVybiBtX2Vycm9yQ29kZTsgfQotICAgICAgICBjb25zdCBTdHJpbmcmIGZhaWxpbmdVUkwoKSBj b25zdCB7IHJldHVybiBtX2ZhaWxpbmdVUkw7IH0KICAgICAgICAgY29uc3QgU3RyaW5nJiBsb2Nh bGl6ZWREZXNjcmlwdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fbG9jYWxpemVkRGVzY3JpcHRpb247 IH0KIAogICAgICAgICBzdGF0aWMgYm9vbCBjb21wYXJlKGNvbnN0IFNvY2tldFN0cmVhbUVycm9y JiwgY29uc3QgU29ja2V0U3RyZWFtRXJyb3ImKTsKQEAgLTY0LDE2ICs2MywxNCBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIHsKICAgICAgICAgfQogCi0gICAgICAgIFNvY2tldFN0cmVh bUVycm9yQmFzZShpbnQgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGZhaWxpbmdVUkwsIGNvbnN0 IFN0cmluZyYgbG9jYWxpemVkRGVzY3JpcHRpb24pCisgICAgICAgIFNvY2tldFN0cmVhbUVycm9y QmFzZShpbnQgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGxvY2FsaXplZERlc2NyaXB0aW9uKQog ICAgICAgICAgICAgOiBtX2Vycm9yQ29kZShlcnJvckNvZGUpCi0gICAgICAgICAgICAsIG1fZmFp bGluZ1VSTChmYWlsaW5nVVJMKQogICAgICAgICAgICAgLCBtX2xvY2FsaXplZERlc2NyaXB0aW9u KGxvY2FsaXplZERlc2NyaXB0aW9uKQogICAgICAgICAgICAgLCBtX2lzTnVsbChmYWxzZSkKICAg ICAgICAgewogICAgICAgICB9CiAKICAgICAgICAgaW50IG1fZXJyb3JDb2RlOwotICAgICAgICBT dHJpbmcgbV9mYWlsaW5nVVJMOwogICAgICAgICBTdHJpbmcgbV9sb2NhbGl6ZWREZXNjcmlwdGlv bjsKICAgICAgICAgYm9vbCBtX2lzTnVsbDsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1FcnJvci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1FcnJvci5oCmluZGV4IDVhMGNh MDdmZDlhNjQwNjBjNWQyZjM5NmU5NDhlNmI4ZTVkMDA3Y2IuLjA0MjEyZDkwN2M4OGJiMmM4YzZi ZmUzMzVmOWFmNjBiZWJiMzQ4OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY2YvU29ja2V0U3RyZWFtRXJyb3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1NvY2tldFN0cmVhbUVycm9yLmgKQEAgLTQyLDggKzQyLDggQEAgcHVi bGljOgogICAgICAgICA6IFNvY2tldFN0cmVhbUVycm9yQmFzZShlcnJvckNvZGUpCiAgICAgewog ICAgIH0KLSAgICBTb2NrZXRTdHJlYW1FcnJvcihpbnQgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcm IGZhaWxpbmdVUkwsIGNvbnN0IFN0cmluZyYgbG9jYWxpemVkRGVzY3JpcHRpb24pCi0gICAgICAg IDogU29ja2V0U3RyZWFtRXJyb3JCYXNlKGVycm9yQ29kZSwgZmFpbGluZ1VSTCwgbG9jYWxpemVk RGVzY3JpcHRpb24pCisgICAgU29ja2V0U3RyZWFtRXJyb3IoaW50IGVycm9yQ29kZSwgY29uc3Qg U3RyaW5nJiBsb2NhbGl6ZWREZXNjcmlwdGlvbikKKyAgICAgICAgOiBTb2NrZXRTdHJlYW1FcnJv ckJhc2UoZXJyb3JDb2RlLCBsb2NhbGl6ZWREZXNjcmlwdGlvbikKICAgICB7CiAgICAgfQogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvU29ja2V0U3Ry ZWFtSGFuZGxlQ0ZOZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9T b2NrZXRTdHJlYW1IYW5kbGVDRk5ldC5jcHAKaW5kZXggZWUwNmM2ODkzNmFiNDk3ZmZlZmUyYjFi NmMyNThmMTU5OTQzZjA5YS4uMGExMmI1YTFlOTNlZGYwNGJjMDU2M2ZlNjI0N2UzMzFlYWZmMzRi MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRT dHJlYW1IYW5kbGVDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVDRk5ldC5jcHAKQEAgLTYxMiw3ICs2MTIsNyBAQCB2b2lk IFNvY2tldFN0cmVhbUhhbmRsZTo6cmVwb3J0RXJyb3JUb0NsaWVudChDRkVycm9yUmVmIGVycm9y KQogICAgICAgICBkZXNjcmlwdGlvbiA9IFN0cmluZyhkZXNjcmlwdGlvbkNGLmdldCgpKTsKICAg ICB9CiAKLSAgICBtX2NsaWVudC0+ZGlkRmFpbCh0aGlzLCBTb2NrZXRTdHJlYW1FcnJvcihzdGF0 aWNfY2FzdDxpbnQ+KGVycm9yQ29kZSksIG1fdXJsLnN0cmluZygpLCBkZXNjcmlwdGlvbikpOwor ICAgIG1fY2xpZW50LT5kaWRGYWlsKHRoaXMsIFNvY2tldFN0cmVhbUVycm9yKHN0YXRpY19jYXN0 PGludD4oZXJyb3JDb2RlKSwgZGVzY3JpcHRpb24pKTsKIH0KICNlbmRpZiAvLyBCVUlMRElOR19P Tl9USUdFUgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tl dENoYW5uZWwuY3BwIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVs LmNwcAppbmRleCBjNGNiMmUyMDQzOTM0NDI2ZTI2OWZkMjY3Y2QzYzE2YmZjMTRhNjMzLi40NDhm MWUxNTcwMjU2MWNiYmZiMDdmNWQ1MzNiMDgxNDM1MzdmNjg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTIxOSw3ICsyMTksNyBAQCB2 b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZEZhaWwoU29ja2V0U3RyZWFtSGFuZGxlKiBoYW5kbGUs IGNvbnN0IFNvY2tldFN0cmVhbUVycgogICAgICAgICAgICAgbWVzc2FnZSA9IG1ha2VTdHJpbmco IldlYlNvY2tldCBuZXR3b3JrIGVycm9yOiBlcnJvciBjb2RlICIsIFN0cmluZzo6bnVtYmVyKGVy cm9yLmVycm9yQ29kZSgpKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1lc3NhZ2UgPSBt YWtlU3RyaW5nKCJXZWJTb2NrZXQgbmV0d29yayBlcnJvcjogIiwgZXJyb3IubG9jYWxpemVkRGVz Y3JpcHRpb24oKSk7Ci0gICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShPdGhlck1lc3NhZ2VT b3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2Fn ZSwgMCwgZXJyb3IuZmFpbGluZ1VSTCgpLCAwKTsKKyAgICAgICAgbV9jb250ZXh0LT5hZGRNZXNz YWdlKE90aGVyTWVzc2FnZVNvdXJjZSwgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGUsIEVycm9yTWVz c2FnZUxldmVsLCBtZXNzYWdlLCAwLCBtX2hhbmRzaGFrZS51cmwoKSwgMCk7CiAgICAgfQogICAg IG1fc2hvdWxkRGlzY2FyZFJlY2VpdmVkRGF0YSA9IHRydWU7CiAgICAgaGFuZGxlLT5jbG9zZSgp Owo= 90188 2011-04-19 06:25:36 -0700 2011-04-19 21:51:28 -0700 Patch v2 bug-58765-20110419222534.patch text/plain 2335 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODQwNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxYjEyYzNkZWUyY2ZjYTUw M2FmOTZkZTQ0YmM1MWVmZDQ0M2NjNmUyLi42MDczYzE2NmE5YTBjYTVmMzNlZTY3NTIzZjA4NzQ0 MTVhMjIxMzM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTkgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViU29ja2V0OiBBZGQgYXNzZXJ0aW9uIGZvciBTb2Nr ZXRTdHJlYW1FcnJvcjo6ZmFpbGluZ1VSTC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4NzY1CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNl IGFuIGV4aXN0aW5nIHRlc3QgaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29uc29sZS13ZWJzb2NrZXQt ZXJyb3IuaHRtbCBzaG91bGQgY292ZXIgdGhpcy4KKworICAgICAgICAqIHdlYnNvY2tldHMvV2Vi U29ja2V0Q2hhbm5lbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpk aWRGYWlsKTogSWYgZXJyb3IuZmFpbGluZ1VSTCgpIGlzIHByb3ZpZGVkLCBpdCBtdXN0IGJlIHRo ZSBzYW1lIGFzCisgICAgICAgIG1faGFuZHNoYWtlLnVybCgpLiBmYWlsaW5nVVJMIG1heSBiZSBu dWxsIGlmIFNvY2tldFN0cmVhbUhhbmRsZSBoYXMgY3JlYXRlZCBhIFNvY2tldFN0cmVhbUVycm9y CisgICAgICAgIHVzaW5nIHplcm8tIG9yIG9uZS1hcmd1bWVudCBjb25zdHJ1Y3RvciAod2hpY2gg aXMgb2xkIHZlcnNpb24gYnV0IHNvbWUgcG9ydHMgYXJlIHN0aWxsIHVzaW5nIGl0KS4KKyAgICAg ICAgSW4gdGhhdCBjYXNlLCBtX2hhbmRzaGFrZS51cmwoKSBpcyBwYXNzZWQgdG8gYWRkTWVzc2Fn ZSgpLgorCiAyMDExLTA0LTE1ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLiBDaHJvbWl1bSBMaW51eCBSZWxlYXNlIGJ1aWxkIGZpeCBkdWUg dG8gdW51c2VkIHZhcmlhYmxlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tl dHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNv Y2tldENoYW5uZWwuY3BwCmluZGV4IGM0Y2IyZTIwNDM5MzQ0MjZlMjY5ZmQyNjdjZDNjMTZiZmMx NGE2MzMuLjU5MGE5YTY4N2Q1OTdlMWUxNzVmMThmMWQ0Mzc1YmJlMGU0N2U0ZWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcApAQCAtMjE5LDcg KzIxOSwxMSBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZEZhaWwoU29ja2V0U3RyZWFtSGFu ZGxlKiBoYW5kbGUsIGNvbnN0IFNvY2tldFN0cmVhbUVycgogICAgICAgICAgICAgbWVzc2FnZSA9 IG1ha2VTdHJpbmcoIldlYlNvY2tldCBuZXR3b3JrIGVycm9yOiBlcnJvciBjb2RlICIsIFN0cmlu Zzo6bnVtYmVyKGVycm9yLmVycm9yQ29kZSgpKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IG1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJXZWJTb2NrZXQgbmV0d29yayBlcnJvcjogIiwgZXJyb3Iu bG9jYWxpemVkRGVzY3JpcHRpb24oKSk7Ci0gICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShP dGhlck1lc3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VM ZXZlbCwgbWVzc2FnZSwgMCwgZXJyb3IuZmFpbGluZ1VSTCgpLCAwKTsKKyAgICAgICAgU3RyaW5n IGZhaWxpbmdVUkwgPSBlcnJvci5mYWlsaW5nVVJMKCk7CisgICAgICAgIEFTU0VSVChmYWlsaW5n VVJMLmlzTnVsbCgpIHx8IG1faGFuZHNoYWtlLnVybCgpLnN0cmluZygpID09IGZhaWxpbmdVUkwp OworICAgICAgICBpZiAoZmFpbGluZ1VSTC5pc051bGwoKSkKKyAgICAgICAgICAgIGZhaWxpbmdV UkwgPSBtX2hhbmRzaGFrZS51cmwoKS5zdHJpbmcoKTsKKyAgICAgICAgbV9jb250ZXh0LT5hZGRN ZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGUsIEVycm9y TWVzc2FnZUxldmVsLCBtZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAwKTsKICAgICB9CiAgICAgbV9z aG91bGREaXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsKICAgICBoYW5kbGUtPmNsb3NlKCk7Cg==