184593 2018-04-13 09:22:55 -0700 Inline NetworkLoad::sharedWillSendRedirectedRequest() into NetworkLoad::willPerformHTTPRedirection() 2018-04-13 09:55:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates achristensen webkit-bug-importer oldest_to_newest 1414434 0 dbates 2018-04-13 09:22:55 -0700 For the same reason as for bug #184592, we can inline NetworkLoad::sharedWillSendRedirectedRequest() into NetworkLoad::willPerformHTTPRedirection(). 1414436 1 337896 dbates 2018-04-13 09:23:50 -0700 Created attachment 337896 Patch 1414445 2 337899 dbates 2018-04-13 09:41:38 -0700 Created attachment 337899 Patch 1414452 3 dbates 2018-04-13 09:54:27 -0700 Committed r230636: <https://trac.webkit.org/changeset/230636> 1414453 4 webkit-bug-importer 2018-04-13 09:55:17 -0700 <rdar://problem/39414807> 337896 2018-04-13 09:23:50 -0700 2018-04-13 09:41:37 -0700 Patch bug-184593-20180413092350.patch text/plain 4620 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFhZWU2MDkzODQxZmQ5MThl ZGM0ZGY5YThjOTA4N2E4ODNlNTRhNWUuLjMxNTJhZTQ1MmE5ZmIyNGY0MTBhMTIzOWQ5OWZiZWVl NWEyZmRmMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDQtMTMgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIElubGluZSBOZXR3b3JrTG9hZDo6 c2hhcmVkV2lsbFNlbmRSZWRpcmVjdGVkUmVxdWVzdCgpIGludG8gTmV0d29ya0xvYWQ6OndpbGxQ ZXJmb3JtSFRUUFJlZGlyZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4NDU5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZvbGxvd2luZyB0aGUgcmVtb3ZhbCBvZiB0aGUgcHJlLU5ldHdvcmsg U2Vzc2lvbiBjb2RlIGluIHIyMjczNjQsIE5ldHdvcmtMb2FkOjpzaGFyZWRXaWxsU2VuZFJlZGly ZWN0ZWRSZXF1ZXN0KCkKKyAgICAgICAgaXMgb25seSByZWZlcmVuY2VkIGZyb20gTmV0d29ya0xv YWQ6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKCkuIFdlIHNob3VsZCBpbmxpbmUgaXRzCisg ICAgICAgIGltcGxlbWVudGF0aW9uIGludG8gdGhlIE5ldHdvcmtMb2FkOjp3aWxsUGVyZm9ybUhU VFBSZWRpcmVjdGlvbigpLCByZW1vdmUgYSBmdW5jdGlvbiBjYWxsLAorICAgICAgICBhbmQgdGhl IGNvZ25pdGl2ZSBsb2FkIHRvIGZvbGxvdyBzdWNoIGEgZnVuY3Rpb24gY2FsbCB3aGVuIHJlYWRp bmcgdGhlIGNvZGUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjp3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlv bik6IE1vdmVkIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBOZXR3b3JrTG9hZDo6c2hhcmVkV2lsbFNl bmRSZWRpcmVjdGVkUmVxdWVzdCgpCisgICAgICAgIGludG8gdGhpcyBmdW5jdGlvbi4KKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OnNoYXJlZFdpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3Qp OiBEZWxldGVkLiBNb3ZlZCBpdHMgaW1wbGVtZW50YXRpb24KKyAgICAgICAgaW50byBOZXR3b3Jr TG9hZDo6d2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oKS4KKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZC5oOgorCiAyMDE4LTA0LTEzICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVz QGFwcGxlLmNvbT4KIAogICAgICAgICBJbmxpbmUgTmV0d29ya0xvYWQ6OnNoYXJlZERpZFJlY2Vp dmVSZXNwb25zZSgpIGludG8gTmV0d29ya0xvYWQ6Om5vdGlmeURpZFJlY2VpdmVSZXNwb25zZSgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNw cCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCmluZGV4IDQ3 MjA5MzgwMzZjZTMwMWFmMzRkNmUwOGQzNWQ5MzYzZmRjZGNiODAuLmI3NGQ3ZGE0NzM4Zjc4MDg4 MWUwMjlmZWZhN2Q0ZTFlZDJjNDFjNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0xvYWQuY3BwCkBAIC0xOTEsMjIgKzE5MSw2IEBAIGJvb2wgTmV0d29ya0xvYWQ6 OnNob3VsZENhcHR1cmVFeHRyYU5ldHdvcmtMb2FkTWV0cmljcygpIGNvbnN0CiAgICAgcmV0dXJu IG1fY2xpZW50LmdldCgpLnNob3VsZENhcHR1cmVFeHRyYU5ldHdvcmtMb2FkTWV0cmljcygpOwog fQogCi12b2lkIE5ldHdvcmtMb2FkOjpzaGFyZWRXaWxsU2VuZFJlZGlyZWN0ZWRSZXF1ZXN0KFJl c291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFJlc291cmNlUmVzcG9uc2UmJiByZWRpcmVjdFJlc3Bv bnNlKQotewotICAgIC8vIFdlIG9ubHkgZXhwZWN0IHRvIGdldCB0aGUgd2lsbFNlbmRSZXF1ZXN0 IGNhbGxiYWNrIGZyb20gUmVzb3VyY2VIYW5kbGUgYXMgdGhlIHJlc3VsdCBvZiBhIHJlZGlyZWN0 LgotICAgIEFTU0VSVCghcmVkaXJlY3RSZXNwb25zZS5pc051bGwoKSk7Ci0gICAgQVNTRVJUKFJ1 bkxvb3A6OmlzTWFpbigpKTsKLQotI2lmIEVOQUJMRShORVRXT1JLX0NBUFRVUkUpCi0gICAgaWYg KG1fcmVjb3JkZXIpCi0gICAgICAgIG1fcmVjb3JkZXItPnJlY29yZFJlZGlyZWN0UmVjZWl2ZWQo cmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7Ci0jZW5kaWYKLQotICAgIGF1dG8gb2xkUmVxdWVz dCA9IFdURk1vdmUobV9jdXJyZW50UmVxdWVzdCk7Ci0gICAgbV9jdXJyZW50UmVxdWVzdCA9IHJl cXVlc3Q7Ci0gICAgbV9jbGllbnQuZ2V0KCkud2lsbFNlbmRSZWRpcmVjdGVkUmVxdWVzdChXVEZN b3ZlKG9sZFJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlZGlyZWN0UmVzcG9u c2UpKTsKLX0KLQogYm9vbCBOZXR3b3JrTG9hZDo6aXNBbGxvd2VkVG9Bc2tVc2VyRm9yQ3JlZGVu dGlhbHMoKSBjb25zdAogewogICAgIHJldHVybiBtX2NsaWVudC5nZXQoKS5pc0FsbG93ZWRUb0Fz a1VzZXJGb3JDcmVkZW50aWFscygpOwpAQCAtMjQ5LDExICsyMzMsMjIgQEAgdm9pZCBOZXR3b3Jr TG9hZDo6c2V0UGVuZGluZ0Rvd25sb2FkKFBlbmRpbmdEb3dubG9hZCYgcGVuZGluZ0Rvd25sb2Fk KQogICAgIG1fdGFzay0+c2V0UGVuZGluZ0Rvd25sb2FkKHBlbmRpbmdEb3dubG9hZCk7CiB9CiAK LXZvaWQgTmV0d29ya0xvYWQ6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKFJlc291cmNlUmVz cG9uc2UmJiByZXNwb25zZSwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgUmVkaXJlY3RDb21w bGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBOZXR3b3JrTG9hZDo6d2ls bFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oUmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9u c2UsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFJlZGlyZWN0Q29tcGxldGlvbkhhbmRsZXIm JiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBBU1NFUlQoIXJlZGlyZWN0UmVzcG9uc2UuaXNO dWxsKCkpOworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgQVNTRVJUKCFtX3Jl ZGlyZWN0Q29tcGxldGlvbkhhbmRsZXIpOworCiAgICAgbV9yZWRpcmVjdENvbXBsZXRpb25IYW5k bGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgc2hhcmVkV2lsbFNlbmRSZWRp cmVjdGVkUmVxdWVzdChXVEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKHJlc3BvbnNlKSk7CisKKyNp ZiBFTkFCTEUoTkVUV09SS19DQVBUVVJFKQorICAgIGlmIChtX3JlY29yZGVyKQorICAgICAgICBt X3JlY29yZGVyLT5yZWNvcmRSZWRpcmVjdFJlY2VpdmVkKHJlcXVlc3QsIHJlZGlyZWN0UmVzcG9u c2UpOworI2VuZGlmCisKKyAgICBhdXRvIG9sZFJlcXVlc3QgPSBXVEZNb3ZlKG1fY3VycmVudFJl cXVlc3QpOworICAgIG1fY3VycmVudFJlcXVlc3QgPSByZXF1ZXN0OworICAgIG1fY2xpZW50Lmdl dCgpLndpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QoV1RGTW92ZShvbGRSZXF1ZXN0KSwgV1RGTW92 ZShyZXF1ZXN0KSwgV1RGTW92ZShyZWRpcmVjdFJlc3BvbnNlKSk7CiB9CiAKIHZvaWQgTmV0d29y a0xvYWQ6OmRpZFJlY2VpdmVDaGFsbGVuZ2UoY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2Um IGNoYWxsZW5nZSwgQ2hhbGxlbmdlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxl cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuaAppbmRleCAyY2Fk ZDI2YjM2NDI1NjYwN2FlZTkyYTkyNjU0Y2YyZjAwOTAyOThkLi44ZTNiYjYwZjgzNDhkZWQyNDU3 Y2UyY2NmNjdmMDExZDdlZDJlMWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtMb2FkLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrTG9hZC5oCkBAIC03OSw4ICs3OSw2IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICB2b2lk IGluaXRpYWxpemUoTmV0d29ya1Nlc3Npb24mKTsKIAotICAgIHZvaWQgc2hhcmVkV2lsbFNlbmRS ZWRpcmVjdGVkUmVxdWVzdChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSYmKTsKLQogICAgIC8vIE5ldHdvcmtEYXRhVGFza0NsaWVudAogICAgIHZv aWQgd2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYm LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgUmVkaXJlY3RDb21wbGV0aW9uSGFuZGxlciYm KSBmaW5hbDsKICAgICB2b2lkIGRpZFJlY2VpdmVDaGFsbGVuZ2UoY29uc3QgV2ViQ29yZTo6QXV0 aGVudGljYXRpb25DaGFsbGVuZ2UmLCBDaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciYmKSBmaW5h bDsK 337899 2018-04-13 09:41:38 -0700 2018-04-13 09:43:49 -0700 Patch bug-184593-20180413094138.patch text/plain 4600 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzZTNkZjU4NjBmZDEyM2Jh ODE1ODkxNDY0NWFkZDUyZjE2OGJjZTYuLmJlMjBkZDk5ZTUxMDQ5YzdkNDdjNmI1YTM1ZjczYThm ZGIxNjAwNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDQtMTMgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIElubGluZSBOZXR3b3JrTG9hZDo6 c2hhcmVkV2lsbFNlbmRSZWRpcmVjdGVkUmVxdWVzdCgpIGludG8gTmV0d29ya0xvYWQ6OndpbGxQ ZXJmb3JtSFRUUFJlZGlyZWN0aW9uKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4NDU5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZvbGxvd2luZyB0aGUgcmVtb3ZhbCBvZiB0aGUgcHJlLU5ldHdvcmsg U2Vzc2lvbiBjb2RlIGluIHIyMjczNjQsIE5ldHdvcmtMb2FkOjpzaGFyZWRXaWxsU2VuZFJlZGly ZWN0ZWRSZXF1ZXN0KCkKKyAgICAgICAgaXMgb25seSByZWZlcmVuY2VkIGZyb20gTmV0d29ya0xv YWQ6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKCkuIFdlIHNob3VsZCBpbmxpbmUgaXRzCisg ICAgICAgIGltcGxlbWVudGF0aW9uIGludG8gdGhlIE5ldHdvcmtMb2FkOjp3aWxsUGVyZm9ybUhU VFBSZWRpcmVjdGlvbigpLCByZW1vdmUgYSBmdW5jdGlvbiBjYWxsLAorICAgICAgICBhbmQgdGhl IGNvZ25pdGl2ZSBsb2FkIHRvIGZvbGxvdyBzdWNoIGEgZnVuY3Rpb24gY2FsbCB3aGVuIHJlYWRp bmcgdGhlIGNvZGUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjp3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlv bik6IE1vdmVkIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBOZXR3b3JrTG9hZDo6c2hhcmVkV2lsbFNl bmRSZWRpcmVjdGVkUmVxdWVzdCgpCisgICAgICAgIGludG8gdGhpcyBmdW5jdGlvbi4KKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OnNoYXJlZFdpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3Qp OiBEZWxldGVkLiBNb3ZlZCBpdHMgaW1wbGVtZW50YXRpb24KKyAgICAgICAgaW50byBOZXR3b3Jr TG9hZDo6d2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oKS4KKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZC5oOgorCiAyMDE4LTA0LTEzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdo YW1AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIzMDQ2OCk6IEltcHJvcGVyIGFz c2VydGlvbiBmaXJpbmcgdW5kZXIgU1RQCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0xvYWQuY3BwCmluZGV4IGE5MGZjZmEzMDAxMGYzMDhmODYzN2M5Yjg5MmUyNTA0MTMx ZDdiOTUuLjE2NTU5Njg0NzM1ZTMyYzk4ZWU4MTJkMTkwMGI0MjVkZTljZTk1NTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCkBAIC0yMDAsMjIgKzIw MCw2IEBAIE5ldHdvcmtMb2FkQ2xpZW50OjpTaG91bGRDb250aW51ZURpZFJlY2VpdmVSZXNwb25z ZSBOZXR3b3JrTG9hZDo6c2hhcmVkRGlkUmVjZWl2CiAgICAgcmV0dXJuIG1fY2xpZW50LmdldCgp LmRpZFJlY2VpdmVSZXNwb25zZShXVEZNb3ZlKHJlc3BvbnNlKSk7CiB9CiAKLXZvaWQgTmV0d29y a0xvYWQ6OnNoYXJlZFdpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYg cmVxdWVzdCwgUmVzb3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UpCi17Ci0gICAgLy8g V2Ugb25seSBleHBlY3QgdG8gZ2V0IHRoZSB3aWxsU2VuZFJlcXVlc3QgY2FsbGJhY2sgZnJvbSBS ZXNvdXJjZUhhbmRsZSBhcyB0aGUgcmVzdWx0IG9mIGEgcmVkaXJlY3QuCi0gICAgQVNTRVJUKCFy ZWRpcmVjdFJlc3BvbnNlLmlzTnVsbCgpKTsKLSAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkp OwotCi0jaWYgRU5BQkxFKE5FVFdPUktfQ0FQVFVSRSkKLSAgICBpZiAobV9yZWNvcmRlcikKLSAg ICAgICAgbV9yZWNvcmRlci0+cmVjb3JkUmVkaXJlY3RSZWNlaXZlZChyZXF1ZXN0LCByZWRpcmVj dFJlc3BvbnNlKTsKLSNlbmRpZgotCi0gICAgYXV0byBvbGRSZXF1ZXN0ID0gV1RGTW92ZShtX2N1 cnJlbnRSZXF1ZXN0KTsKLSAgICBtX2N1cnJlbnRSZXF1ZXN0ID0gcmVxdWVzdDsKLSAgICBtX2Ns aWVudC5nZXQoKS53aWxsU2VuZFJlZGlyZWN0ZWRSZXF1ZXN0KFdURk1vdmUob2xkUmVxdWVzdCks IFdURk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVkaXJlY3RSZXNwb25zZSkpOwotfQotCiBib29s IE5ldHdvcmtMb2FkOjppc0FsbG93ZWRUb0Fza1VzZXJGb3JDcmVkZW50aWFscygpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1fY2xpZW50LmdldCgpLmlzQWxsb3dlZFRvQXNrVXNlckZvckNyZWRlbnRp YWxzKCk7CkBAIC0yNTgsMTEgKzI0MiwyMiBAQCB2b2lkIE5ldHdvcmtMb2FkOjpzZXRQZW5kaW5n RG93bmxvYWQoUGVuZGluZ0Rvd25sb2FkJiBwZW5kaW5nRG93bmxvYWQpCiAgICAgbV90YXNrLT5z ZXRQZW5kaW5nRG93bmxvYWQocGVuZGluZ0Rvd25sb2FkKTsKIH0KIAotdm9pZCBOZXR3b3JrTG9h ZDo6d2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oUmVzb3VyY2VSZXNwb25zZSYmIHJlc3BvbnNl LCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBSZWRpcmVjdENvbXBsZXRpb25IYW5kbGVyJiYg Y29tcGxldGlvbkhhbmRsZXIpCit2b2lkIE5ldHdvcmtMb2FkOjp3aWxsUGVyZm9ybUhUVFBSZWRp cmVjdGlvbihSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgUmVzb3VyY2VSZXF1 ZXN0JiYgcmVxdWVzdCwgUmVkaXJlY3RDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5k bGVyKQogeworICAgIEFTU0VSVCghcmVkaXJlY3RSZXNwb25zZS5pc051bGwoKSk7CisgICAgQVNT RVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBBU1NFUlQoIW1fcmVkaXJlY3RDb21wbGV0aW9u SGFuZGxlcik7CisKICAgICBtX3JlZGlyZWN0Q29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKTsKLSAgICBzaGFyZWRXaWxsU2VuZFJlZGlyZWN0ZWRSZXF1ZXN0KFdU Rk1vdmUocmVxdWVzdCksIFdURk1vdmUocmVzcG9uc2UpKTsKKworI2lmIEVOQUJMRShORVRXT1JL X0NBUFRVUkUpCisgICAgaWYgKG1fcmVjb3JkZXIpCisgICAgICAgIG1fcmVjb3JkZXItPnJlY29y ZFJlZGlyZWN0UmVjZWl2ZWQocmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7CisjZW5kaWYKKwor ICAgIGF1dG8gb2xkUmVxdWVzdCA9IFdURk1vdmUobV9jdXJyZW50UmVxdWVzdCk7CisgICAgbV9j dXJyZW50UmVxdWVzdCA9IHJlcXVlc3Q7CisgICAgbV9jbGllbnQuZ2V0KCkud2lsbFNlbmRSZWRp cmVjdGVkUmVxdWVzdChXVEZNb3ZlKG9sZFJlcXVlc3QpLCBXVEZNb3ZlKHJlcXVlc3QpLCBXVEZN b3ZlKHJlZGlyZWN0UmVzcG9uc2UpKTsKIH0KIAogdm9pZCBOZXR3b3JrTG9hZDo6ZGlkUmVjZWl2 ZUNoYWxsZW5nZShjb25zdCBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdlLCBDaGFs bGVuZ2VDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5oIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5oCmluZGV4IGE2NGUxMGNhODUxNGYxZjM1MDNj ZTQ1MTI1OTdkYWRhYjA3OGM1ODAuLjc1MDc4MTk3Y2ZkM2FmMWQ2ZmQ2M2Q0MTBmZDFiNzE5NzEy MjZmOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xv YWQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgKQEAg LTgwLDcgKzgwLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGluaXRpYWxpemUoTmV0d29ya1Nlc3Np b24mKTsKIAogICAgIE5ldHdvcmtMb2FkQ2xpZW50OjpTaG91bGRDb250aW51ZURpZFJlY2VpdmVS ZXNwb25zZSBzaGFyZWREaWRSZWNlaXZlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZSYmKTsKLSAgICB2b2lkIHNoYXJlZFdpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QoV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJik7CiAKICAgICAv LyBOZXR3b3JrRGF0YVRhc2tDbGllbnQKICAgICB2b2lkIHdpbGxQZXJmb3JtSFRUUFJlZGlyZWN0 aW9uKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiYsIFJlZGlyZWN0Q29tcGxldGlvbkhhbmRsZXImJikgZmluYWw7Cg==