175756 2017-08-20 11:03:40 -0700 Simplify calls to LoaderStrategy::startPingLoad() 2017-08-20 18:39:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175746 1 cdumez cdumez buildbot commit-queue dbates esprehn+autocc ggaren japhet kangil.han sam webkit-bug-importer youennf oldest_to_newest 1340479 0 cdumez 2017-08-20 11:03:40 -0700 Simplify calls to LoaderStrategy::startPingLoad(). 1340485 1 318605 cdumez 2017-08-20 13:40:04 -0700 Created attachment 318605 Patch 1340491 2 318605 commit-queue 2017-08-20 16:11:44 -0700 Comment on attachment 318605 Patch Clearing flags on attachment: 318605 Committed r220957: <http://trac.webkit.org/changeset/220957> 1340492 3 commit-queue 2017-08-20 16:11:46 -0700 All reviewed patches have been landed. Closing bug. 1340493 4 webkit-bug-importer 2017-08-20 16:12:19 -0700 <rdar://problem/33984511> 1340506 5 318605 youennf 2017-08-20 18:39:40 -0700 Comment on attachment 318605 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318605&action=review > Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:425 > + loadParameters.sourceOrigin = &document->securityOrigin(); Since we have both request and sourceOrigin, I wonder whether we should not add an ASSERT ensuring that the Origin header of the request, if any, is matching sourceOrigin. And maybe one for referer as well. > Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:432 > + if (auto * contentSecurityPolicy = document->contentSecurityPolicy()) space between auto and *. 318605 2017-08-20 13:40:04 -0700 2017-08-20 16:11:44 -0700 Patch bug-175756-20170820134003.patch text/plain 16454 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwOTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmViOTFkYWZiZTg4NWFh MjQ2MWY1ZTIwNjI4OWY5NmZmYzNiNWVhNy4uMjk4NzMwZmRhNzdjMTAzMTBjNzI0NDQzY2EwYzMx MWRiMWMyYjBlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA4LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgY2FsbHMgdG8g TG9hZGVyU3RyYXRlZ3k6OnN0YXJ0UGluZ0xvYWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1NzU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU2ltcGxpZnkgY2FsbHMgdG8gTG9hZGVyU3RyYXRlZ3k6 OnN0YXJ0UGluZ0xvYWQoKSBieSBwYXNzaW5nIHRoZSBGcmFtZSB0byBpdAorICAgICAgICBhbmQg bGV0IGl0cyBpbXBsZW1lbnRhdGlvbiBnZXRzIHdoYXQgaXQgbmVlZHMgZnJvbSB0aGUgZnJhbWUu IFRoaXMgcmVkdWNlcworICAgICAgICB0aGUgbnVtYmVyIG9mIHBhcmFtZXRlcnMgdG8gc3RhcnRQ aW5nTG9hZCgpIGFuZCBpcyBtb3JlIGVhc2lseSBleHRlbnNpYmxlLgorCisgICAgICAgICogZG9t L0RvY3VtZW50Lmg6CisgICAgICAgICogbG9hZGVyL0xvYWRlclN0cmF0ZWd5Lmg6CisgICAgICAg ICogbG9hZGVyL1BpbmdMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGluZ0xvYWRlcjo6 bG9hZEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OnNlbmRQaW5nKToKKyAg ICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OnNlbmRWaW9sYXRpb25SZXBvcnQpOgorICAgICAg ICAoV2ViQ29yZTo6UGluZ0xvYWRlcjo6c3RhcnRQaW5nTG9hZCk6CisgICAgICAgICogbG9hZGVy L1BpbmdMb2FkZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OmxvYWQpOgorCiAyMDE3LTA4LTIw ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBGYWN0b3IgOmJl Zm9yZS86YWZ0ZXIgcmVuZGVyIHRyZWUgbXV0YXRpb25zIGludG8gYSBSZW5kZXJUcmVlVXBkYXRl ciBoZWxwZXIgY2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMWY4NjE0ZDYyMzEwNzUzMWZhNjIzYjlkZTgzMzI4 MmY2YTY0YzAwZS4uOGUzNDQzMTI4MzhhM2ZhMTljOGJkYmMyYTYyNTcwOWVkMDUwNmEwZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wOC0yMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IGNhbGxzIHRvIExvYWRlclN0cmF0ZWd5Ojpz dGFydFBpbmdMb2FkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NTc1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnN0YXJ0UGluZ0xvYWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oOgorCiAyMDE3LTA4LTE4ICBD aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW0JlYWNvbl0gSW1wcm92 ZSBlcnJvciByZXBvcnRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9DaGFuZ2VMb2cKaW5kZXggOGFiNzE3MjU3ZTFiY2Zj ZDFjMzQ4MGEwZDg2MmI3ZjhhMDdmM2QxNS4uZTA4MWUwNDU5YTA0MzllMmQ3M2E5NTg3OTI5MWFh NzBkZTgxOGE3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdExlZ2FjeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0w OC0yMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5 IGNhbGxzIHRvIExvYWRlclN0cmF0ZWd5OjpzdGFydFBpbmdMb2FkKCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTc1NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViUmVz b3VyY2VMb2FkU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYlJlc291cmNlTG9hZFNjaGVkdWxl cjo6c3RhcnRQaW5nTG9hZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViUmVzb3VyY2VM b2FkU2NoZWR1bGVyLmg6CisKIDIwMTctMDgtMTggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBbQmVhY29uXSBJbXByb3ZlIGVycm9yIHJlcG9ydGluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaAppbmRleCAzZjAwMmFhNDAyNGEyMTA0NmRkOWI2M2VhMzc4NWMyNzRkNTI0Njg0 Li5iZTJmZTQ2YmUwMDI2MWI5OGJhNjM1YjVlMTFiNjJiMmU0MDA1ZDUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuaApAQCAtNTc2LDcgKzU3Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHByZXBhcmVGb3JE ZXN0cnVjdGlvbigpOwogCiAgICAgLy8gT3ZlcnJpZGUgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCBt ZXRob2RzIHRvIGRvIGFkZGl0aW9uYWwgd29yawotICAgIGJvb2wgc2hvdWxkQnlwYXNzTWFpbldv cmxkQ29udGVudFNlY3VyaXR5UG9saWN5KCkgY29uc3QgZmluYWw7CisgICAgV0VCQ09SRV9FWFBP UlQgYm9vbCBzaG91bGRCeXBhc3NNYWluV29ybGRDb250ZW50U2VjdXJpdHlQb2xpY3koKSBjb25z dCBmaW5hbDsKICAgICB2b2lkIHN1c3BlbmRBY3RpdmVET01PYmplY3RzKEFjdGl2ZURPTU9iamVj dDo6UmVhc29uRm9yU3VzcGVuc2lvbikgZmluYWw7CiAgICAgdm9pZCByZXN1bWVBY3RpdmVET01P YmplY3RzKEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbikgZmluYWw7CiAgICAg dm9pZCBzdG9wQWN0aXZlRE9NT2JqZWN0cygpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0xvYWRlclN0cmF0ZWd5LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTG9h ZGVyU3RyYXRlZ3kuaAppbmRleCA4ODI3NTY3YzQ0NGMxOWIyNDUzMTVlMmQyOTUxNGI5YjAyYWJi MjVhLi5kNjU5MGEyYWNjZjZkNzUzZTJjYmYwMTJkMzY1M2VmYjY3NmNmYTk5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTG9hZGVyU3RyYXRlZ3kuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvTG9hZGVyU3RyYXRlZ3kuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCB2b2lkIHJlc3VtZVBlbmRpbmdSZXF1ZXN0cygpID0gMDsKIAogICAgIHVzaW5n IFBpbmdMb2FkQ29tcGxldGlvbkhhbmRsZXIgPSBXVEY6OkZ1bmN0aW9uPHZvaWQoY29uc3QgUmVz b3VyY2VFcnJvciYpPjsKLSAgICB2aXJ0dWFsIHZvaWQgc3RhcnRQaW5nTG9hZChOZXR3b3JraW5n Q29udGV4dCosIFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIG9yaWdpbmFs UmVxdWVzdEhlYWRlcnMsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiBzb3VyY2VPcmlnaW4sIENvbnRl bnRTZWN1cml0eVBvbGljeSosIGNvbnN0IEZldGNoT3B0aW9ucyYsIFBpbmdMb2FkQ29tcGxldGlv bkhhbmRsZXImJiA9IHsgfSkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzdGFydFBpbmdMb2FkKEZy YW1lJiwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgSFRUUEhlYWRlck1hcCYgb3JpZ2luYWxSZXF1 ZXN0SGVhZGVycywgY29uc3QgRmV0Y2hPcHRpb25zJiwgUGluZ0xvYWRDb21wbGV0aW9uSGFuZGxl ciYmID0geyB9KSA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgc3RvcmVEZXJpdmVkRGF0YVRvQ2Fj aGUoY29uc3QgU0hBMTo6RGlnZXN0JiBib2R5S2V5LCBjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0 IFN0cmluZyYgcGFydGl0aW9uLCBXZWJDb3JlOjpTaGFyZWRCdWZmZXImKSA9IDA7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcAppbmRleCBhMmViOThkZTNjZWYxZTZjMjY3ZGMxZDZk YmMxMmUyYmViMDM0ZGNmLi41M2FhMjU3OGM1YzYzM2FiYzJjYjVjNTM1MTc5Nzk1M2RjYWJkYTky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCkBAIC0xMDYsNyArMTA2LDcgQEAg dm9pZCBQaW5nTG9hZGVyOjpsb2FkSW1hZ2UoRnJhbWUmIGZyYW1lLCBjb25zdCBVUkwmIHVybCkK ICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwogICAgIGZyYW1lLmxv YWRlcigpLmFkZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCk7CiAKLSAg ICBzdGFydFBpbmdMb2FkKGZyYW1lLCByZXF1ZXN0LCBXVEZNb3ZlKG9yaWdpbmFsUmVxdWVzdEhl YWRlciksIGRvY3VtZW50LCBTaG91bGRGb2xsb3dSZWRpcmVjdHM6Olllcyk7CisgICAgc3RhcnRQ aW5nTG9hZChmcmFtZSwgcmVxdWVzdCwgV1RGTW92ZShvcmlnaW5hbFJlcXVlc3RIZWFkZXIpLCBT aG91bGRGb2xsb3dSZWRpcmVjdHM6Olllcyk7CiB9CiAKIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9y Zy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL2xpbmtzLmh0bWwjaHlwZXJs aW5rLWF1ZGl0aW5nCkBAIC0xNDUsNyArMTQ1LDcgQEAgdm9pZCBQaW5nTG9hZGVyOjpzZW5kUGlu ZyhGcmFtZSYgZnJhbWUsIGNvbnN0IFVSTCYgcGluZ1VSTCwgY29uc3QgVVJMJiBkZXN0aW5hdGkK ICAgICAgICAgfQogICAgIH0KIAotICAgIHN0YXJ0UGluZ0xvYWQoZnJhbWUsIHJlcXVlc3QsIFdU Rk1vdmUob3JpZ2luYWxSZXF1ZXN0SGVhZGVyKSwgZG9jdW1lbnQsIFNob3VsZEZvbGxvd1JlZGly ZWN0czo6WWVzKTsKKyAgICBzdGFydFBpbmdMb2FkKGZyYW1lLCByZXF1ZXN0LCBXVEZNb3ZlKG9y aWdpbmFsUmVxdWVzdEhlYWRlciksIFNob3VsZEZvbGxvd1JlZGlyZWN0czo6WWVzKTsKIH0KIAog dm9pZCBQaW5nTG9hZGVyOjpzZW5kVmlvbGF0aW9uUmVwb3J0KEZyYW1lJiBmcmFtZSwgY29uc3Qg VVJMJiByZXBvcnRVUkwsIFJlZjxGb3JtRGF0YT4mJiByZXBvcnQsIFZpb2xhdGlvblJlcG9ydFR5 cGUgcmVwb3J0VHlwZSkKQEAgLTE4NCwxMCArMTg0LDEwIEBAIHZvaWQgUGluZ0xvYWRlcjo6c2Vu ZFZpb2xhdGlvblJlcG9ydChGcmFtZSYgZnJhbWUsIGNvbnN0IFVSTCYgcmVwb3J0VVJMLCBSZWY8 Rm9yCiAgICAgaWYgKCFyZWZlcnJlci5pc0VtcHR5KCkpCiAgICAgICAgIHJlcXVlc3Quc2V0SFRU UFJlZmVycmVyKHJlZmVycmVyKTsKIAotICAgIHN0YXJ0UGluZ0xvYWQoZnJhbWUsIHJlcXVlc3Qs IFdURk1vdmUob3JpZ2luYWxSZXF1ZXN0SGVhZGVyKSwgZG9jdW1lbnQsIFNob3VsZEZvbGxvd1Jl ZGlyZWN0czo6Tm8pOworICAgIHN0YXJ0UGluZ0xvYWQoZnJhbWUsIHJlcXVlc3QsIFdURk1vdmUo b3JpZ2luYWxSZXF1ZXN0SGVhZGVyKSwgU2hvdWxkRm9sbG93UmVkaXJlY3RzOjpObyk7CiB9CiAK LXZvaWQgUGluZ0xvYWRlcjo6c3RhcnRQaW5nTG9hZChGcmFtZSYgZnJhbWUsIFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwgSFRUUEhlYWRlck1hcCYmIG9yaWdpbmFsUmVxdWVzdEhlYWRlcnMsIERv Y3VtZW50JiBkb2N1bWVudCwgU2hvdWxkRm9sbG93UmVkaXJlY3RzIHNob3VsZEZvbGxvd1JlZGly ZWN0cykKK3ZvaWQgUGluZ0xvYWRlcjo6c3RhcnRQaW5nTG9hZChGcmFtZSYgZnJhbWUsIFJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCwgSFRUUEhlYWRlck1hcCYmIG9yaWdpbmFsUmVxdWVzdEhlYWRl cnMsIFNob3VsZEZvbGxvd1JlZGlyZWN0cyBzaG91bGRGb2xsb3dSZWRpcmVjdHMpCiB7CiAgICAg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gZnJhbWUucGFnZSgpLT5wcm9ncmVzcygpLmNyZWF0 ZVVuaXF1ZUlkZW50aWZpZXIoKTsKICAgICAvLyBGSVhNRTogV2h5IGFjdGl2ZURvY3VtZW50TG9h ZGVyPyBJIHdvdWxkIGhhdmUgZXhwZWN0ZWQgZG9jdW1lbnRMb2FkZXIoKS4KQEAgLTIwMiw4ICsy MDIsNyBAQCB2b2lkIFBpbmdMb2FkZXI6OnN0YXJ0UGluZ0xvYWQoRnJhbWUmIGZyYW1lLCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIEhUVFBIZWFkZQogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpjb250aW51ZUFmdGVyUGluZ0xvYWRlcihmcmFtZSwgaWRlbnRpZmllciwgZnJhbWUu bG9hZGVyKCkuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKSwgcmVxdWVzdCwgUmVzb3VyY2VSZXNwb25z ZSgpKTsKIAotICAgIGF1dG8qIGNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGRvY3VtZW50LnNob3Vs ZEJ5cGFzc01haW5Xb3JsZENvbnRlbnRTZWN1cml0eVBvbGljeSgpID8gbnVsbHB0ciA6IGRvY3Vt ZW50LmNvbnRlbnRTZWN1cml0eVBvbGljeSgpOwotICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5s b2FkZXJTdHJhdGVneSgpLT5zdGFydFBpbmdMb2FkKGZyYW1lLmxvYWRlcigpLm5ldHdvcmtpbmdD b250ZXh0KCksIHJlcXVlc3QsIFdURk1vdmUob3JpZ2luYWxSZXF1ZXN0SGVhZGVycyksIGRvY3Vt ZW50LnNlY3VyaXR5T3JpZ2luKCksIGNvbnRlbnRTZWN1cml0eVBvbGljeSwgb3B0aW9ucyk7Cisg ICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxvYWRlclN0cmF0ZWd5KCktPnN0YXJ0UGluZ0xvYWQo ZnJhbWUsIHJlcXVlc3QsIFdURk1vdmUob3JpZ2luYWxSZXF1ZXN0SGVhZGVycyksIG9wdGlvbnMp OwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuaAppbmRleCAwNWM1NDk3NTI4YTQ5 NzlmOTc0Y2RmZWFhNGY5YzA4NWFkMjMyNmVjLi4xNzVhNDcwYTU5MDRhNWZlYjcwODA0YTVkNmEw Y2VkMDM0MmI3ZWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmgKQEAgLTM3LDcgKzM3 LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBEb2N1bWVudDsKIGNsYXNzIEZv cm1EYXRhOwogY2xhc3MgRnJhbWU7CiBjbGFzcyBIVFRQSGVhZGVyTWFwOwpAQCAtNTcsNyArNTYs NyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgZW51bSBjbGFzcyBTaG91bGRGb2xsb3dSZWRp cmVjdHMgeyBObywgWWVzIH07Ci0gICAgc3RhdGljIHZvaWQgc3RhcnRQaW5nTG9hZChGcmFtZSYs IFJlc291cmNlUmVxdWVzdCYsIEhUVFBIZWFkZXJNYXAmJiBvcmlnaW5hbFJlcXVlc3RIZWFkZXJz LCBEb2N1bWVudCYsIFNob3VsZEZvbGxvd1JlZGlyZWN0cyk7CisgICAgc3RhdGljIHZvaWQgc3Rh cnRQaW5nTG9hZChGcmFtZSYsIFJlc291cmNlUmVxdWVzdCYsIEhUVFBIZWFkZXJNYXAmJiBvcmln aW5hbFJlcXVlc3RIZWFkZXJzLCBTaG91bGRGb2xsb3dSZWRpcmVjdHMpOwogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZS5jcHAKaW5kZXggNDg1ZmMzOTE3MjM1MWQ1NDUwZTU2ZDhiZWRmMjBkOTdiNGY0ZjYx Zi4uYWRmNzU1ODQ0MzM4ZDA2OWY1NThkMzVlNzBlMzNlZTRlNjRjMzY4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCkBAIC0yNjgsMTMgKzI2 OCw5IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2U6OmxvYWQoQ2FjaGVkUmVzb3VyY2VMb2FkZXImIGNh Y2hlZFJlc291cmNlTG9hZGVyKQogICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91 bGQgbm90IHNwZWNpYWwtY2FzZSBCZWFjb24gaGVyZS4KICAgICAgICAgaWYgKHNob3VsZFVzZVBp bmdMb2FkKHR5cGUoKSkpIHsKLSAgICAgICAgICAgIEFTU0VSVChtX29yaWdpbik7Ci0gICAgICAg ICAgICAvLyBCZWFjb24gaXMgbm90IGV4cG9zZWQgdG8gd29ya2VycyBzbyBpdCBpcyBzYWZlIHRv IHJlbHkgb24gdGhlIGRvY3VtZW50IGhlcmUuCi0gICAgICAgICAgICBhdXRvKiBkb2N1bWVudCA9 IGNhY2hlZFJlc291cmNlTG9hZGVyLmRvY3VtZW50KCk7Ci0gICAgICAgICAgICBhdXRvKiBjb250 ZW50U2VjdXJpdHlQb2xpY3kgPSBkb2N1bWVudCAmJiAhZG9jdW1lbnQtPnNob3VsZEJ5cGFzc01h aW5Xb3JsZENvbnRlbnRTZWN1cml0eVBvbGljeSgpID8gZG9jdW1lbnQtPmNvbnRlbnRTZWN1cml0 eVBvbGljeSgpIDogbnVsbHB0cjsKICAgICAgICAgICAgIEFTU0VSVChtX29yaWdpbmFsUmVxdWVz dEhlYWRlcnMpOwogICAgICAgICAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3Vy Y2U+IHByb3RlY3RlZFRoaXModGhpcyk7Ci0gICAgICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMo KS0+bG9hZGVyU3RyYXRlZ3koKS0+c3RhcnRQaW5nTG9hZChmcmFtZS5sb2FkZXIoKS5uZXR3b3Jr aW5nQ29udGV4dCgpLCByZXF1ZXN0LCAqbV9vcmlnaW5hbFJlcXVlc3RIZWFkZXJzLCAqbV9vcmln aW4sIGNvbnRlbnRTZWN1cml0eVBvbGljeSwgbV9vcHRpb25zLCBbdGhpcywgcHJvdGVjdGVkVGhp cyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldIChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikg eworICAgICAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxvYWRlclN0cmF0ZWd5KCktPnN0 YXJ0UGluZ0xvYWQoZnJhbWUsIHJlcXVlc3QsICptX29yaWdpbmFsUmVxdWVzdEhlYWRlcnMsIG1f b3B0aW9ucywgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXSAo Y29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpIHsKICAgICAgICAgICAgICAgICBpZiAoZXJyb3Iu aXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgICAgIGZpbmlzaExvYWRpbmcobnVsbHB0cik7CiAg ICAgICAgICAgICAgICAgZWxzZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKaW5kZXggZTk3ZmNiZDdmOTIwY2Y5NDFl OTA2NmQ4NzlkMWRlZTBlMTFlYTlmNi4uNmZiZTMwNmU0ZDc1NzYwYTBjMjZjYjYzMjVjODgyZjBj NGU0MjY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtMzk2LDEwICszOTYsMTEgQEAgc3RhdGljIHVpbnQ2 NF90IGdlbmVyYXRlUGluZ0xvYWRJZGVudGlmaWVyKCkKICAgICByZXR1cm4gKytpZGVudGlmaWVy OwogfQogCi12b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzdGFydFBpbmdMb2FkKE5ldHdvcmtpbmdD b250ZXh0KiBuZXR3b3JraW5nQ29udGV4dCwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25z dCBIVFRQSGVhZGVyTWFwJiBvcmlnaW5hbFJlcXVlc3RIZWFkZXJzLCBSZWY8U2VjdXJpdHlPcmln aW4+JiYgc291cmNlT3JpZ2luLCBDb250ZW50U2VjdXJpdHlQb2xpY3kqIGNvbnRlbnRTZWN1cml0 eVBvbGljeSwgY29uc3QgRmV0Y2hPcHRpb25zJiBvcHRpb25zLCBQaW5nTG9hZENvbXBsZXRpb25I YW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzdGFy dFBpbmdMb2FkKEZyYW1lJiBmcmFtZSwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBI VFRQSGVhZGVyTWFwJiBvcmlnaW5hbFJlcXVlc3RIZWFkZXJzLCBjb25zdCBGZXRjaE9wdGlvbnMm IG9wdGlvbnMsIFBpbmdMb2FkQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikK IHsKICAgICAvLyBJdCdzIHBvc3NpYmxlIHRoYXQgY2FsbCB0byBjcmVhdGVQaW5nSGFuZGxlIG1p Z2h0IGJlIG1hZGUgZHVyaW5nIGluaXRpYWwgZW1wdHkgRG9jdW1lbnQgY3JlYXRpb24gYmVmb3Jl IGEgTmV0d29ya2luZ0NvbnRleHQgZXhpc3RzLgogICAgIC8vIEl0IGlzIG5vdCBjbGVhciB0aGF0 IHdlIHNob3VsZCBzZW5kIHBpbmcgbG9hZHMgZHVyaW5nIHRoYXQgcHJvY2VzcyBhbnl3YXlzLgor ICAgIGF1dG8qIG5ldHdvcmtpbmdDb250ZXh0ID0gZnJhbWUubG9hZGVyKCkubmV0d29ya2luZ0Nv bnRleHQoKTsKICAgICBpZiAoIW5ldHdvcmtpbmdDb250ZXh0KSB7CiAgICAgICAgIGlmIChjb21w bGV0aW9uSGFuZGxlcikKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGludGVybmFsRXJy b3IocmVxdWVzdC51cmwoKSkpOwpAQCAtNDEwLDE4ICs0MTEsMjcgQEAgdm9pZCBXZWJMb2FkZXJT dHJhdGVneTo6c3RhcnRQaW5nTG9hZChOZXR3b3JraW5nQ29udGV4dCogbmV0d29ya2luZ0NvbnRl eHQsIFJlc28KICAgICBXZWJGcmFtZUxvYWRlckNsaWVudCogd2ViRnJhbWVMb2FkZXJDbGllbnQg PSB3ZWJDb250ZXh0LT53ZWJGcmFtZUxvYWRlckNsaWVudCgpOwogICAgIFdlYkZyYW1lKiB3ZWJG cmFtZSA9IHdlYkZyYW1lTG9hZGVyQ2xpZW50ID8gd2ViRnJhbWVMb2FkZXJDbGllbnQtPndlYkZy YW1lKCkgOiBudWxscHRyOwogICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSB3ZWJGcmFtZSA/IHdlYkZy YW1lLT5wYWdlKCkgOiBudWxscHRyOworCisgICAgYXV0byogZG9jdW1lbnQgPSBmcmFtZS5kb2N1 bWVudCgpOworICAgIGlmICghZG9jdW1lbnQpIHsKKyAgICAgICAgaWYgKGNvbXBsZXRpb25IYW5k bGVyKQorICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoaW50ZXJuYWxFcnJvcihyZXF1ZXN0 LnVybCgpKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgCiAgICAgTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CiAgICAgbG9hZFBhcmFtZXRlcnMuaWRl bnRpZmllciA9IGdlbmVyYXRlUGluZ0xvYWRJZGVudGlmaWVyKCk7CiAgICAgbG9hZFBhcmFtZXRl cnMucmVxdWVzdCA9IHJlcXVlc3Q7Ci0gICAgbG9hZFBhcmFtZXRlcnMuc291cmNlT3JpZ2luID0g V1RGTW92ZShzb3VyY2VPcmlnaW4pOworICAgIGxvYWRQYXJhbWV0ZXJzLnNvdXJjZU9yaWdpbiA9 ICZkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKTsKICAgICBsb2FkUGFyYW1ldGVycy5zZXNzaW9u SUQgPSB3ZWJQYWdlID8gd2ViUGFnZS0+c2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Npb25JRDo6ZGVm YXVsdFNlc3Npb25JRCgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlh bHMgPSBvcHRpb25zLmNyZWRlbnRpYWxzID09IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Ok9t aXQgPyBEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBBbGxvd1N0b3JlZENyZWRlbnRpYWxz OwogICAgIGxvYWRQYXJhbWV0ZXJzLm1vZGUgPSBvcHRpb25zLm1vZGU7CiAgICAgbG9hZFBhcmFt ZXRlcnMuc2hvdWxkRm9sbG93UmVkaXJlY3RzID0gb3B0aW9ucy5yZWRpcmVjdCA9PSBGZXRjaE9w dGlvbnM6OlJlZGlyZWN0OjpGb2xsb3c7CiAgICAgbG9hZFBhcmFtZXRlcnMuc2hvdWxkQ2xlYXJS ZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCA9IG5ldHdvcmtpbmdDb250ZXh0LT5zaG91bGRD bGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KCk7Ci0gICAgaWYgKGNvbnRlbnRTZWN1 cml0eVBvbGljeSkKLSAgICAgICAgbG9hZFBhcmFtZXRlcnMuY3NwUmVzcG9uc2VIZWFkZXJzID0g Y29udGVudFNlY3VyaXR5UG9saWN5LT5yZXNwb25zZUhlYWRlcnMoKTsKKyAgICBpZiAoIWRvY3Vt ZW50LT5zaG91bGRCeXBhc3NNYWluV29ybGRDb250ZW50U2VjdXJpdHlQb2xpY3koKSkgeworICAg ICAgICBpZiAoYXV0byAqIGNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGRvY3VtZW50LT5jb250ZW50 U2VjdXJpdHlQb2xpY3koKSkKKyAgICAgICAgICAgIGxvYWRQYXJhbWV0ZXJzLmNzcFJlc3BvbnNl SGVhZGVycyA9IGNvbnRlbnRTZWN1cml0eVBvbGljeS0+cmVzcG9uc2VIZWFkZXJzKCk7CisgICAg fQogCiAgICAgaWYgKGNvbXBsZXRpb25IYW5kbGVyKQogICAgICAgICBtX3BpbmdMb2FkQ29tcGxl dGlvbkhhbmRsZXJzLmFkZChsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyLCBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay9XZWJMb2FkZXJTdHJhdGVneS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdv cmsvV2ViTG9hZGVyU3RyYXRlZ3kuaAppbmRleCAyZjQ0ZjhkYjgwYWRjM2M0NDA4OTNlYmQ3NDQ2 Y2ZiNzM5NjA5YTczLi5mNGYxNTc3MmE3MzQ0ZTdmMDhjNjA5NTU3YjRmZWJjZmNhMDljYWNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJh dGVneS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0 cmF0ZWd5LmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc3VzcGVuZFBlbmRp bmdSZXF1ZXN0cygpIGZpbmFsOwogICAgIHZvaWQgcmVzdW1lUGVuZGluZ1JlcXVlc3RzKCkgZmlu YWw7CiAKLSAgICB2b2lkIHN0YXJ0UGluZ0xvYWQoV2ViQ29yZTo6TmV0d29ya2luZ0NvbnRleHQq LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpIVFRQSGVhZGVyTWFw JiBvcmlnaW5hbFJlcXVlc3RIZWFkZXJzLCBSZWY8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+JiYg c291cmNlT3JpZ2luLCBXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3kqLCBjb25zdCBXZWJD b3JlOjpGZXRjaE9wdGlvbnMmLCBQaW5nTG9hZENvbXBsZXRpb25IYW5kbGVyJiYpIGZpbmFsOwor ICAgIHZvaWQgc3RhcnRQaW5nTG9hZChXZWJDb3JlOjpGcmFtZSYsIFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OkhUVFBIZWFkZXJNYXAmIG9yaWdpbmFsUmVxdWVzdEhl YWRlcnMsIGNvbnN0IFdlYkNvcmU6OkZldGNoT3B0aW9ucyYsIFBpbmdMb2FkQ29tcGxldGlvbkhh bmRsZXImJikgZmluYWw7CiAgICAgdm9pZCBkaWRGaW5pc2hQaW5nTG9hZCh1aW50NjRfdCBwaW5n TG9hZElkZW50aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlRXJyb3ImJik7CiAKICAgICB2b2lkIHN0 b3JlRGVyaXZlZERhdGFUb0NhY2hlKGNvbnN0IFNIQTE6OkRpZ2VzdCYgYm9keUhhc2gsIGNvbnN0 IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBwYXJ0aXRpb24sIFdlYkNvcmU6OlNoYXJlZEJ1 ZmZlciYpIGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3Vw cG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS9X ZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwCmluZGV4IGRiZTlkM2Q2 NzdjYWJhNjMzYjRmODA0YmJmYWJhNTM1Mzg0M2U4ZmQuLjBiZTAwMmIzMTc1ZjZkYjVmZmI1ZjJl ZjM1NTdjNjg0YTM4ZTBjZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvV2ViQ29y ZVN1cHBvcnQvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L1dlYkNvcmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKQEAgLTM2 Myw5ICszNjMsOSBAQCBib29sIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6SG9zdEluZm9ybWF0 aW9uOjpsaW1pdFJlcXVlc3RzKFJlc291cmNlTG9hZFByaW9yaQogICAgIHJldHVybiBtX3JlcXVl c3RzTG9hZGluZy5zaXplKCkgPj0gKHdlYlJlc291cmNlTG9hZFNjaGVkdWxlcigpLmlzU2VyaWFs TG9hZGluZ0VuYWJsZWQoKSA/IDEgOiBtX21heFJlcXVlc3RzSW5GbGlnaHQpOwogfQogCi12b2lk IFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c3RhcnRQaW5nTG9hZChOZXR3b3JraW5nQ29udGV4 dCogbmV0d29ya2luZ0NvbnRleHQsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgSFRU UEhlYWRlck1hcCYsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiwgV2ViQ29yZTo6Q29udGVudFNlY3Vy aXR5UG9saWN5KiwgY29uc3QgRmV0Y2hPcHRpb25zJiBvcHRpb25zLCBQaW5nTG9hZENvbXBsZXRp b25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVk dWxlcjo6c3RhcnRQaW5nTG9hZChGcmFtZSYgZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgY29uc3QgSFRUUEhlYWRlck1hcCYsIGNvbnN0IEZldGNoT3B0aW9ucyYgb3B0aW9ucywgUGlu Z0xvYWRDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIC8vIFBp bmdIYW5kbGUgbWFuYWdlcyBpdHMgb3duIGxpZmV0aW1lLCBkZWxldGluZyBpdHNlbGYgd2hlbiBp dHMgcHVycG9zZSBoYXMgYmVlbiBmdWxmaWxsZWQuCi0gICAgbmV3IFBpbmdIYW5kbGUobmV0d29y a2luZ0NvbnRleHQsIHJlcXVlc3QsIG9wdGlvbnMuY3JlZGVudGlhbHMgIT0gRmV0Y2hPcHRpb25z OjpDcmVkZW50aWFsczo6T21pdCwgUGluZ0hhbmRsZTo6VXNlc0FzeW5jQ2FsbGJhY2tzOjpObywg b3B0aW9ucy5yZWRpcmVjdCA9PSBGZXRjaE9wdGlvbnM6OlJlZGlyZWN0OjpGb2xsb3csIFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBuZXcgUGluZ0hhbmRsZShmcmFtZS5sb2FkZXIo KS5uZXR3b3JraW5nQ29udGV4dCgpLCByZXF1ZXN0LCBvcHRpb25zLmNyZWRlbnRpYWxzICE9IEZl dGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Ok9taXQsIFBpbmdIYW5kbGU6OlVzZXNBc3luY0NhbGxi YWNrczo6Tm8sIG9wdGlvbnMucmVkaXJlY3QgPT0gRmV0Y2hPcHRpb25zOjpSZWRpcmVjdDo6Rm9s bG93LCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXRMZWdhY3kvV2ViQ29yZVN1cHBvcnQvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgg Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L1dlYkNvcmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVk dWxlci5oCmluZGV4IGY4MTY2MjdlYTQ0YmZmZWZkODJlYWY1MzFlOWIwZDYyMDgzOTY3NTUuLmMx OGMzMmU5ZGZlMjQyNmUwMTdmYjczYjBmMTc2YjgzM2EzMTk5YjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXRMZWdhY3kvV2ViQ29yZVN1cHBvcnQvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgK KysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRT Y2hlZHVsZXIuaApAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdXNwZW5kUGVu ZGluZ1JlcXVlc3RzKCkgZmluYWw7CiAgICAgdm9pZCByZXN1bWVQZW5kaW5nUmVxdWVzdHMoKSBm aW5hbDsKIAotICAgIHZvaWQgc3RhcnRQaW5nTG9hZChXZWJDb3JlOjpOZXR3b3JraW5nQ29udGV4 dCosIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OkhUVFBIZWFkZXJN YXAmLCBSZWY8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+JiYgc291cmNlT3JpZ2luLCBXZWJDb3Jl OjpDb250ZW50U2VjdXJpdHlQb2xpY3kqLCBjb25zdCBXZWJDb3JlOjpGZXRjaE9wdGlvbnMmLCBQ aW5nTG9hZENvbXBsZXRpb25IYW5kbGVyJiYpIGZpbmFsOworICAgIHZvaWQgc3RhcnRQaW5nTG9h ZChXZWJDb3JlOjpGcmFtZSYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNv cmU6OkhUVFBIZWFkZXJNYXAmLCBjb25zdCBXZWJDb3JlOjpGZXRjaE9wdGlvbnMmLCBQaW5nTG9h ZENvbXBsZXRpb25IYW5kbGVyJiYpIGZpbmFsOwogCiAgICAgdm9pZCBzdG9yZURlcml2ZWREYXRh VG9DYWNoZShjb25zdCBTSEExOjpEaWdlc3QmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcm LCBXZWJDb3JlOjpTaGFyZWRCdWZmZXImKSBmaW5hbCB7IH0KIAo=