224267 2021-04-06 21:11:12 -0700 Remove unused [WKURLSchemeTask _didPerformRedirection:] SPI 2022-10-25 13:27:40 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 1 beidson beidson achristensen ahmad.saleem792 webkit-bug-importer oldest_to_newest 1747764 0 beidson 2021-04-06 21:11:12 -0700 Remove unused [WKURLSchemeTask _didPerformRedirection:] SPI There's an API replacement now. 1747905 1 425403 beidson 2021-04-07 08:53:19 -0700 Created attachment 425403 Patch 1747960 2 425403 achristensen 2021-04-07 10:32:02 -0700 Comment on attachment 425403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425403&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm:348 > APIRedirect, This could be renamed. 1748018 3 425425 beidson 2021-04-07 12:26:55 -0700 Created attachment 425425 Fix tests 1749995 4 webkit-bug-importer 2021-04-13 21:12:12 -0700 <rdar://problem/76626642> 1908208 5 ahmad.saleem792 2022-10-25 13:27:40 -0700 It seems that this r+ patch didn't landed. I checked via BugID on Webkit GitHub. 425403 2021-04-07 08:53:19 -0700 2021-04-07 10:32:02 -0700 Patch patch text/plain 18043 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOGY4MjIzZDA2YjZiLi43M2Q5NDY0ODQ2ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjQgQEAKKzIwMjEtMDQtMDYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgor CisgICAgICAgIFJlbW92ZSB1bnVzZWQgW1dLVVJMU2NoZW1lVGFzayBfZGlkUGVyZm9ybVJlZGly ZWN0aW9uOl0gU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjQyNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb3ZlcmVkIGJ5IG5ldyBBUEkgd2l0aCBBUEkgdGVzdCBjaGFuZ2VzLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VSTFNjaGVtZVRhc2subW06CisgICAgICAgICgtW1dL VVJMU2NoZW1lVGFza0ltcGwgX2RpZFBlcmZvcm1SZWRpcmVjdGlvbjpuZXdSZXF1ZXN0Ol0pOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrUHJp dmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVVJMU2NoZW1lVGFzazo6ZGlkUGVyZm9ybVJlZGlyZWN0aW9uKTogRGVs ZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6dXJsU2NoZW1lVGFza1dpbGxQZXJmb3JtUmVkaXJlY3Rpb24pOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp1cmxTY2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKTogRGVsZXRlZC4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDIxLTA0LTAyICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV0tVUkxTY2hlbWVUYXNr IHJlZGlyZWN0IEFQSS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1VSTFNjaGVtZVRhc2subW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tVUkxTY2hlbWVUYXNrLm1tCmluZGV4IDcyNmY5MTMwN2FiYS4uNjY2OThkNGUzYWQxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVU YXNrLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VSTFNjaGVt ZVRhc2subW0KQEAgLTE0OCwxNiArMTQ4LDYgQEAgLSAodm9pZClkaWRGYWlsV2l0aEVycm9yOihO U0Vycm9yICopZXJyb3IKICAgICByYWlzZUV4Y2VwdGlvbklmTmVjZXNzYXJ5KHJlc3VsdCk7CiB9 CiAKLS0gKHZvaWQpX2RpZFBlcmZvcm1SZWRpcmVjdGlvbjooTlNVUkxSZXNwb25zZSAqKXJlc3Bv bnNlIG5ld1JlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QKLXsKLSAgICBhdXRvIGZ1bmN0 aW9uID0gW3Byb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIoc2VsZiksIHNlbGYsIHByb3RlY3RlZFJl c3BvbnNlID0gcmV0YWluUHRyKHJlc3BvbnNlKSwgcmVzcG9uc2UsIHByb3RlY3RlZFJlcXVlc3Qg PSByZXRhaW5QdHIocmVxdWVzdCksIHJlcXVlc3RdIHsKLSAgICAgICAgcmV0dXJuIF91cmxTY2hl bWVUYXNrLT50YXNrKCkuZGlkUGVyZm9ybVJlZGlyZWN0aW9uKHJlc3BvbnNlLCByZXF1ZXN0KTsK LSAgICB9OwotCi0gICAgYXV0byByZXN1bHQgPSBnZXRFeGNlcHRpb25UeXBlRnJvbU1haW5SdW5M b29wKFdURk1vdmUoZnVuY3Rpb24pKTsKLSAgICByYWlzZUV4Y2VwdGlvbklmTmVjZXNzYXJ5KHJl c3VsdCk7Ci19Ci0KIC0gKFdLRnJhbWVJbmZvICopX2ZyYW1lCiB7CiAgICAgcmV0dXJuIHdyYXBw ZXIoX3VybFNjaGVtZVRhc2stPnRhc2soKS5mcmFtZUluZm8oKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrUHJpdmF0ZS5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVVJMU2NoZW1lVGFza1ByaXZhdGUu aAppbmRleCBkNTljMmIyMjE2ZjcuLmFkN2U3MDIzY2Q0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVVJMU2NoZW1lVGFza1ByaXZhdGUuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrUHJpdmF0ZS5o CkBAIC0zMCw4ICszMCw2IEBACiBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEzKSwgaW9zKDEx LjApKQogQHByb3RvY29sIFdLVVJMU2NoZW1lVGFza1ByaXZhdGUgPFdLVVJMU2NoZW1lVGFzaz4K IAotLSAodm9pZClfZGlkUGVyZm9ybVJlZGlyZWN0aW9uOihOU1VSTFJlc3BvbnNlICopcmVzcG9u c2UgbmV3UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdDsKLQogQHByb3BlcnR5IChub25h dG9taWMsIHJlYWRvbmx5KSBCT09MIF9yZXF1ZXN0T25seUlmQ2FjaGVkIFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoMTAuMTUpLCBpb3MoMTMuMCkpOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRv bmx5KSBXS0ZyYW1lSW5mbyAqX2ZyYW1lIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTEuMCksIGlv cygxNC4wKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNj aGVtZVRhc2suY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5j cHAKaW5kZXggNjM5NDhlNDM1Y2M0Li43MGIyZDQyYzcwYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suY3BwCkBAIC0xMDQsMzggKzEwNCw2IEBAIGF1dG8g V2ViVVJMU2NoZW1lVGFzazo6d2lsbFBlcmZvcm1SZWRpcmVjdGlvbihSZXNvdXJjZVJlc3BvbnNl JiYgcmVzcG9uc2UsIFJlc291CiAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5vbmU7CiB9CiAK LWF1dG8gV2ViVVJMU2NoZW1lVGFzazo6ZGlkUGVyZm9ybVJlZGlyZWN0aW9uKFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmJiByZXNwb25zZSwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVx dWVzdCkgLT4gRXhjZXB0aW9uVHlwZQotewotICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 Ci0KLSAgICBpZiAobV9zdG9wcGVkKQotICAgICAgICByZXR1cm4gbV9zaG91bGRTdXBwcmVzc1Rh c2tTdG9wcGVkRXhjZXB0aW9ucyA/IEV4Y2VwdGlvblR5cGU6Ok5vbmUgOiBFeGNlcHRpb25UeXBl OjpUYXNrQWxyZWFkeVN0b3BwZWQ7Ci0KLSAgICBpZiAobV9jb21wbGV0ZWQpCi0gICAgICAgIHJl dHVybiBFeGNlcHRpb25UeXBlOjpDb21wbGV0ZUFscmVhZHlDYWxsZWQ7Ci0KLSAgICBpZiAobV9k YXRhU2VudCkKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6OkRhdGFBbHJlYWR5U2VudDsK LQotICAgIGlmIChtX3Jlc3BvbnNlU2VudCkKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6 OlJlZGlyZWN0QWZ0ZXJSZXNwb25zZTsKLQotICAgIGlmIChtX3dhaXRpbmdGb3JSZWRpcmVjdENv bXBsZXRpb25IYW5kbGVyQ2FsbGJhY2spCi0gICAgICAgIHJldHVybiBFeGNlcHRpb25UeXBlOjpX YWl0aW5nRm9yUmVkaXJlY3RDb21wbGV0aW9uSGFuZGxlcjsKLQotICAgIGlmIChpc1N5bmMoKSkK LSAgICAgICAgbV9zeW5jUmVzcG9uc2UgPSByZXNwb25zZTsKLQotICAgIHsKLSAgICAgICAgTG9j a0hvbGRlciBsb2NrZXIobV9yZXF1ZXN0TG9jayk7Ci0gICAgICAgIG1fcmVxdWVzdCA9IHJlcXVl c3Q7Ci0gICAgfQotCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxT Y2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRp ZmllcigpLCBtX2lkZW50aWZpZXIsIHJlc3BvbnNlLCByZXF1ZXN0KSwgbV93ZWJQYWdlSUQpOwot Ci0gICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5vbmU7Ci19Ci0KIGF1dG8gV2ViVVJMU2NoZW1l VGFzazo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl KSAtPiBFeGNlcHRpb25UeXBlCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaAppbmRleCA4NzBkZmY4ZTJk NzYuLjBjOTRmNmMxOGMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi VVJMU2NoZW1lVGFzay5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVt ZVRhc2suaApAQCAtODAsNyArODAsNiBAQCBwdWJsaWM6CiAgICAgICAgIE5vbmUsCiAgICAgfTsK ICAgICBFeGNlcHRpb25UeXBlIHdpbGxQZXJmb3JtUmVkaXJlY3Rpb24oV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgIEZ1bmN0aW9uPHZvaWQo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpPiYmKTsKLSAgICBFeGNlcHRpb25UeXBlIGRpZFBl cmZvcm1SZWRpcmVjdGlvbihXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYsIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYmKTsKICAgICBFeGNlcHRpb25UeXBlIGRpZFJlY2VpdmVSZXNwb25zZShj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgRXhjZXB0aW9uVHlwZSBkaWRS ZWNlaXZlRGF0YShSZWY8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYmKTsKICAgICBFeGNlcHRpb25U eXBlIGRpZENvbXBsZXRlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZWYyMDhiZmVhZDAx Li4zZmU5NGU1OGYyMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC02NzM5LDE0ICs2NzM5LDYgQEAgdm9pZCBXZWJQYWdlOjp1cmxTY2hlbWVU YXNrV2lsbFBlcmZvcm1SZWRpcmVjdGlvbih1aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWkK ICAgICBhdXRvIGFjdHVhbE5ld1JlcXVlc3QgPSByZXF1ZXN0OwogICAgIGhhbmRsZXItPnRhc2tE aWRQZXJmb3JtUmVkaXJlY3Rpb24odGFza0lkZW50aWZpZXIsIFdURk1vdmUocmVzcG9uc2UpLCBX VEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9Ci0KLXZvaWQg V2ViUGFnZTo6dXJsU2NoZW1lVGFza0RpZFBlcmZvcm1SZWRpcmVjdGlvbih1aW50NjRfdCBoYW5k bGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFJlc291cmNlUmVzcG9uc2Um JiByZXNwb25zZSwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkKLXsKLSAgICBhdXRvKiBoYW5k bGVyID0gbV9pZGVudGlmaWVyVG9VUkxTY2hlbWVIYW5kbGVyUHJveHlNYXAuZ2V0KGhhbmRsZXJJ ZGVudGlmaWVyKTsKLSAgICBBU1NFUlQoaGFuZGxlcik7Ci0KLSAgICBoYW5kbGVyLT50YXNrRGlk UGVyZm9ybVJlZGlyZWN0aW9uKHRhc2tJZGVudGlmaWVyLCBXVEZNb3ZlKHJlc3BvbnNlKSwgV1RG TW92ZShyZXF1ZXN0KSwgW10gKFJlc291cmNlUmVxdWVzdCYmKSB7fSk7Ci19CiAgICAgCiB2b2lk IFdlYlBhZ2U6OnVybFNjaGVtZVRhc2tEaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3QgaGFuZGxl cklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiByZXNwb25zZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAppbmRleCBmYjU2NmZmNmFkZTQuLjU4ZDYyYjE3MWFmNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTgwOCw3ICsxODA4LDYgQEAgcHJpdmF0 ZToKICAgICB2b2lkIHJlZ2lzdGVyVVJMU2NoZW1lSGFuZGxlcih1aW50NjRfdCBpZGVudGlmaWVy LCBjb25zdCBTdHJpbmcmIHNjaGVtZSk7CiAKICAgICB2b2lkIHVybFNjaGVtZVRhc2tXaWxsUGVy Zm9ybVJlZGlyZWN0aW9uKHVpbnQ2NF90IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNr SWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJik+JiYpOwotICAgIHZvaWQgdXJsU2NoZW1lVGFza0RpZFBlcmZvcm1SZWRpcmVjdGlvbih1 aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpOwogICAg IHZvaWQgdXJsU2NoZW1lVGFza0RpZFJlY2VpdmVSZXNwb25zZSh1aW50NjRfdCBoYW5kbGVySWRl bnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVzcG9uc2UmKTsKICAgICB2b2lkIHVybFNjaGVtZVRhc2tEaWRSZWNlaXZlRGF0YSh1aW50NjRf dCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYpOwogICAgIHZvaWQgdXJsU2NoZW1lVGFza0RpZENvbXBsZXRlKHVpbnQ2 NF90IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMTE2NDhiOTZhNTRjLi4zZTVlYzY3 ZWUxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5tZXNzYWdlcy5pbgpAQCAtNTYwLDcgKzU2MCw2IEBAIEdlbmVyYXRlU3ludGhldGljRWRp dGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRU eXBlCiAgICAgUmVnaXN0ZXJVUkxTY2hlbWVIYW5kbGVyKHVpbnQ2NF90IGlkZW50aWZpZXIsIFN0 cmluZyBzY2hlbWUpCiAKICAgICBVUkxTY2hlbWVUYXNrV2lsbFBlcmZvcm1SZWRpcmVjdGlvbih1 aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2UsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBw cm9wb3NlZFJlcXVlc3QpIC0+IChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgYWN0dWFsUmVxdWVz dCkgQXN5bmMKLSAgICBVUkxTY2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKHVpbnQ2NF90 IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSByZXNwb25zZSwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHByb3Bvc2Vk UmVxdWVzdCkKICAgICBVUkxTY2hlbWVUYXNrRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IGhh bmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSByZXNwb25zZSkKICAgICBVUkxTY2hlbWVUYXNrRGlkUmVjZWl2ZURhdGEodWlu dDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBJUEM6OlNo YXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UgZGF0YSkKICAgICBVUkxTY2hlbWVUYXNrRGlkQ29tcGxl dGUodWludDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBX ZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVycm9yKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDEwNGQ2Nzg5NjM4Ny4uOTY5OGMzMWVlZDllIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTkgQEAKKzIwMjEtMDQtMDYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisg ICAgICAgIFJlbW92ZSB1bnVzZWQgW1dLVVJMU2NoZW1lVGFzayBfZGlkUGVyZm9ybVJlZGlyZWN0 aW9uOl0gU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjQyNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRp b24ubW06CisgICAgICAgICgtW1BTT05TY2hlbWUgd2ViVmlldzpzdGFydFVSTFNjaGVtZVRhc2s6 XSk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVt ZUhhbmRsZXItMS5tbToKKyAgICAgICAgKC1bUmVkaXJlY3RTY2hlbWVIYW5kbGVyIHdlYlZpZXc6 c3RhcnRVUkxTY2hlbWVUYXNrOl0pOgorICAgICAgICAoLVtUYXNrU2NoZW1lSGFuZGxlciB3ZWJW aWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKToKKyAgICAgICAgKFRFU1QpOgorICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tOgorICAgICAg ICAoLVtUZXN0U2NoZW1lSGFuZGxlciB3ZWJWaWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKToKKwog MjAyMS0wNC0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIFdLVVJMU2NoZW1lVGFzayByZWRpcmVjdCBBUEkuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbQppbmRleCA4MThjNTdlM2NmZTUuLjA4NjFlYjkzOTZjYiAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlv bi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NT d2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0zMDIsMTUgKzMwMiwyMSBAQCAtICh2b2lkKXdlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hlbWVUYXNrOihpZCA8V0tVUkxTY2hlbWVU YXNrPil0YQogCiAgICAgTlNVUkwgKmZpbmFsVVJMID0gdGFzay5yZXF1ZXN0LlVSTDsKICAgICBh dXRvIHRhcmdldCA9IF9yZWRpcmVjdHMuZ2V0KHRhc2sucmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJp bmcpOworICAgIF9fYmxvY2sgYm9vbCByZWRpcmVjdENvbXBsZXRlID0gdHJ1ZTsKICAgICBpZiAo IXRhcmdldC5pc0VtcHR5KCkpIHsKICAgICAgICAgYXV0byByZWRpcmVjdFJlc3BvbnNlID0gYWRv cHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwg TUlNRVR5cGU6bmlsIGV4cGVjdGVkQ29udGVudExlbmd0aDowIHRleHRFbmNvZGluZ05hbWU6bmls XSk7CiAKICAgICAgICAgZmluYWxVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzooTlNTdHJpbmcg Kil0YXJnZXRdOwogICAgICAgICBhdXRvIHJlcXVlc3QgPSBhZG9wdE5TKFtbTlNVUkxSZXF1ZXN0 IGFsbG9jXSBpbml0V2l0aFVSTDpmaW5hbFVSTF0pOwogCi0gICAgICAgIFsoaWQ8V0tVUkxTY2hl bWVUYXNrUHJpdmF0ZT4pdGFzayBfZGlkUGVyZm9ybVJlZGlyZWN0aW9uOnJlZGlyZWN0UmVzcG9u c2UuZ2V0KCkgbmV3UmVxdWVzdDpyZXF1ZXN0LmdldCgpXTsKKyAgICAgICAgcmVkaXJlY3RDb21w bGV0ZSA9IGZhbHNlOworICAgICAgICBbdGFzayB3aWxsUGVyZm9ybVJlZGlyZWN0aW9uOnJlZGly ZWN0UmVzcG9uc2UuZ2V0KCkgbmV3UmVxdWVzdDpyZXF1ZXN0LmdldCgpIGNvbXBsZXRpb25IYW5k bGVyOl4oTlNVUkxSZXF1ZXN0ICopIHsKKyAgICAgICAgICAgIHJlZGlyZWN0Q29tcGxldGUgPSB0 cnVlOworICAgICAgICB9XTsKICAgICB9CiAKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JnJlZGlyZWN0Q29tcGxldGUpOworCiAgICAgZG9Bc3luY2hyb25vdXNseUlmTmVjZXNzYXJ5KFtm aW5hbFVSTCA9IHJldGFpblB0cihmaW5hbFVSTCldKGlkIDxXS1VSTFNjaGVtZVRhc2s+IHRhc2sp IHsKICAgICAgICAgUmV0YWluUHRyPE5TVVJMUmVzcG9uc2U+IHJlc3BvbnNlID0gYWRvcHROUyhb W05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOmZpbmFsVVJMLmdldCgpIE1JTUVUeXBl OkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6MSB0ZXh0RW5jb2RpbmdOYW1lOm5p bF0pOwogICAgICAgICBbdGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6cmVzcG9uc2UuZ2V0KCldOwpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNj aGVtZUhhbmRsZXItMS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tVUkxTY2hlbWVIYW5kbGVyLTEubW0KaW5kZXggM2ZlZjhmZjM5ZTM4Li42MDY5NTEyYmE2ZTQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tVUkxT Y2hlbWVIYW5kbGVyLTEubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQpAQCAtMjg3LDE0ICsyODcsMTYgQEAgLSAodm9p ZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0VVJMU2NoZW1lVGFzazooaWQgPFdL VVJMU2NoZW1lVGFzaz4pdGEKICAgICBBU1NFUlRfU1RSRVEodGFzay5yZXF1ZXN0LlVSTC5hYnNv bHV0ZVN0cmluZy5VVEY4U3RyaW5nLCAidGVzdGluZzovLy9pbml0aWFsIik7CiAgICAgYXV0byBy ZWRpcmVjdFJlc3BvbnNlID0gYWRvcHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRo VVJMOnRhc2sucmVxdWVzdC5VUkwgTUlNRVR5cGU6bmlsIGV4cGVjdGVkQ29udGVudExlbmd0aDow IHRleHRFbmNvZGluZ05hbWU6bmlsXSk7CiAgICAgYXV0byByZXF1ZXN0ID0gYWRvcHROUyhbW05T VVJMUmVxdWVzdCBhbGxvY10gaW5pdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0 aW5nOi8vL3JlZGlyZWN0ZWQiXV0pOwotICAgIFsoaWQ8V0tVUkxTY2hlbWVUYXNrUHJpdmF0ZT4p dGFzayBfZGlkUGVyZm9ybVJlZGlyZWN0aW9uOnJlZGlyZWN0UmVzcG9uc2UuZ2V0KCkgbmV3UmVx dWVzdDpyZXF1ZXN0LmdldCgpXTsKLSAgICBBU1NFUlRfRkFMU0UocmVjZWl2ZWRSZWRpcmVjdCk7 Ci0gICAgQVNTRVJUX1NUUkVRKHRhc2sucmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJpbmcuVVRGOFN0 cmluZywgInRlc3Rpbmc6Ly8vcmVkaXJlY3RlZCIpOwotICAgIE5TU3RyaW5nICpodG1sID0gQCI8 c2NyaXB0PndpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNz YWdlKCdEb2N1bWVudCBVUkw6ICcgKyBkb2N1bWVudC5VUkwpOzwvc2NyaXB0PiI7Ci0gICAgYXV0 byBmaW5hbFJlc3BvbnNlID0gYWRvcHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRo VVJMOnRhc2sucmVxdWVzdC5VUkwgTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIGV4cGVjdGVkQ29udGVu dExlbmd0aDpodG1sLmxlbmd0aCB0ZXh0RW5jb2RpbmdOYW1lOm5pbF0pOwotICAgIFt0YXNrIGRp ZFJlY2VpdmVSZXNwb25zZTpmaW5hbFJlc3BvbnNlLmdldCgpXTsKLSAgICBbdGFzayBkaWRSZWNl aXZlRGF0YTpbaHRtbCBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ11dOwot ICAgIFt0YXNrIGRpZEZpbmlzaF07CisKKyAgICBbdGFzayB3aWxsUGVyZm9ybVJlZGlyZWN0aW9u OnJlZGlyZWN0UmVzcG9uc2UuZ2V0KCkgbmV3UmVxdWVzdDpyZXF1ZXN0LmdldCgpIGNvbXBsZXRp b25IYW5kbGVyOl4oTlNVUkxSZXF1ZXN0ICpwcm9wb3NlZFJlcXVlc3QpIHsKKyAgICAgICAgQVNT RVJUX0ZBTFNFKHJlY2VpdmVkUmVkaXJlY3QpOworICAgICAgICBBU1NFUlRfU1RSRVEodGFzay5y ZXF1ZXN0LlVSTC5hYnNvbHV0ZVN0cmluZy5VVEY4U3RyaW5nLCAidGVzdGluZzovLy9yZWRpcmVj dGVkIik7CisgICAgICAgIE5TU3RyaW5nICpodG1sID0gQCI8c2NyaXB0PndpbmRvdy53ZWJraXQu bWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdEb2N1bWVudCBVUkw6ICcg KyBkb2N1bWVudC5VUkwpOzwvc2NyaXB0PiI7CisgICAgICAgIGF1dG8gZmluYWxSZXNwb25zZSA9 IGFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0aFVSTDp0YXNrLnJlcXVlc3Qu VVJMIE1JTUVUeXBlOkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6aHRtbC5sZW5n dGggdGV4dEVuY29kaW5nTmFtZTpuaWxdKTsKKyAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZVJlc3Bv bnNlOmZpbmFsUmVzcG9uc2UuZ2V0KCldOworICAgICAgICBbdGFzayBkaWRSZWNlaXZlRGF0YTpb aHRtbCBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ11dOworICAgICAgICBb dGFzayBkaWRGaW5pc2hdOworICAgIH1dOwogfQogCiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgc3RvcFVSTFNjaGVtZVRhc2s6KGlkIDxXS1VSTFNjaGVtZVRhc2s+KXRhc2sK QEAgLTM0Myw3ICszNDUsNiBAQCBURVNUKFVSTFNjaGVtZUhhbmRsZXIsIFJlZGlyZWN0aW9uKQog fQogCiBlbnVtIGNsYXNzIENvbW1hbmQgewotICAgIFJlZGlyZWN0LAogICAgIEFQSVJlZGlyZWN0 LAogICAgIFJlc3BvbnNlLAogICAgIERhdGEsCkBAIC0zNzgsOSArMzc5LDYgQEAgLSAodm9pZCl3 ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0VVJMU2NoZW1lVGFzazooaWQgPFdLVVJM U2NoZW1lVGFzaz4pdGEKICAgICBAdHJ5IHsKICAgICAgICAgZm9yIChhdXRvIGNvbW1hbmQgOiBj b21tYW5kcykgewogICAgICAgICAgICAgc3dpdGNoIChjb21tYW5kKSB7Ci0gICAgICAgICAgICBj YXNlIENvbW1hbmQ6OlJlZGlyZWN0OgotICAgICAgICAgICAgICAgIFsoaWQ8V0tVUkxTY2hlbWVU YXNrUHJpdmF0ZT4pdGFzayBfZGlkUGVyZm9ybVJlZGlyZWN0aW9uOmFkb3B0TlMoW1tOU1VSTFJl c3BvbnNlIGFsbG9jXSBpbml0XSkuZ2V0KCkgbmV3UmVxdWVzdDphZG9wdE5TKFtbTlNVUkxSZXF1 ZXN0IGFsbG9jXSBpbml0XSkuZ2V0KCldOwotICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgY2FzZSBDb21tYW5kOjpBUElSZWRpcmVjdDoKICAgICAgICAgICAgICAgICBbKGlkPFdL VVJMU2NoZW1lVGFza1ByaXZhdGU+KXRhc2sgd2lsbFBlcmZvcm1SZWRpcmVjdGlvbjphZG9wdE5T KFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdF0pLmdldCgpIG5ld1JlcXVlc3Q6YWRvcHROUyhb W05TVVJMUmVxdWVzdCBhbGxvY10gaW5pdF0pLmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNV UkxSZXF1ZXN0KikgeyB9XTsKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTQyOCwxOCArNDI2 LDE2IEBAIHN0YXRpYyB2b2lkIGNoZWNrQ2FsbFNlcXVlbmNlKFZlY3RvcjxDb21tYW5kPiYmIGNv bW1hbmRzLCBTaG91bGRSYWlzZUV4Y2VwdGlvbiBzCiBURVNUKFVSTFNjaGVtZUhhbmRsZXIsIEV4 Y2VwdGlvbnMpCiB7CiAgICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNlLCBD b21tYW5kOjpEYXRhLCBDb21tYW5kOjpGaW5pc2h9LCBTaG91bGRSYWlzZUV4Y2VwdGlvbjo6Tm8p OwotICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtDb21tYW5kOjpSZXNwb25zZSwgQ29tbWFuZDo6UmVk aXJlY3R9LCBTaG91bGRSYWlzZUV4Y2VwdGlvbjo6WWVzKTsKLSAgICBjaGVja0NhbGxTZXF1ZW5j ZSh7Q29tbWFuZDo6UmVkaXJlY3QsIENvbW1hbmQ6OlJlc3BvbnNlfSwgU2hvdWxkUmFpc2VFeGNl cHRpb246Ok5vKTsKICAgICBjaGVja0NhbGxTZXF1ZW5jZSh7Q29tbWFuZDo6RGF0YSwgQ29tbWFu ZDo6RmluaXNofSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hlY2tDYWxsU2Vx dWVuY2Uoe0NvbW1hbmQ6OkVycm9yfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Ok5vKTsKICAgICBj aGVja0NhbGxTZXF1ZW5jZSh7Q29tbWFuZDo6RXJyb3IsIENvbW1hbmQ6OkVycm9yfSwgU2hvdWxk UmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OkVy cm9yLCBDb21tYW5kOjpEYXRhfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hl Y2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNlLCBDb21tYW5kOjpGaW5pc2gsIENvbW1h bmQ6OkRhdGF9LCBTaG91bGRSYWlzZUV4Y2VwdGlvbjo6WWVzKTsKLSAgICBjaGVja0NhbGxTZXF1 ZW5jZSh7Q29tbWFuZDo6UmVzcG9uc2UsIENvbW1hbmQ6OkZpbmlzaCwgQ29tbWFuZDo6UmVkaXJl Y3R9LCBTaG91bGRSYWlzZUV4Y2VwdGlvbjo6WWVzKTsKKyAgICBjaGVja0NhbGxTZXF1ZW5jZSh7 Q29tbWFuZDo6UmVzcG9uc2UsIENvbW1hbmQ6OkZpbmlzaCwgQ29tbWFuZDo6QVBJUmVkaXJlY3R9 LCBTaG91bGRSYWlzZUV4Y2VwdGlvbjo6WWVzKTsKICAgICBjaGVja0NhbGxTZXF1ZW5jZSh7Q29t bWFuZDo6UmVzcG9uc2UsIENvbW1hbmQ6OkZpbmlzaCwgQ29tbWFuZDo6UmVzcG9uc2V9LCBTaG91 bGRSYWlzZUV4Y2VwdGlvbjo6WWVzKTsKICAgICBjaGVja0NhbGxTZXF1ZW5jZSh7Q29tbWFuZDo6 UmVzcG9uc2UsIENvbW1hbmQ6OkZpbmlzaCwgQ29tbWFuZDo6RmluaXNofSwgU2hvdWxkUmFpc2VF eGNlcHRpb246Olllcyk7CiAgICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNl LCBDb21tYW5kOjpGaW5pc2gsIENvbW1hbmQ6OkVycm9yfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246 Olllcyk7Ci0gICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OkFQSVJlZGlyZWN0LCBDb21t YW5kOjpSZWRpcmVjdH0sIFNob3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMpOworICAgIGNoZWNrQ2Fs bFNlcXVlbmNlKHtDb21tYW5kOjpBUElSZWRpcmVjdCwgQ29tbWFuZDo6QVBJUmVkaXJlY3R9LCBT aG91bGRSYWlzZUV4Y2VwdGlvbjo6WWVzKTsKICAgICBjaGVja0NhbGxTZXF1ZW5jZSh7Q29tbWFu ZDo6QVBJUmVkaXJlY3QsIENvbW1hbmQ6OlJlc3BvbnNlfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246 Olllcyk7CiAgICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OkFQSVJlZGlyZWN0LCBDb21t YW5kOjpEYXRhfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hlY2tDYWxsU2Vx dWVuY2Uoe0NvbW1hbmQ6OkFQSVJlZGlyZWN0LCBDb21tYW5kOjpGaW5pc2h9LCBTaG91bGRSYWlz ZUV4Y2VwdGlvbjo6WWVzKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9XZWJzaXRlUG9saWNpZXMubW0KaW5kZXggYmVmMjQyODhhZTBlLi5lZjMx ZGM1MTJjYjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV2Vic2l0ZVBvbGljaWVzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tCkBAIC03MDEsMTMgKzcwMSwxMyBAQCAtIChpbnN0 YW5jZXR5cGUpaW5pdFdpdGhWaWRlb0RhdGE6KFJldGFpblB0cjxOU0RhdGE+JiYpZGF0YQogLSAo dm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0VVJMU2NoZW1lVGFzazooaWQg PFdLVVJMU2NoZW1lVGFzaz4pdGFzawogewogICAgIGlmIChbdGFzay5yZXF1ZXN0LlVSTC5wYXRo IGlzRXF1YWxUb1N0cmluZzpAIi9zaG91bGQtcmVkaXJlY3QiXSkgewotICAgICAgICBbKGlkPFdL VVJMU2NoZW1lVGFza1ByaXZhdGU+KXRhc2sgX2RpZFBlcmZvcm1SZWRpcmVjdGlvbjphZG9wdE5T KFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1F VHlwZTpuaWwgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOjAgdGV4dEVuY29kaW5nTmFtZTpuaWxdKS5n ZXQoKSBuZXdSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdp dGhTdHJpbmc6QCJ0ZXN0Oi8vL2F1dG9wbGF5LWNoZWNrLmh0bWwiXV1dOwotICAgICAgICAKLSAg ICAgICAgTlNEYXRhICpkYXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6W1tOU0J1 bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImF1dG9wbGF5LWNoZWNrIiB3aXRoRXh0 ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV07 Ci0gICAgICAgIFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTphZG9wdE5TKFtbTlNVUkxSZXNwb25z ZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpAInRleHQvaHRt bCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmRhdGEubGVuZ3RoIHRleHRFbmNvZGluZ05hbWU6bmls XSkuZ2V0KCldOwotICAgICAgICBbdGFzayBkaWRSZWNlaXZlRGF0YTpkYXRhXTsKLSAgICAgICAg W3Rhc2sgZGlkRmluaXNoXTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICBbdGFzayB3aWxsUGVy Zm9ybVJlZGlyZWN0aW9uOmFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0aFVS TDp0YXNrLnJlcXVlc3QuVVJMIE1JTUVUeXBlOm5pbCBleHBlY3RlZENvbnRlbnRMZW5ndGg6MCB0 ZXh0RW5jb2RpbmdOYW1lOm5pbF0pLmdldCgpIG5ld1JlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1 ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInRlc3Q6Ly8vYXV0b3BsYXktY2hlY2su aHRtbCJdXSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVxdWVzdCAqKSB7CisgICAgICAgICAg ICBOU0RhdGEgKmRhdGEgPSBbTlNEYXRhIGRhdGFXaXRoQ29udGVudHNPZlVSTDpbW05TQnVuZGxl IG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiYXV0b3BsYXktY2hlY2siIHdpdGhFeHRlbnNp b246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXTsKKyAg ICAgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTphZG9wdE5TKFtbTlNVUkxSZXNwb25z ZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpAInRleHQvaHRt bCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmRhdGEubGVuZ3RoIHRleHRFbmNvZGluZ05hbWU6bmls XSkuZ2V0KCldOworICAgICAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6ZGF0YV07CisgICAg ICAgICAgICBbdGFzayBkaWRGaW5pc2hdOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 XTsKICAgICB9CiAgICAgCiAgICAgQVNTRVJUX1RSVUUoW3Rhc2sucmVxdWVzdC5VUkwucGF0aCBp c0VxdWFsVG9TdHJpbmc6QCIvdGVzdC5tcDQiXSk7Cg== 425425 2021-04-07 12:26:55 -0700 2021-04-07 12:26:55 -0700 Fix tests patch text/plain 16968 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggOGY4MjIzZDA2YjZiLi43M2Q5NDY0ODQ2ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjQgQEAKKzIwMjEtMDQtMDYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgor CisgICAgICAgIFJlbW92ZSB1bnVzZWQgW1dLVVJMU2NoZW1lVGFzayBfZGlkUGVyZm9ybVJlZGly ZWN0aW9uOl0gU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjQyNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb3ZlcmVkIGJ5IG5ldyBBUEkgd2l0aCBBUEkgdGVzdCBjaGFuZ2VzLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VSTFNjaGVtZVRhc2subW06CisgICAgICAgICgtW1dL VVJMU2NoZW1lVGFza0ltcGwgX2RpZFBlcmZvcm1SZWRpcmVjdGlvbjpuZXdSZXF1ZXN0Ol0pOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrUHJp dmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVUkxTY2hlbWVUYXNrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVVJMU2NoZW1lVGFzazo6ZGlkUGVyZm9ybVJlZGlyZWN0aW9uKTogRGVs ZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6dXJsU2NoZW1lVGFza1dpbGxQZXJmb3JtUmVkaXJlY3Rpb24pOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjp1cmxTY2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKTogRGVsZXRlZC4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDIxLTA0LTAyICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV0tVUkxTY2hlbWVUYXNr IHJlZGlyZWN0IEFQSS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1VSTFNjaGVtZVRhc2subW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tVUkxTY2hlbWVUYXNrLm1tCmluZGV4IDcyNmY5MTMwN2FiYS4uNjY2OThkNGUzYWQxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVU YXNrLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VSTFNjaGVt ZVRhc2subW0KQEAgLTE0OCwxNiArMTQ4LDYgQEAgLSAodm9pZClkaWRGYWlsV2l0aEVycm9yOihO U0Vycm9yICopZXJyb3IKICAgICByYWlzZUV4Y2VwdGlvbklmTmVjZXNzYXJ5KHJlc3VsdCk7CiB9 CiAKLS0gKHZvaWQpX2RpZFBlcmZvcm1SZWRpcmVjdGlvbjooTlNVUkxSZXNwb25zZSAqKXJlc3Bv bnNlIG5ld1JlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QKLXsKLSAgICBhdXRvIGZ1bmN0 aW9uID0gW3Byb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIoc2VsZiksIHNlbGYsIHByb3RlY3RlZFJl c3BvbnNlID0gcmV0YWluUHRyKHJlc3BvbnNlKSwgcmVzcG9uc2UsIHByb3RlY3RlZFJlcXVlc3Qg PSByZXRhaW5QdHIocmVxdWVzdCksIHJlcXVlc3RdIHsKLSAgICAgICAgcmV0dXJuIF91cmxTY2hl bWVUYXNrLT50YXNrKCkuZGlkUGVyZm9ybVJlZGlyZWN0aW9uKHJlc3BvbnNlLCByZXF1ZXN0KTsK LSAgICB9OwotCi0gICAgYXV0byByZXN1bHQgPSBnZXRFeGNlcHRpb25UeXBlRnJvbU1haW5SdW5M b29wKFdURk1vdmUoZnVuY3Rpb24pKTsKLSAgICByYWlzZUV4Y2VwdGlvbklmTmVjZXNzYXJ5KHJl c3VsdCk7Ci19Ci0KIC0gKFdLRnJhbWVJbmZvICopX2ZyYW1lCiB7CiAgICAgcmV0dXJuIHdyYXBw ZXIoX3VybFNjaGVtZVRhc2stPnRhc2soKS5mcmFtZUluZm8oKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrUHJpdmF0ZS5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVVJMU2NoZW1lVGFza1ByaXZhdGUu aAppbmRleCBkNTljMmIyMjE2ZjcuLmFkN2U3MDIzY2Q0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVVJMU2NoZW1lVGFza1ByaXZhdGUuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrUHJpdmF0ZS5o CkBAIC0zMCw4ICszMCw2IEBACiBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEzKSwgaW9zKDEx LjApKQogQHByb3RvY29sIFdLVVJMU2NoZW1lVGFza1ByaXZhdGUgPFdLVVJMU2NoZW1lVGFzaz4K IAotLSAodm9pZClfZGlkUGVyZm9ybVJlZGlyZWN0aW9uOihOU1VSTFJlc3BvbnNlICopcmVzcG9u c2UgbmV3UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdDsKLQogQHByb3BlcnR5IChub25h dG9taWMsIHJlYWRvbmx5KSBCT09MIF9yZXF1ZXN0T25seUlmQ2FjaGVkIFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoMTAuMTUpLCBpb3MoMTMuMCkpOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRv bmx5KSBXS0ZyYW1lSW5mbyAqX2ZyYW1lIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTEuMCksIGlv cygxNC4wKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNj aGVtZVRhc2suY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViVVJMU2NoZW1lVGFzay5j cHAKaW5kZXggNjM5NDhlNDM1Y2M0Li43MGIyZDQyYzcwYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suY3BwCkBAIC0xMDQsMzggKzEwNCw2IEBAIGF1dG8g V2ViVVJMU2NoZW1lVGFzazo6d2lsbFBlcmZvcm1SZWRpcmVjdGlvbihSZXNvdXJjZVJlc3BvbnNl JiYgcmVzcG9uc2UsIFJlc291CiAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5vbmU7CiB9CiAK LWF1dG8gV2ViVVJMU2NoZW1lVGFzazo6ZGlkUGVyZm9ybVJlZGlyZWN0aW9uKFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmJiByZXNwb25zZSwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVx dWVzdCkgLT4gRXhjZXB0aW9uVHlwZQotewotICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 Ci0KLSAgICBpZiAobV9zdG9wcGVkKQotICAgICAgICByZXR1cm4gbV9zaG91bGRTdXBwcmVzc1Rh c2tTdG9wcGVkRXhjZXB0aW9ucyA/IEV4Y2VwdGlvblR5cGU6Ok5vbmUgOiBFeGNlcHRpb25UeXBl OjpUYXNrQWxyZWFkeVN0b3BwZWQ7Ci0KLSAgICBpZiAobV9jb21wbGV0ZWQpCi0gICAgICAgIHJl dHVybiBFeGNlcHRpb25UeXBlOjpDb21wbGV0ZUFscmVhZHlDYWxsZWQ7Ci0KLSAgICBpZiAobV9k YXRhU2VudCkKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6OkRhdGFBbHJlYWR5U2VudDsK LQotICAgIGlmIChtX3Jlc3BvbnNlU2VudCkKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6 OlJlZGlyZWN0QWZ0ZXJSZXNwb25zZTsKLQotICAgIGlmIChtX3dhaXRpbmdGb3JSZWRpcmVjdENv bXBsZXRpb25IYW5kbGVyQ2FsbGJhY2spCi0gICAgICAgIHJldHVybiBFeGNlcHRpb25UeXBlOjpX YWl0aW5nRm9yUmVkaXJlY3RDb21wbGV0aW9uSGFuZGxlcjsKLQotICAgIGlmIChpc1N5bmMoKSkK LSAgICAgICAgbV9zeW5jUmVzcG9uc2UgPSByZXNwb25zZTsKLQotICAgIHsKLSAgICAgICAgTG9j a0hvbGRlciBsb2NrZXIobV9yZXF1ZXN0TG9jayk7Ci0gICAgICAgIG1fcmVxdWVzdCA9IHJlcXVl c3Q7Ci0gICAgfQotCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpVUkxT Y2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKG1fdXJsU2NoZW1lSGFuZGxlci0+aWRlbnRp ZmllcigpLCBtX2lkZW50aWZpZXIsIHJlc3BvbnNlLCByZXF1ZXN0KSwgbV93ZWJQYWdlSUQpOwot Ci0gICAgcmV0dXJuIEV4Y2VwdGlvblR5cGU6Ok5vbmU7Ci19Ci0KIGF1dG8gV2ViVVJMU2NoZW1l VGFzazo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl KSAtPiBFeGNlcHRpb25UeXBlCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVtZVRhc2suaAppbmRleCA4NzBkZmY4ZTJk NzYuLjBjOTRmNmMxOGMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi VVJMU2NoZW1lVGFzay5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlVSTFNjaGVt ZVRhc2suaApAQCAtODAsNyArODAsNiBAQCBwdWJsaWM6CiAgICAgICAgIE5vbmUsCiAgICAgfTsK ICAgICBFeGNlcHRpb25UeXBlIHdpbGxQZXJmb3JtUmVkaXJlY3Rpb24oV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiwgIEZ1bmN0aW9uPHZvaWQo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpPiYmKTsKLSAgICBFeGNlcHRpb25UeXBlIGRpZFBl cmZvcm1SZWRpcmVjdGlvbihXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYsIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYmKTsKICAgICBFeGNlcHRpb25UeXBlIGRpZFJlY2VpdmVSZXNwb25zZShj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgRXhjZXB0aW9uVHlwZSBkaWRS ZWNlaXZlRGF0YShSZWY8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYmKTsKICAgICBFeGNlcHRpb25U eXBlIGRpZENvbXBsZXRlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZWYyMDhiZmVhZDAx Li4zZmU5NGU1OGYyMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCkBAIC02NzM5LDE0ICs2NzM5LDYgQEAgdm9pZCBXZWJQYWdlOjp1cmxTY2hlbWVU YXNrV2lsbFBlcmZvcm1SZWRpcmVjdGlvbih1aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWkK ICAgICBhdXRvIGFjdHVhbE5ld1JlcXVlc3QgPSByZXF1ZXN0OwogICAgIGhhbmRsZXItPnRhc2tE aWRQZXJmb3JtUmVkaXJlY3Rpb24odGFza0lkZW50aWZpZXIsIFdURk1vdmUocmVzcG9uc2UpLCBX VEZNb3ZlKHJlcXVlc3QpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9Ci0KLXZvaWQg V2ViUGFnZTo6dXJsU2NoZW1lVGFza0RpZFBlcmZvcm1SZWRpcmVjdGlvbih1aW50NjRfdCBoYW5k bGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFJlc291cmNlUmVzcG9uc2Um JiByZXNwb25zZSwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkKLXsKLSAgICBhdXRvKiBoYW5k bGVyID0gbV9pZGVudGlmaWVyVG9VUkxTY2hlbWVIYW5kbGVyUHJveHlNYXAuZ2V0KGhhbmRsZXJJ ZGVudGlmaWVyKTsKLSAgICBBU1NFUlQoaGFuZGxlcik7Ci0KLSAgICBoYW5kbGVyLT50YXNrRGlk UGVyZm9ybVJlZGlyZWN0aW9uKHRhc2tJZGVudGlmaWVyLCBXVEZNb3ZlKHJlc3BvbnNlKSwgV1RG TW92ZShyZXF1ZXN0KSwgW10gKFJlc291cmNlUmVxdWVzdCYmKSB7fSk7Ci19CiAgICAgCiB2b2lk IFdlYlBhZ2U6OnVybFNjaGVtZVRhc2tEaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3QgaGFuZGxl cklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiByZXNwb25zZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAppbmRleCBmYjU2NmZmNmFkZTQuLjU4ZDYyYjE3MWFmNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTgwOCw3ICsxODA4LDYgQEAgcHJpdmF0 ZToKICAgICB2b2lkIHJlZ2lzdGVyVVJMU2NoZW1lSGFuZGxlcih1aW50NjRfdCBpZGVudGlmaWVy LCBjb25zdCBTdHJpbmcmIHNjaGVtZSk7CiAKICAgICB2b2lkIHVybFNjaGVtZVRhc2tXaWxsUGVy Zm9ybVJlZGlyZWN0aW9uKHVpbnQ2NF90IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNr SWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJik+JiYpOwotICAgIHZvaWQgdXJsU2NoZW1lVGFza0RpZFBlcmZvcm1SZWRpcmVjdGlvbih1 aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpOwogICAg IHZvaWQgdXJsU2NoZW1lVGFza0RpZFJlY2VpdmVSZXNwb25zZSh1aW50NjRfdCBoYW5kbGVySWRl bnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVzcG9uc2UmKTsKICAgICB2b2lkIHVybFNjaGVtZVRhc2tEaWRSZWNlaXZlRGF0YSh1aW50NjRf dCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIGNvbnN0IElQQzo6 RGF0YVJlZmVyZW5jZSYpOwogICAgIHZvaWQgdXJsU2NoZW1lVGFza0RpZENvbXBsZXRlKHVpbnQ2 NF90IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMTE2NDhiOTZhNTRjLi4zZTVlYzY3 ZWUxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5tZXNzYWdlcy5pbgpAQCAtNTYwLDcgKzU2MCw2IEBAIEdlbmVyYXRlU3ludGhldGljRWRp dGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRU eXBlCiAgICAgUmVnaXN0ZXJVUkxTY2hlbWVIYW5kbGVyKHVpbnQ2NF90IGlkZW50aWZpZXIsIFN0 cmluZyBzY2hlbWUpCiAKICAgICBVUkxTY2hlbWVUYXNrV2lsbFBlcmZvcm1SZWRpcmVjdGlvbih1 aW50NjRfdCBoYW5kbGVySWRlbnRpZmllciwgdWludDY0X3QgdGFza0lkZW50aWZpZXIsIFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2UsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBw cm9wb3NlZFJlcXVlc3QpIC0+IChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgYWN0dWFsUmVxdWVz dCkgQXN5bmMKLSAgICBVUkxTY2hlbWVUYXNrRGlkUGVyZm9ybVJlZGlyZWN0aW9uKHVpbnQ2NF90 IGhhbmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSByZXNwb25zZSwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHByb3Bvc2Vk UmVxdWVzdCkKICAgICBVUkxTY2hlbWVUYXNrRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IGhh bmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSByZXNwb25zZSkKICAgICBVUkxTY2hlbWVUYXNrRGlkUmVjZWl2ZURhdGEodWlu dDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBJUEM6OlNo YXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UgZGF0YSkKICAgICBVUkxTY2hlbWVUYXNrRGlkQ29tcGxl dGUodWludDY0X3QgaGFuZGxlcklkZW50aWZpZXIsIHVpbnQ2NF90IHRhc2tJZGVudGlmaWVyLCBX ZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVycm9yKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDEwNGQ2Nzg5NjM4Ny4uOTY5OGMzMWVlZDllIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTkgQEAKKzIwMjEtMDQtMDYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisg ICAgICAgIFJlbW92ZSB1bnVzZWQgW1dLVVJMU2NoZW1lVGFzayBfZGlkUGVyZm9ybVJlZGlyZWN0 aW9uOl0gU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjQyNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRp b24ubW06CisgICAgICAgICgtW1BTT05TY2hlbWUgd2ViVmlldzpzdGFydFVSTFNjaGVtZVRhc2s6 XSk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVt ZUhhbmRsZXItMS5tbToKKyAgICAgICAgKC1bUmVkaXJlY3RTY2hlbWVIYW5kbGVyIHdlYlZpZXc6 c3RhcnRVUkxTY2hlbWVUYXNrOl0pOgorICAgICAgICAoLVtUYXNrU2NoZW1lSGFuZGxlciB3ZWJW aWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKToKKyAgICAgICAgKFRFU1QpOgorICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tOgorICAgICAg ICAoLVtUZXN0U2NoZW1lSGFuZGxlciB3ZWJWaWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKToKKwog MjAyMS0wNC0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIFdLVVJMU2NoZW1lVGFzayByZWRpcmVjdCBBUEkuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbQppbmRleCA4MThjNTdlM2NmZTUuLjA4NjFlYjkzOTZjYiAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlv bi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NT d2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0zMDIsMTUgKzMwMiwyMSBAQCAtICh2b2lkKXdlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hlbWVUYXNrOihpZCA8V0tVUkxTY2hlbWVU YXNrPil0YQogCiAgICAgTlNVUkwgKmZpbmFsVVJMID0gdGFzay5yZXF1ZXN0LlVSTDsKICAgICBh dXRvIHRhcmdldCA9IF9yZWRpcmVjdHMuZ2V0KHRhc2sucmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJp bmcpOworICAgIF9fYmxvY2sgYm9vbCByZWRpcmVjdENvbXBsZXRlID0gdHJ1ZTsKICAgICBpZiAo IXRhcmdldC5pc0VtcHR5KCkpIHsKICAgICAgICAgYXV0byByZWRpcmVjdFJlc3BvbnNlID0gYWRv cHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwg TUlNRVR5cGU6bmlsIGV4cGVjdGVkQ29udGVudExlbmd0aDowIHRleHRFbmNvZGluZ05hbWU6bmls XSk7CiAKICAgICAgICAgZmluYWxVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzooTlNTdHJpbmcg Kil0YXJnZXRdOwogICAgICAgICBhdXRvIHJlcXVlc3QgPSBhZG9wdE5TKFtbTlNVUkxSZXF1ZXN0 IGFsbG9jXSBpbml0V2l0aFVSTDpmaW5hbFVSTF0pOwogCi0gICAgICAgIFsoaWQ8V0tVUkxTY2hl bWVUYXNrUHJpdmF0ZT4pdGFzayBfZGlkUGVyZm9ybVJlZGlyZWN0aW9uOnJlZGlyZWN0UmVzcG9u c2UuZ2V0KCkgbmV3UmVxdWVzdDpyZXF1ZXN0LmdldCgpXTsKKyAgICAgICAgcmVkaXJlY3RDb21w bGV0ZSA9IGZhbHNlOworICAgICAgICBbdGFzayB3aWxsUGVyZm9ybVJlZGlyZWN0aW9uOnJlZGly ZWN0UmVzcG9uc2UuZ2V0KCkgbmV3UmVxdWVzdDpyZXF1ZXN0LmdldCgpIGNvbXBsZXRpb25IYW5k bGVyOl4oTlNVUkxSZXF1ZXN0ICopIHsKKyAgICAgICAgICAgIHJlZGlyZWN0Q29tcGxldGUgPSB0 cnVlOworICAgICAgICB9XTsKICAgICB9CiAKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JnJlZGlyZWN0Q29tcGxldGUpOworCiAgICAgZG9Bc3luY2hyb25vdXNseUlmTmVjZXNzYXJ5KFtm aW5hbFVSTCA9IHJldGFpblB0cihmaW5hbFVSTCldKGlkIDxXS1VSTFNjaGVtZVRhc2s+IHRhc2sp IHsKICAgICAgICAgUmV0YWluUHRyPE5TVVJMUmVzcG9uc2U+IHJlc3BvbnNlID0gYWRvcHROUyhb W05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOmZpbmFsVVJMLmdldCgpIE1JTUVUeXBl OkAidGV4dC9odG1sIiBleHBlY3RlZENvbnRlbnRMZW5ndGg6MSB0ZXh0RW5jb2RpbmdOYW1lOm5p bF0pOwogICAgICAgICBbdGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6cmVzcG9uc2UuZ2V0KCldOwpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNj aGVtZUhhbmRsZXItMS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tVUkxTY2hlbWVIYW5kbGVyLTEubW0KaW5kZXggM2ZlZjhmZjM5ZTM4Li45Y2Q0NTg1NDI2YTMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tVUkxT Y2hlbWVIYW5kbGVyLTEubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQpAQCAtMjg3LDggKzI4NywxMyBAQCAtICh2b2lk KXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hlbWVUYXNrOihpZCA8V0tV UkxTY2hlbWVUYXNrPil0YQogICAgIEFTU0VSVF9TVFJFUSh0YXNrLnJlcXVlc3QuVVJMLmFic29s dXRlU3RyaW5nLlVURjhTdHJpbmcsICJ0ZXN0aW5nOi8vL2luaXRpYWwiKTsKICAgICBhdXRvIHJl ZGlyZWN0UmVzcG9uc2UgPSBhZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhV Ukw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpuaWwgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOjAg dGV4dEVuY29kaW5nTmFtZTpuaWxdKTsKICAgICBhdXRvIHJlcXVlc3QgPSBhZG9wdE5TKFtbTlNV UkxSZXF1ZXN0IGFsbG9jXSBpbml0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInRlc3Rp bmc6Ly8vcmVkaXJlY3RlZCJdXSk7Ci0gICAgWyhpZDxXS1VSTFNjaGVtZVRhc2tQcml2YXRlPil0 YXNrIF9kaWRQZXJmb3JtUmVkaXJlY3Rpb246cmVkaXJlY3RSZXNwb25zZS5nZXQoKSBuZXdSZXF1 ZXN0OnJlcXVlc3QuZ2V0KCldOwotICAgIEFTU0VSVF9GQUxTRShyZWNlaXZlZFJlZGlyZWN0KTsK KworICAgIF9fYmxvY2sgYm9vbCByZWRpcmVjdENvbXBsZXRlID0gZmFsc2U7CisgICAgW3Rhc2sg d2lsbFBlcmZvcm1SZWRpcmVjdGlvbjpyZWRpcmVjdFJlc3BvbnNlLmdldCgpIG5ld1JlcXVlc3Q6 cmVxdWVzdC5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVxdWVzdCAqKSB7CisgICAg ICAgIHJlZGlyZWN0Q29tcGxldGUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmcmVkaXJlY3RDb21wbGV0ZSk7CisKICAgICBBU1NFUlRfU1RSRVEodGFzay5y ZXF1ZXN0LlVSTC5hYnNvbHV0ZVN0cmluZy5VVEY4U3RyaW5nLCAidGVzdGluZzovLy9yZWRpcmVj dGVkIik7CiAgICAgTlNTdHJpbmcgKmh0bWwgPSBAIjxzY3JpcHQ+d2luZG93LndlYmtpdC5tZXNz YWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ0RvY3VtZW50IFVSTDogJyArIGRv Y3VtZW50LlVSTCk7PC9zY3JpcHQ+IjsKICAgICBhdXRvIGZpbmFsUmVzcG9uc2UgPSBhZG9wdE5T KFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1F VHlwZTpAInRleHQvaHRtbCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmh0bWwubGVuZ3RoIHRleHRF bmNvZGluZ05hbWU6bmlsXSk7CkBAIC0zNDMsNyArMzQ4LDYgQEAgVEVTVChVUkxTY2hlbWVIYW5k bGVyLCBSZWRpcmVjdGlvbikKIH0KIAogZW51bSBjbGFzcyBDb21tYW5kIHsKLSAgICBSZWRpcmVj dCwKICAgICBBUElSZWRpcmVjdCwKICAgICBSZXNwb25zZSwKICAgICBEYXRhLApAQCAtMzc4LDkg KzM4Miw2IEBAIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzdGFydFVSTFNj aGVtZVRhc2s6KGlkIDxXS1VSTFNjaGVtZVRhc2s+KXRhCiAgICAgQHRyeSB7CiAgICAgICAgIGZv ciAoYXV0byBjb21tYW5kIDogY29tbWFuZHMpIHsKICAgICAgICAgICAgIHN3aXRjaCAoY29tbWFu ZCkgewotICAgICAgICAgICAgY2FzZSBDb21tYW5kOjpSZWRpcmVjdDoKLSAgICAgICAgICAgICAg ICBbKGlkPFdLVVJMU2NoZW1lVGFza1ByaXZhdGU+KXRhc2sgX2RpZFBlcmZvcm1SZWRpcmVjdGlv bjphZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdF0pLmdldCgpIG5ld1JlcXVlc3Q6 YWRvcHROUyhbW05TVVJMUmVxdWVzdCBhbGxvY10gaW5pdF0pLmdldCgpXTsKLSAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgQ29tbWFuZDo6QVBJUmVkaXJlY3Q6CiAgICAg ICAgICAgICAgICAgWyhpZDxXS1VSTFNjaGVtZVRhc2tQcml2YXRlPil0YXNrIHdpbGxQZXJmb3Jt UmVkaXJlY3Rpb246YWRvcHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRdKS5nZXQoKSBu ZXdSZXF1ZXN0OmFkb3B0TlMoW1tOU1VSTFJlcXVlc3QgYWxsb2NdIGluaXRdKS5nZXQoKSBjb21w bGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVxdWVzdCopIHsgfV07CiAgICAgICAgICAgICAgICAgYnJl YWs7CkBAIC00MjgsMTggKzQyOSwxNiBAQCBzdGF0aWMgdm9pZCBjaGVja0NhbGxTZXF1ZW5jZShW ZWN0b3I8Q29tbWFuZD4mJiBjb21tYW5kcywgU2hvdWxkUmFpc2VFeGNlcHRpb24gcwogVEVTVChV UkxTY2hlbWVIYW5kbGVyLCBFeGNlcHRpb25zKQogewogICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtD b21tYW5kOjpSZXNwb25zZSwgQ29tbWFuZDo6RGF0YSwgQ29tbWFuZDo6RmluaXNofSwgU2hvdWxk UmFpc2VFeGNlcHRpb246Ok5vKTsKLSAgICBjaGVja0NhbGxTZXF1ZW5jZSh7Q29tbWFuZDo6UmVz cG9uc2UsIENvbW1hbmQ6OlJlZGlyZWN0fSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7Ci0g ICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlZGlyZWN0LCBDb21tYW5kOjpSZXNwb25z ZX0sIFNob3VsZFJhaXNlRXhjZXB0aW9uOjpObyk7CiAgICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0Nv bW1hbmQ6OkRhdGEsIENvbW1hbmQ6OkZpbmlzaH0sIFNob3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMp OwogICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtDb21tYW5kOjpFcnJvcn0sIFNob3VsZFJhaXNlRXhj ZXB0aW9uOjpObyk7CiAgICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OkVycm9yLCBDb21t YW5kOjpFcnJvcn0sIFNob3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMpOwogICAgIGNoZWNrQ2FsbFNl cXVlbmNlKHtDb21tYW5kOjpFcnJvciwgQ29tbWFuZDo6RGF0YX0sIFNob3VsZFJhaXNlRXhjZXB0 aW9uOjpZZXMpOwogICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtDb21tYW5kOjpSZXNwb25zZSwgQ29t bWFuZDo6RmluaXNoLCBDb21tYW5kOjpEYXRhfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7 Ci0gICAgY2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNlLCBDb21tYW5kOjpGaW5p c2gsIENvbW1hbmQ6OlJlZGlyZWN0fSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CisgICAg Y2hlY2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNlLCBDb21tYW5kOjpGaW5pc2gsIENv bW1hbmQ6OkFQSVJlZGlyZWN0fSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hl Y2tDYWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNlLCBDb21tYW5kOjpGaW5pc2gsIENvbW1h bmQ6OlJlc3BvbnNlfSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hlY2tDYWxs U2VxdWVuY2Uoe0NvbW1hbmQ6OlJlc3BvbnNlLCBDb21tYW5kOjpGaW5pc2gsIENvbW1hbmQ6OkZp bmlzaH0sIFNob3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMpOwogICAgIGNoZWNrQ2FsbFNlcXVlbmNl KHtDb21tYW5kOjpSZXNwb25zZSwgQ29tbWFuZDo6RmluaXNoLCBDb21tYW5kOjpFcnJvcn0sIFNo b3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMpOwotICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtDb21tYW5k OjpBUElSZWRpcmVjdCwgQ29tbWFuZDo6UmVkaXJlY3R9LCBTaG91bGRSYWlzZUV4Y2VwdGlvbjo6 WWVzKTsKKyAgICBjaGVja0NhbGxTZXF1ZW5jZSh7Q29tbWFuZDo6QVBJUmVkaXJlY3QsIENvbW1h bmQ6OkFQSVJlZGlyZWN0fSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CiAgICAgY2hlY2tD YWxsU2VxdWVuY2Uoe0NvbW1hbmQ6OkFQSVJlZGlyZWN0LCBDb21tYW5kOjpSZXNwb25zZX0sIFNo b3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMpOwogICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtDb21tYW5k OjpBUElSZWRpcmVjdCwgQ29tbWFuZDo6RGF0YX0sIFNob3VsZFJhaXNlRXhjZXB0aW9uOjpZZXMp OwogICAgIGNoZWNrQ2FsbFNlcXVlbmNlKHtDb21tYW5kOjpBUElSZWRpcmVjdCwgQ29tbWFuZDo6 RmluaXNofSwgU2hvdWxkUmFpc2VFeGNlcHRpb246Olllcyk7CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xpY2llcy5tbSBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tCmluZGV4 IGJlZjI0Mjg4YWUwZS4uOWJkZGQ1MzAzZjUzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xpY2llcy5tbQorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xpY2llcy5tbQpAQCAtNzAxLDgg KzcwMSwxNSBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhWaWRlb0RhdGE6KFJldGFpblB0cjxO U0RhdGE+JiYpZGF0YQogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0 VVJMU2NoZW1lVGFzazooaWQgPFdLVVJMU2NoZW1lVGFzaz4pdGFzawogewogICAgIGlmIChbdGFz ay5yZXF1ZXN0LlVSTC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9zaG91bGQtcmVkaXJlY3QiXSkg ewotICAgICAgICBbKGlkPFdLVVJMU2NoZW1lVGFza1ByaXZhdGU+KXRhc2sgX2RpZFBlcmZvcm1S ZWRpcmVjdGlvbjphZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFz ay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpuaWwgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOjAgdGV4dEVu Y29kaW5nTmFtZTpuaWxdKS5nZXQoKSBuZXdSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdp dGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vL2F1dG9wbGF5LWNoZWNrLmh0bWwi XV1dOwotICAgICAgICAKKyAgICAgICAgYXV0byByZWRpcmVjdFJlc3BvbnNlID0gYWRvcHROUyhb W05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwgTUlNRVR5 cGU6bmlsIGV4cGVjdGVkQ29udGVudExlbmd0aDowIHRleHRFbmNvZGluZ05hbWU6bmlsXSk7Cisg ICAgICAgIGF1dG8gbmV3UmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0Oi8vL2F1dG9wbGF5LWNoZWNrLmh0bWwiXV07CisKKyAg ICAgICAgX19ibG9jayBib29sIHJlZGlyZWN0Q29tcGxldGUgPSBmYWxzZTsKKyAgICAgICAgW3Rh c2sgd2lsbFBlcmZvcm1SZWRpcmVjdGlvbjpyZWRpcmVjdFJlc3BvbnNlLmdldCgpIG5ld1JlcXVl c3Q6bmV3UmVxdWVzdCBjb21wbGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVxdWVzdCAqKSB7CisgICAg ICAgICAgICByZWRpcmVjdENvbXBsZXRlID0gdHJ1ZTsKKyAgICAgICAgfV07CisgICAgICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVkaXJlY3RDb21wbGV0ZSk7CisKICAgICAgICAgTlNE YXRhICpkYXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6W1tOU0J1bmRsZSBtYWlu QnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImF1dG9wbGF5LWNoZWNrIiB3aXRoRXh0ZW5zaW9uOkAi aHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV07CiAgICAgICAg IFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTphZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10g aW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpAInRleHQvaHRtbCIgZXhwZWN0 ZWRDb250ZW50TGVuZ3RoOmRhdGEubGVuZ3RoIHRleHRFbmNvZGluZ05hbWU6bmlsXSkuZ2V0KCld OwogICAgICAgICBbdGFzayBkaWRSZWNlaXZlRGF0YTpkYXRhXTsK