231130 2021-10-02 20:03:22 -0700 Migrate some tests from TCPServer to HTTPServer 2021-10-02 21:42:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer oldest_to_newest 1799804 0 achristensen 2021-10-02 20:03:22 -0700 Migrate some tests from TCPServer to HTTPServer 1799805 1 439984 achristensen 2021-10-02 20:04:58 -0700 Created attachment 439984 Patch 1799809 2 439984 cdumez 2021-10-02 20:18:55 -0700 Comment on attachment 439984 Patch R=me assuming the bots are happy 1799823 3 ews-feeder 2021-10-02 21:41:54 -0700 Committed r283462 (242441@main): <https://commits.webkit.org/242441@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439984. 1799824 4 webkit-bug-importer 2021-10-02 21:42:17 -0700 <rdar://problem/83805678> 439984 2021-10-02 20:04:58 -0700 2021-10-02 21:41:55 -0700 Patch bug-231130-20211002200457.patch text/plain 23358 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTkyM2RiY2U3N2U4ODcyMGRkZTQyMGNkNDJhNDMyMmI0 ZmFiYzA3MC4uZGY0OTIyZTRlNzcyNzFlMjYxMmFmNmNlYTUyYWJmMTU3NjFiNjU5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIxLTEwLTAyICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgTWlncmF0ZSBzb21lIHRlc3RzIGZyb20gVENQU2VydmVyIHRvIEhUVFBT ZXJ2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MTEzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBmb3JtZXIgcnVucyBsb2dpYyBvbiBhIG5vbi1tYWluIHRocmVhZCBhbmQgaGFzIGEgZGVzdHJ1 Y3RvciB0aGF0IHdhaXRzIGZvciBhbGwgdGhyZWFkcyB0byBqb2luLAorICAgICAgICB3aGljaCBv ZnRlbiBjYXVzZXMgdGltZW91dHMgaW4gdGVzdHMuICBUaGlzIGlzIHByb2dyZXNzIHRvd2FyZHMg cmVtb3ZpbmcgVENQU2VydmVyLCB3aGljaCBoYXMgYmVlbgorICAgICAgICByZXBsYWNlZCBieSBI VFRQU2VydmVyLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9E aXNwbGF5TmFtZS5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1BERkxpbmtSZWZlcnJlci5tbToKKyAgICAgICAgKFRFU1QpOgorICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW06CisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2VyQmFzaWMubW06 CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VcGxvYWREaXJlY3Rv cnkubW06CisgICAgICAgIChURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dLTmF2aWdhdGlvblJlc3BvbnNlLm1tOgorICAgICAgICAoVEVTVCk6CisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdFdmFsdWF0ZUph dmFTY3JpcHQubW06CisgICAgICAgIChURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1dLV2Vic2l0ZURhdGFzdG9yZS5tbToKKyAgICAgICAgKFRlc3RXZWJL aXRBUEk6OlRFU1QpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tOgorICAgICAgICAoVEVTVCk6CisgICAgICAg IChyZXNwb25kVG9SYW5nZVJlcXVlc3RzKToKKwogMjAyMS0xMC0wMSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIERyb3Agc3VwcG9ydCBmb3IgbWFjT1MgPCAxMC4x NQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9EaXNw bGF5TmFtZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRGlzcGxh eU5hbWUubW0KaW5kZXggOGFkOGJkOGZmOGRkMWQzYjNjNDkwMGNhMGNmZTNhNDkxMjcyOTEzZi4u OWViMGIzM2VlMWIxNjcwMjY2ZmY5Y2I0MjgwMjFmZmY2MDA1OTdhMCAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9EaXNwbGF5TmFtZS5tbQorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Rpc3BsYXlOYW1lLm1tCkBAIC0y Niw3ICsyNiw2IEBACiAjaW1wb3J0ICJjb25maWcuaCIKIAogI2ltcG9ydCAiUGxhdGZvcm1VdGls aXRpZXMuaCIKLSNpbXBvcnQgIlRDUFNlcnZlci5oIgogI2ltcG9ydCAiVGVzdC5oIgogI2ltcG9y dCAiVGVzdFdLV2ViVmlldy5oIgogI2ltcG9ydCA8V2ViS2l0L19XS1dlYnNpdGVEYXRhU3RvcmVD b25maWd1cmF0aW9uLmg+CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1BERkxpbmtSZWZlcnJlci5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUERGTGlua1JlZmVycmVyLm1tCmluZGV4IDkxNzNiMTBlMzVlNGZkMzU3MDlj NjFiMGNlNGM5YWI5NDcwN2RiYmUuLmE3YjBhMWIwNDYxZTRkN2ZkNTYzMzViMDg3MTJiMDkzZTg2 ODRkOTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev UERGTGlua1JlZmVycmVyLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvUERGTGlua1JlZmVycmVyLm1tCkBAIC0yNywxNSArMjcsMTMgQEAKIAogI2lmIFBMQVRG T1JNKE1BQykKIAotI2ltcG9ydCAiVENQU2VydmVyLmgiCisjaW1wb3J0ICJIVFRQU2VydmVyLmgi CiAjaW1wb3J0ICJUZXN0LmgiCiAjaW1wb3J0ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgiCiAj aW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0ICJVdGlsaXRpZXMuaCIKICNpbXBvcnQg PFdlYktpdC9XS0ZvdW5kYXRpb24uaD4KIAotLy8gRklYTUU6IFJlLWVuYWJsZSB0aGlzIHRlc3Qg b25jZSByZGFyOi8vNjg2Mzk2ODggaXMgcmVzb2x2ZWQuCi0jaWYgX19NQUNfT1NfWF9WRVJTSU9O X01JTl9SRVFVSVJFRCA8IDExMDAwMAogc3RhdGljIHNpemVfdCBwdXRQREZCeXRlc0NhbGxiYWNr KHZvaWQqIGluZm8sIHZvaWQqIGJ1ZmZlciwgc2l6ZV90IGNvdW50KQogewogICAgIFsoTlNNdXRh YmxlRGF0YSAqKWluZm8gYXBwZW5kQnl0ZXM6YnVmZmVyIGxlbmd0aDpjb3VudF07CkBAIC03NSwy MyArNzMsMjAgQEAgc3RhdGljIFJldGFpblB0cjxOU0RhdGE+IGNyZWF0ZVBERldpdGhMaW5rVG9V UkwoTlNVUkwgKnVybCkKIFRFU1QoV2ViS2l0LCBQREZMaW5rUmVmZXJyZXIpCiB7CiAgICAgdXNp bmcgbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEk7Ci0gICAgVENQU2VydmVyIHNlcnZlcihbXSAoaW50 IHNvY2tldCkgewotICAgICAgICAvLyBUaGlzIGFzc3VtZXMgYWxsIHRoZSBkYXRhIGZyb20gdGhl IEhUVFAgcmVxdWVzdCBpcyBhdmFpbGFibGUgdG8gYmUgcmVhZCBhdCBvbmNlLAotICAgICAgICAv LyB3aGljaCBpcyBwcm9iYWJseSBhbiBva2F5IGFzc3VtcHRpb24uCi0gICAgICAgIGF1dG8gcmVx dWVzdEJ5dGVzID0gVENQU2VydmVyOjpyZWFkKHNvY2tldCk7Ci0KLSAgICAgICAgLy8gTG9vayBm b3IgYSByZWZlcmVyIGhlYWRlci4KLSAgICAgICAgY29uc3QgYXV0byogY3VycmVudExpbmUgPSBy ZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihyZXF1ZXN0Qnl0ZXMuZGF0YSgpKTsKLSAgICAg ICAgd2hpbGUgKGN1cnJlbnRMaW5lKSB7Ci0gICAgICAgICAgICBFWFBFQ1RfTkUoc3RybmNhc2Vj bXAoY3VycmVudExpbmUsICJyZWZlcmVyOiIsIDgpLCAwKTsKLSAgICAgICAgICAgIGNvbnN0IGNo YXIqIG5leHRMaW5lID0gc3RyY2hyKGN1cnJlbnRMaW5lLCAnXG4nKTsKLSAgICAgICAgICAgIGN1 cnJlbnRMaW5lID0gbmV4dExpbmUgPyBuZXh0TGluZSArIDEgOiAwOwotICAgICAgICB9Ci0KLSAg ICAgICAgY29uc3QgY2hhciogcmVzcG9uc2VIZWFkZXIgPQotICAgICAgICAiSFRUUC8xLjEgMjAw IE9LXHJcbiIKLSAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAwXHJcblxyXG4iOwotICAgICAgICBU Q1BTZXJ2ZXI6OndyaXRlKHNvY2tldCwgcmVzcG9uc2VIZWFkZXIsIHN0cmxlbihyZXNwb25zZUhl YWRlcikpOworICAgIEhUVFBTZXJ2ZXIgc2VydmVyKFtdIChDb25uZWN0aW9uIGNvbm5lY3Rpb24p IHsKKyAgICAgICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVlc3QoWz1dKFZlY3RvcjxjaGFy PiYmIHJlcXVlc3RCeXRlcykgeworICAgICAgICAgICAgLy8gTG9vayBmb3IgYSByZWZlcmVyIGhl YWRlci4KKyAgICAgICAgICAgIGNvbnN0IGF1dG8qIGN1cnJlbnRMaW5lID0gcmVpbnRlcnByZXRf Y2FzdDxjb25zdCBjaGFyKj4ocmVxdWVzdEJ5dGVzLmRhdGEoKSk7CisgICAgICAgICAgICB3aGls ZSAoY3VycmVudExpbmUpIHsKKyAgICAgICAgICAgICAgICBFWFBFQ1RfTkUoc3RybmNhc2VjbXAo Y3VycmVudExpbmUsICJyZWZlcmVyOiIsIDgpLCAwKTsKKyAgICAgICAgICAgICAgICBjb25zdCBj aGFyKiBuZXh0TGluZSA9IHN0cmNocihjdXJyZW50TGluZSwgJ1xuJyk7CisgICAgICAgICAgICAg ICAgY3VycmVudExpbmUgPSBuZXh0TGluZSA/IG5leHRMaW5lICsgMSA6IDA7CisgICAgICAgICAg ICB9CisgICAgICAgICAgICBjb25zdCBjaGFyKiByZXNwb25zZUhlYWRlciA9CisgICAgICAgICAg ICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogMFxy XG5cclxuIjsKKyAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChyZXNwb25zZUhlYWRlcik7Cisg ICAgICAgIH0pOwogICAgIH0pOwogCiAgICAgUmV0YWluUHRyPFRlc3RXS1dlYlZpZXc+IHdlYlZp ZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VS ZWN0KDAsIDAsIDgwMCwgNjAwKV0pOwpAQCAtMTE0LDYgKzEwOSw1IEBAIFRFU1QoV2ViS2l0LCBQ REZMaW5rUmVmZXJyZXIpCiAgICAgW25hdmlnYXRpb25EZWxlZ2F0ZSB3YWl0Rm9yRGlkRmluaXNo TmF2aWdhdGlvbl07CiAKIH0KLSNlbmRpZiAvL19fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPCAxMTAwMDAKIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZERlbGVn YXRlLm1tCmluZGV4IDgxYjE0ZjQ1NjNkMzgyY2QwNTAwZjNiNTUzODY1N2U1OWU2MTZhYzQuLjI1 NGY0M2MxM2MxNTgyMDVlMzRlYzEwZGNmZThlOThjNTAwNDIzNTggMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0K KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJjZUxvYWRE ZWxlZ2F0ZS5tbQpAQCAtMjcsNyArMjcsNiBAQAogCiAjaW1wb3J0ICJIVFRQU2VydmVyLmgiCiAj aW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgotI2ltcG9ydCAiVENQU2VydmVyLmgiCiAjaW1w b3J0ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgiCiAjaW1wb3J0ICJUZXN0VUlEZWxlZ2F0ZS5o IgogI2ltcG9ydCAiVGVzdFdLV2ViVmlldy5oIgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2VyQmFzaWMubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbQppbmRleCAw ZThhM2U3YWZmYzJmNTdlOGJmMDQ1ZmRhOGUwY2Q3NjJhYWM1NGJmLi40YWQzYzQ2MjEwOGViY2Mz OTlmM2EyOWE0NGNlY2I2NTg2NzcyZWJjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbQorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJCYXNpYy5tbQpAQCAtMjE1 MCwyMiArMjE1MCwxOSBAQCBURVNUKFNlcnZpY2VXb3JrZXJzLCBDb250ZW50UnVsZUxpc3QpCiAg ICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkQ29udGVudFJ1bGVM aXN0OmNvbnRlbnRSdWxlTGlzdC5nZXQoKV07CiAKICAgICB1c2luZyBuYW1lc3BhY2UgVGVzdFdl YktpdEFQSTsKLSAgICBUQ1BTZXJ2ZXIgc2VydmVyKFtdIChpbnQgc29ja2V0KSB7Ci0gICAgICAg IGF1dG8gcmVzcG9uZCA9IFtzb2NrZXRdIChjb25zdCBjaGFyKiBib2R5LCBjb25zdCBjaGFyKiBt aW1lVHlwZSkgewotICAgICAgICAgICAgTlNTdHJpbmcgKmZvcm1hdCA9IEAiSFRUUC8xLjEgMjAw IE9LXHJcbiIKLSAgICAgICAgICAgICJDb250ZW50LVR5cGU6ICVzXHJcbiIKLSAgICAgICAgICAg ICJDb250ZW50LUxlbmd0aDogJWRcclxuXHJcbiIKLSAgICAgICAgICAgICIlcyI7Ci0gICAgICAg ICAgICBOU1N0cmluZyAqcmVzcG9uc2UgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpmb3Jt YXQsIG1pbWVUeXBlLCBzdHJsZW4oYm9keSksIGJvZHldOwotICAgICAgICAgICAgVENQU2VydmVy Ojp3cml0ZShzb2NrZXQsIHJlc3BvbnNlLlVURjhTdHJpbmcsIHJlc3BvbnNlLmxlbmd0aCk7Ci0g ICAgICAgIH07Ci0gICAgICAgIFRDUFNlcnZlcjo6cmVhZChzb2NrZXQpOwotICAgICAgICByZXNw b25kKG1haW5CeXRlcywgInRleHQvaHRtbCIpOwotICAgICAgICBUQ1BTZXJ2ZXI6OnJlYWQoc29j a2V0KTsKLSAgICAgICAgcmVzcG9uZChjb250ZW50UnVsZUxpc3RXb3JrZXJTY3JpcHQsICJhcHBs aWNhdGlvbi9qYXZhc2NyaXB0Iik7Ci0gICAgICAgIGF1dG8gbGFzdFJlcXVlc3QgPSBUQ1BTZXJ2 ZXI6OnJlYWQoc29ja2V0KTsKLSAgICAgICAgRVhQRUNUX1RSVUUoc3RybnN0cigoY29uc3QgY2hh ciopbGFzdFJlcXVlc3QuZGF0YSgpLCAiYWxsb3dlZHN1YnJlc291cmNlIiwgbGFzdFJlcXVlc3Qu c2l6ZSgpKSk7Ci0gICAgICAgIHJlc3BvbmQoInN1Y2Nlc3NmdWwgZmV0Y2giLCAiYXBwbGljYXRp b24vb2N0ZXQtc3RyZWFtIik7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoW10gKENvbm5lY3Rpb24g Y29ubmVjdGlvbikgeworICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVzdChbPV0o VmVjdG9yPGNoYXI+JiYpIHsKKyAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChIVFRQUmVzcG9u c2Uoe3sgIkNvbnRlbnQtVHlwZSIsICJ0ZXh0L2h0bWwiIH19LCBtYWluQnl0ZXMpLnNlcmlhbGl6 ZSgpLCBbPV0geworICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24ucmVjZWl2ZUhUVFBSZXF1ZXN0 KFs9XShWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnNl bmQoSFRUUFJlc3BvbnNlKHt7ICJDb250ZW50LVR5cGUiLCAiYXBwbGljYXRpb24vamF2YXNjcmlw dCIgfX0sIGNvbnRlbnRSdWxlTGlzdFdvcmtlclNjcmlwdCkuc2VyaWFsaXplKCksIFs9XSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVzdChbPV0o VmVjdG9yPGNoYXI+JiYgbGFzdFJlcXVlc3QpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBFWFBFQ1RfVFJVRShzdHJuc3RyKChjb25zdCBjaGFyKilsYXN0UmVxdWVzdC5kYXRhKCksICJh bGxvd2Vkc3VicmVzb3VyY2UiLCBsYXN0UmVxdWVzdC5zaXplKCkpKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQoSFRUUFJlc3BvbnNlKCJzdWNjZXNzZnVsIGZl dGNoIikuc2VyaWFsaXplKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAg ICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSk7Cisg ICAgICAgIH0pOwogICAgIH0pOwogCiAgICAgZXhwZWN0ZWRNZXNzYWdlID0gQCJNZXNzYWdlIGZy b20gd29ya2VyOiBQQVNTIC0gYmxvY2tlZCBmaXJzdCByZXF1ZXN0LCBhbGxvd2VkIHNlY29uZCI7 CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VwbG9h ZERpcmVjdG9yeS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVXBs b2FkRGlyZWN0b3J5Lm1tCmluZGV4IDAyYTI1Mjk4YjJjMTIwMDIyNTM3NzFjODM5ZmI0YWM3ODY0 MzkxYjcuLmFiN2MzY2FjODY1OWY5ODY3NWFjNzczYzQ4OWNhOTM3NjgzMWQ1MTMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVXBsb2FkRGlyZWN0b3J5 Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVXBsb2FkRGly ZWN0b3J5Lm1tCkBAIC0yOCw3ICsyOCw3IEBACiAjaWYgUExBVEZPUk0oTUFDKQogCiAjaW1wb3J0 ICJEcmFnQW5kRHJvcFNpbXVsYXRvci5oIgotI2ltcG9ydCAiVENQU2VydmVyLmgiCisjaW1wb3J0 ICJIVFRQU2VydmVyLmgiCiAjaW1wb3J0ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgiCiAjaW1w b3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0ICJVdGlsaXRpZXMuaCIKQEAgLTgwLDI1ICs4 MCwyNiBAQCBURVNUKFdlYktpdCwgVXBsb2FkRGlyZWN0b3J5KQogCiAgICAgewogICAgICAgICB1 c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKLSAgICAgICAgVENQU2VydmVyIHNlcnZlcihb XSAoaW50IHNvY2tldCkgewotICAgICAgICAgICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7Ci0g ICAgICAgICAgICBjb25zdCBjaGFyKiByZXNwb25zZSA9Ci0gICAgICAgICAgICAiSFRUUC8xLjEg MjAwIE9LXHJcbiIKLSAgICAgICAgICAgICJDb250ZW50LVR5cGU6IHRleHQvaHRtbFxyXG4iCi0g ICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6IDEyM1xyXG5cclxuIgotICAgICAgICAgICAgIjxm b3JtIGlkPSdmb3JtJyBhY3Rpb249Jy91cGxvYWQucGhwJyBtZXRob2Q9J3Bvc3QnIGVuY3R5cGU9 J211bHRpcGFydC9mb3JtLWRhdGEnPjxpbnB1dCB0eXBlPSdmaWxlJyBuYW1lPSd0ZXN0bmFtZSc+ PC9mb3JtPiI7Ci0gICAgICAgICAgICBUQ1BTZXJ2ZXI6OndyaXRlKHNvY2tldCwgcmVzcG9uc2Us IHN0cmxlbihyZXNwb25zZSkpOwotCi0gICAgICAgICAgICBhdXRvIGhlYWRlciA9IFRDUFNlcnZl cjo6cmVhZChzb2NrZXQpOwotICAgICAgICAgICAgRVhQRUNUX1RSVUUoU3RyaW5nKGhlYWRlci5k YXRhKCksIGhlYWRlci5zaXplKCkpLmNvbnRhaW5zKCJDb250ZW50LUxlbmd0aDogNTQzIikpOwot ICAgICAgICAgICAgc2l6ZV90IGJvZHlCeXRlc1JlYWQgPSAwOwotICAgICAgICAgICAgd2hpbGUg KGJvZHlCeXRlc1JlYWQgPCA1NDMpCi0gICAgICAgICAgICAgICAgYm9keUJ5dGVzUmVhZCArPSBU Q1BTZXJ2ZXI6OnJlYWQoc29ja2V0KS5zaXplKCk7Ci0gICAgICAgICAgICBFWFBFQ1RfRVEoYm9k eUJ5dGVzUmVhZCwgNTQzdWxsKTsKLSAgICAgICAgICAgIGNvbnN0IGNoYXIqIHNlY29uZFJlc3Bv bnNlID0KLSAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgotICAgICAgICAgICAgIkNv bnRlbnQtTGVuZ3RoOiAwXHJcblxyXG4iOwotICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShz b2NrZXQsIHNlY29uZFJlc3BvbnNlLCBzdHJsZW4oc2Vjb25kUmVzcG9uc2UpKTsKKyAgICAgICAg SFRUUFNlcnZlciBzZXJ2ZXIoW10gKENvbm5lY3Rpb24gY29ubmVjdGlvbikgeworICAgICAgICAg ICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVlc3QoWz1dKFZlY3RvcjxjaGFyPiYmKSB7Cisg ICAgICAgICAgICAgICAgY29uc3QgY2hhciogcmVzcG9uc2UgPQorICAgICAgICAgICAgICAgICJI VFRQLzEuMSAyMDAgT0tcclxuIgorICAgICAgICAgICAgICAgICJDb250ZW50LVR5cGU6IHRleHQv aHRtbFxyXG4iCisgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAxMjNcclxuXHJcbiIK KyAgICAgICAgICAgICAgICAiPGZvcm0gaWQ9J2Zvcm0nIGFjdGlvbj0nL3VwbG9hZC5waHAnIG1l dGhvZD0ncG9zdCcgZW5jdHlwZT0nbXVsdGlwYXJ0L2Zvcm0tZGF0YSc+PGlucHV0IHR5cGU9J2Zp bGUnIG5hbWU9J3Rlc3RuYW1lJz48L2Zvcm0+IjsKKyAgICAgICAgICAgICAgICBjb25uZWN0aW9u LnNlbmQocmVzcG9uc2UsIFs9XSB7CisgICAgICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24ucmVj ZWl2ZUhUVFBSZXF1ZXN0KFs9XShWZWN0b3I8Y2hhcj4mJiByZXF1ZXN0KSB7CisgICAgICAgICAg ICAgICAgICAgICAgICBFWFBFQ1RfVFJVRShzdHJuc3RyKHJlcXVlc3QuZGF0YSgpLCAiQ29udGVu dC1MZW5ndGg6IDU0M1xyXG4iLCByZXF1ZXN0LnNpemUoKSkpOworICAgICAgICAgICAgICAgICAg ICAgICAgYXV0byogaGVhZGVyRW5kID0gc3RybnN0cihyZXF1ZXN0LmRhdGEoKSwgIlxyXG5cclxu IiwgcmVxdWVzdC5zaXplKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgRVhQRUNUX1RSVUUo aGVhZGVyRW5kKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIEVYUEVDVF9FUShyZXF1ZXN0LmVu ZCgpIC0gKGhlYWRlckVuZCArICsgc3RybGVuKCJcclxuXHJcbiIpKSwgNTQzKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIqIHNlY29uZFJlc3BvbnNlID0KKyAgICAgICAgICAg ICAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgorICAgICAgICAgICAgICAgICAgICAg ICAgIkNvbnRlbnQtTGVuZ3RoOiAwXHJcblxyXG4iOworICAgICAgICAgICAgICAgICAgICAgICAg Y29ubmVjdGlvbi5zZW5kKHNlY29uZFJlc3BvbnNlKTsKKyAgICAgICAgICAgICAgICAgICAgfSk7 CisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CiAKICAg ICAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYwMCldKTsKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tOYXZpZ2F0aW9uUmVzcG9uc2UubW0g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLTmF2aWdhdGlvblJlc3Bv bnNlLm1tCmluZGV4IGY2NDUwMDAyYzBmNWFiMTNmYTA5MjNjMGI2ZDg0M2M4OTkzYzNjMmEuLmY5 MGM2MmMxMTIzOWVjMDQyNTc5ZTM2ZDIxZTI2OWM3OGQzYTVkOTkgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tOYXZpZ2F0aW9uUmVzcG9uc2UubW0K KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS05hdmlnYXRpb25S ZXNwb25zZS5tbQpAQCAtMjUsNyArMjUsNyBAQAogCiAjaW1wb3J0ICJjb25maWcuaCIKIAotI2lt cG9ydCAiVENQU2VydmVyLmgiCisjaW1wb3J0ICJIVFRQU2VydmVyLmgiCiAjaW1wb3J0ICJUZXN0 LmgiCiAjaW1wb3J0ICJVdGlsaXRpZXMuaCIKICNpbXBvcnQgPFdlYktpdC9XS05hdmlnYXRpb25S ZXNwb25zZVByaXZhdGUuaD4KQEAgLTE5OSwyNCArMTk5LDI2IEBAIFRFU1QoV2ViS2l0LCBXS05h dmlnYXRpb25SZXNwb25zZURvd25sb2FkQXR0cmlidXRlKQogewogICAgIGF1dG8gZ2V0RG93bmxv YWRSZXNwb25zZSA9IFtdIChSZXRhaW5QdHI8TlNTdHJpbmc+IGJvZHkpIC0+IFJldGFpblB0cjxX S05hdmlnYXRpb25SZXNwb25zZT4gewogICAgICAgICB1c2luZyBuYW1lc3BhY2UgVGVzdFdlYktp dEFQSTsKLSAgICAgICAgVENQU2VydmVyIHNlcnZlcihbYm9keV0oaW50IHNvY2tldCkgewotICAg ICAgICAgICAgdW5zaWduZWQgYm9keUxlbmd0aCA9IFtib2R5IGxlbmd0aF07Ci0gICAgICAgICAg ICBOU1N0cmluZyAqZmlyc3RSZXNwb25zZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0Ogot ICAgICAgICAgICAgICAgIEAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKLSAgICAgICAgICAgICAgICAi Q29udGVudC1MZW5ndGg6ICVkXHJcblxyXG4iCi0gICAgICAgICAgICAgICAgIiVAIiwKLSAgICAg ICAgICAgICAgICBib2R5TGVuZ3RoLAotICAgICAgICAgICAgICAgIGJvZHkuZ2V0KCkKLSAgICAg ICAgICAgIF07Ci0gICAgICAgICAgICBOU1N0cmluZyAqc2Vjb25kUmVzcG9uc2UgPSBAIkhUVFAv MS4xIDIwMCBPS1xyXG4iCi0gICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA2XHJcbiIK LSAgICAgICAgICAgICAgICAiQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5h bWU9ZnJvbUhlYWRlci50eHQ7XHJcblxyXG4iCi0gICAgICAgICAgICAgICAgIkhlbGxvISI7Ci0K LSAgICAgICAgICAgIFRDUFNlcnZlcjo6cmVhZChzb2NrZXQpOwotICAgICAgICAgICAgVENQU2Vy dmVyOjp3cml0ZShzb2NrZXQsIGZpcnN0UmVzcG9uc2UuVVRGOFN0cmluZywgZmlyc3RSZXNwb25z ZS5sZW5ndGgpOwotICAgICAgICAgICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7Ci0gICAgICAg ICAgICBUQ1BTZXJ2ZXI6OndyaXRlKHNvY2tldCwgc2Vjb25kUmVzcG9uc2UuVVRGOFN0cmluZywg c2Vjb25kUmVzcG9uc2UubGVuZ3RoKTsKKyAgICAgICAgSFRUUFNlcnZlciBzZXJ2ZXIoW2JvZHld KENvbm5lY3Rpb24gY29ubmVjdGlvbikgeworICAgICAgICAgICAgY29ubmVjdGlvbi5yZWNlaXZl SFRUUFJlcXVlc3QoWz1dKFZlY3RvcjxjaGFyPiYmKSB7CisgICAgICAgICAgICAgICAgdW5zaWdu ZWQgYm9keUxlbmd0aCA9IFtib2R5IGxlbmd0aF07CisgICAgICAgICAgICAgICAgTlNTdHJpbmcg KmZpcnN0UmVzcG9uc2UgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDoKKyAgICAgICAgICAg ICAgICAgICAgQCJIVFRQLzEuMSAyMDAgT0tcclxuIgorICAgICAgICAgICAgICAgICAgICAiQ29u dGVudC1MZW5ndGg6ICVkXHJcblxyXG4iCisgICAgICAgICAgICAgICAgICAgICIlQCIsCisgICAg ICAgICAgICAgICAgICAgIGJvZHlMZW5ndGgsCisgICAgICAgICAgICAgICAgICAgIGJvZHkuZ2V0 KCkKKyAgICAgICAgICAgICAgICBdOworICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChm aXJzdFJlc3BvbnNlLCBbPV0geworICAgICAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2Vp dmVIVFRQUmVxdWVzdChbPV0oVmVjdG9yPGNoYXI+JiYpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIE5TU3RyaW5nICpzZWNvbmRSZXNwb25zZSA9IEAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6IDZcclxuIgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50OyBm aWxlbmFtZT1mcm9tSGVhZGVyLnR4dDtcclxuXHJcbiIKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiSGVsbG8hIjsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChz ZWNvbmRSZXNwb25zZSk7CisgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAg IH0pOworICAgICAgICAgICAgfSk7CiAgICAgICAgIH0pOwogICAgICAgICBhdXRvIGRlbGVnYXRl ID0gYWRvcHROUyhbTmF2aWdhdGlvblJlc3BvbnNlVGVzdERlbGVnYXRlIG5ld10pOwogICAgICAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7CmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0V2YWx1YXRlSmF2 YVNjcmlwdC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJW aWV3RXZhbHVhdGVKYXZhU2NyaXB0Lm1tCmluZGV4IDdjYTgwOTc4ZTNmMWNjNmJjNTNjN2E1Yzdk YjFhM2RiNmRkMTM4YjQuLmQ3MDA4MjNkN2JiY2U3Mjk4MWI3ZGE0ODVkOGJkNmRlMDlkZDQ1N2Eg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJW aWV3RXZhbHVhdGVKYXZhU2NyaXB0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tXZWJWaWV3RXZhbHVhdGVKYXZhU2NyaXB0Lm1tCkBAIC0yOCw3ICsyOCw2 IEBACiAKICNpbXBvcnQgIkhUVFBTZXJ2ZXIuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVz LmgiCi0jaW1wb3J0ICJUQ1BTZXJ2ZXIuaCIKICNpbXBvcnQgIlRlc3QuaCIKICNpbXBvcnQgIlRl c3ROYXZpZ2F0aW9uRGVsZWdhdGUuaCIKICNpbXBvcnQgIlRlc3RVUkxTY2hlbWVIYW5kbGVyLmgi CkBAIC0zMzgsMTQgKzMzNywxNCBAQCBURVNUKFdlYktpdCwgRXZhbHVhdGVKYXZhU2NyaXB0SW5B dHRhY2htZW50cykKICAgICAvLyBFdmFsdWF0aW5nIEphdmFTY3JpcHQgaW4gc3VjaCBhIGRvY3Vt ZW50IHNob3VsZCBmYWlsIGFuZCByZXN1bHQgaW4gYW4gZXJyb3IuCiAKICAgICB1c2luZyBuYW1l c3BhY2UgVGVzdFdlYktpdEFQSTsKLSAgICBUQ1BTZXJ2ZXIgc2VydmVyKFtdKGludCBzb2NrZXQp IHsKLSAgICAgICAgTlNTdHJpbmcgKnJlc3BvbnNlID0gQCJIVFRQLzEuMSAyMDAgT0tcclxuIgot ICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAxMlxyXG4iCi0gICAgICAgICAgICAiQ29udGVu dC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5hbWU9ZnJvbUhlYWRlci50eHQ7XHJcblxy XG4iCi0gICAgICAgICAgICAiSGVsbG8gd29ybGQhIjsKLQotICAgICAgICBUQ1BTZXJ2ZXI6OnJl YWQoc29ja2V0KTsKLSAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2NrZXQsIHJlc3BvbnNlLlVU RjhTdHJpbmcsIHJlc3BvbnNlLmxlbmd0aCk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoW10oQ29u bmVjdGlvbiBjb25uZWN0aW9uKSB7CisgICAgICAgIGNvbm5lY3Rpb24ucmVjZWl2ZUhUVFBSZXF1 ZXN0KFs9XShWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICAgICAgY29uc3RleHByIGF1dG8gcmVz cG9uc2UgPSAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgICAgICAgICAiQ29udGVudC1M ZW5ndGg6IDEyXHJcbiIKKyAgICAgICAgICAgICAgICAiQ29udGVudC1EaXNwb3NpdGlvbjogYXR0 YWNobWVudDsgZmlsZW5hbWU9ZnJvbUhlYWRlci50eHQ7XHJcblxyXG4iCisgICAgICAgICAgICAg ICAgIkhlbGxvIHdvcmxkISI7CisgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQocmVzcG9uc2Up OworICAgICAgICB9KTsKICAgICB9KTsKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtUZXN0 V0tXZWJWaWV3IG5ld10pOwogICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkUmVxdWVzdDpb TlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmlu ZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cDovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgp XV1dXTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tXZWJzaXRlRGF0YXN0b3JlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XS1dlYnNpdGVEYXRhc3RvcmUubW0KaW5kZXggYzllNmNlYWYyMzc3ODExNWIyYjI0MWU1 MzlkMjc0ZTJlNTM1YjU5Ny4uZjZjZTdjNTI5MWQyYzM2OGQxYTM3OGY5ZGZhNmZlNmNjMGMxMDky ZCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dl YnNpdGVEYXRhc3RvcmUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XS1dlYnNpdGVEYXRhc3RvcmUubW0KQEAgLTI3LDcgKzI3LDYgQEAKIAogI2ltcG9ydCAi SFRUUFNlcnZlci5oIgogI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKLSNpbXBvcnQgIlRD UFNlcnZlci5oIgogI2ltcG9ydCAiVGVzdC5oIgogI2ltcG9ydCAiVGVzdFdLV2ViVmlldy5oIgog I2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CkBAIC0xMjAsNyArMTE5LDcg QEAgVEVTVChXS1dlYnNpdGVEYXRhU3RvcmUsIFJlbW92ZUVwaGVtZXJhbERhdGEpCiAKIFRFU1Qo V0tXZWJzaXRlRGF0YVN0b3JlLCBGZXRjaE5vblBlcnNpc3RlbnRDcmVkZW50aWFscykKIHsKLSAg ICBUQ1BTZXJ2ZXIgc2VydmVyKFRDUFNlcnZlcjo6cmVzcG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0sp OworICAgIEhUVFBTZXJ2ZXIgc2VydmVyKEhUVFBTZXJ2ZXI6OnJlc3BvbmRXaXRoQ2hhbGxlbmdl VGhlbk9LKTsKICAgICAKICAgICB1c2VQZXJzaXN0ZW50Q3JlZGVudGlhbFN0b3JhZ2UgPSBmYWxz ZTsKICAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0 aW9uIG5ld10pOwpAQCAtMTQ1LDcgKzE0NCw3IEBAIFRFU1QoV0tXZWJzaXRlRGF0YVN0b3JlLCBG ZXRjaE5vblBlcnNpc3RlbnRDcmVkZW50aWFscykKIAogVEVTVChXS1dlYnNpdGVEYXRhU3RvcmUs IEZldGNoUGVyc2lzdGVudENyZWRlbnRpYWxzKQogewotICAgIFRDUFNlcnZlciBzZXJ2ZXIoVENQ U2VydmVyOjpyZXNwb25kV2l0aENoYWxsZW5nZVRoZW5PSyk7CisgICAgSFRUUFNlcnZlciBzZXJ2 ZXIoSFRUUFNlcnZlcjo6cmVzcG9uZFdpdGhDaGFsbGVuZ2VUaGVuT0spOwogCiAgICAgdXNlUGVy c2lzdGVudENyZWRlbnRpYWxTdG9yYWdlID0gdHJ1ZTsKICAgICBhdXRvIHdlYnNpdGVEYXRhU3Rv cmUgPSBbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdOwpAQCAtMTc0LDcgKzE3 Myw3IEBAIFRFU1QoV0tXZWJzaXRlRGF0YVN0b3JlLCBGZXRjaFBlcnNpc3RlbnRDcmVkZW50aWFs cykKIAogVEVTVChXS1dlYnNpdGVEYXRhU3RvcmUsIFJlbW92ZU5vblBlcnNpc3RlbnRDcmVkZW50 aWFscykKIHsKLSAgICBUQ1BTZXJ2ZXIgc2VydmVyKFRDUFNlcnZlcjo6cmVzcG9uZFdpdGhDaGFs bGVuZ2VUaGVuT0spOworICAgIEhUVFBTZXJ2ZXIgc2VydmVyKEhUVFBTZXJ2ZXI6OnJlc3BvbmRX aXRoQ2hhbGxlbmdlVGhlbk9LKTsKIAogICAgIHVzZVBlcnNpc3RlbnRDcmVkZW50aWFsU3RvcmFn ZSA9IGZhbHNlOwogICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0Nv bmZpZ3VyYXRpb24gbmV3XSk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1t CmluZGV4IGM3ZTIxOWYyYWYxMjA2NjFlM2RiNzNhMGNkYWIxZDA0ZjlmN2YzOWYuLjJhZGRjNzg0 YjhmNWIwMjA0ZjdjNWYxN2I2YTBmMDZjOTgzMDQ0NjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1t CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tCkBAIC0yNyw3ICsyNyw2IEBACiAKICNpbXBvcnQgIkhUVFBTZXJ2 ZXIuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCi0jaW1wb3J0ICJUQ1BTZXJ2ZXIu aCIKICNpbXBvcnQgIlRlc3QuaCIKICNpbXBvcnQgIlRlc3ROYXZpZ2F0aW9uRGVsZWdhdGUuaCIK ICNpbXBvcnQgIlRlc3RXS1dlYlZpZXcuaCIKQEAgLTYwOSwxNCArNjA4LDE1IEBAIFRFU1QoV2Vi S2l0LCBXZWJzaXRlRGF0YVN0b3JlUmVuYW1lT3JpZ2luKQogVEVTVChXZWJLaXQsIE5ldHdvcmtD YWNoZURpcmVjdG9yeSkKIHsKICAgICB1c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKLSAg ICBUQ1BTZXJ2ZXIgc2VydmVyKFtdIChpbnQgc29ja2V0KSB7Ci0gICAgICAgIFRDUFNlcnZlcjo6 cmVhZChzb2NrZXQpOwotICAgICAgICBjb25zdCBjaGFyKiByZXNwb25zZSA9Ci0gICAgICAgICJI VFRQLzEuMSAyMDAgT0tcclxuIgotICAgICAgICAiQ2FjaGUtQ29udHJvbDogbWF4LWFnZT0xMDAw MDAwXHJcbiIKLSAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA2XHJcblxyXG4iCi0gICAgICAgICJI ZWxsbyEiOwotICAgICAgICBUQ1BTZXJ2ZXI6OndyaXRlKHNvY2tldCwgcmVzcG9uc2UsIHN0cmxl bihyZXNwb25zZSkpOworICAgIEhUVFBTZXJ2ZXIgc2VydmVyKFtdIChDb25uZWN0aW9uIGNvbm5l Y3Rpb24pIHsKKyAgICAgICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVlc3QoWz1dIChWZWN0 b3I8Y2hhcj4mJikgeworICAgICAgICAgICAgY29uc3QgY2hhciogcmVzcG9uc2UgPQorICAgICAg ICAgICAgIkhUVFAvMS4xIDIwMCBPS1xyXG4iCisgICAgICAgICAgICAiQ2FjaGUtQ29udHJvbDog bWF4LWFnZT0xMDAwMDAwXHJcbiIKKyAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogNlxyXG5c clxuIgorICAgICAgICAgICAgIkhlbGxvISI7CisgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQo cmVzcG9uc2UpOworICAgICAgICB9KTsKICAgICB9KTsKICAgICAKICAgICBOU1VSTCAqdGVtcERp ciA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGlyZWN0b3J5KCkgc3RyaW5n QnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0Il0gaXNEaXJlY3Rvcnk6 WUVTXTsKQEAgLTc0MCw1MiArNzQwLDU0IEBAIFRFU1QoV2ViS2l0LCBESVNBQkxFRF9BbHRlcm5h dGl2ZVNlcnZpY2UpCiAKICNlbmRpZiAvLyBIQVZFKENGTkVUV09SS19BTFRFUk5BVElWRV9TRVJW SUNFKQogCitzdGF0aWMgdm9pZCByZXNwb25kVG9SYW5nZVJlcXVlc3RzKGNvbnN0IFRlc3RXZWJL aXRBUEk6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIGNvbnN0IFJldGFpblB0cjxOU0RhdGE+JiBk YXRhKQoreworICAgIGNvbm5lY3Rpb24ucmVjZWl2ZUhUVFBSZXF1ZXN0KFs9XSAoVmVjdG9yPGNo YXI+JiYgYnl0ZXMpIHsKKyAgICAgICAgU3RyaW5nVmlldyByZXF1ZXN0KHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgTENoYXIqPihieXRlcy5kYXRhKCkpLCBieXRlcy5zaXplKCkpOworICAgICAgICBh dXRvIHJhbmdlQnl0ZXMgPSAiUmFuZ2U6IGJ5dGVzPSJfczsKKyAgICAgICAgYXV0byBiZWdpbiA9 IHJlcXVlc3QuZmluZChTdHJpbmdWaWV3KHJhbmdlQnl0ZXMpLCAwKTsKKyAgICAgICAgQVNTRVJU KGJlZ2luICE9IG5vdEZvdW5kKTsKKyAgICAgICAgYXV0byBkYXNoID0gcmVxdWVzdC5maW5kKCct JywgYmVnaW4pOworICAgICAgICBBU1NFUlQoZGFzaCAhPSBub3RGb3VuZCk7CisgICAgICAgIGF1 dG8gZW5kID0gcmVxdWVzdC5maW5kKCdccicsIGRhc2gpOworICAgICAgICBBU1NFUlQoZW5kICE9 IG5vdEZvdW5kKTsKKworICAgICAgICBhdXRvIHJhbmdlQmVnaW4gPSBwYXJzZUludGVnZXI8dWlu dDY0X3Q+KHJlcXVlc3Quc3Vic3RyaW5nKGJlZ2luICsgcmFuZ2VCeXRlcy5sZW5ndGgoKSwgZGFz aCAtIGJlZ2luIC0gcmFuZ2VCeXRlcy5sZW5ndGgoKSkpLnZhbHVlKCk7CisgICAgICAgIGF1dG8g cmFuZ2VFbmQgPSBwYXJzZUludGVnZXI8dWludDY0X3Q+KHJlcXVlc3Quc3Vic3RyaW5nKGRhc2gg KyAxLCBlbmQgLSBkYXNoIC0gMSkpLnZhbHVlKCk7CisKKyAgICAgICAgTlNTdHJpbmcgKnJlc3Bv bnNlSGVhZGVyU3RyaW5nID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6CisgICAgICAgICAg ICBAIkhUVFAvMS4xIDIwNiBQYXJ0aWFsIENvbnRlbnRcclxuIgorICAgICAgICAgICAgIkNvbnRl bnQtUmFuZ2U6IGJ5dGVzICVsbHUtJWxsdS8lbGx1XHJcbiIKKyAgICAgICAgICAgICJDb250ZW50 LUxlbmd0aDogJWxsdVxyXG5cclxuIiwKKyAgICAgICAgICAgIHJhbmdlQmVnaW4sIHJhbmdlRW5k LCBzdGF0aWNfY2FzdDx1aW50NjRfdD4oZGF0YS5nZXQoKS5sZW5ndGgpLCByYW5nZUVuZCAtIHJh bmdlQmVnaW5dOworICAgICAgICBOU0RhdGEgKnJlc3BvbnNlSGVhZGVyID0gW3Jlc3BvbnNlSGVh ZGVyU3RyaW5nIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXTsKKyAgICAg ICAgTlNEYXRhICpyZXNwb25zZUJvZHkgPSBbZGF0YSBzdWJkYXRhV2l0aFJhbmdlOk5TTWFrZVJh bmdlKHJhbmdlQmVnaW4sIHJhbmdlRW5kIC0gcmFuZ2VCZWdpbildOworICAgICAgICBWZWN0b3I8 dWludDhfdD4gcmVzcG9uc2UgeyBzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90Kj4ocmVzcG9uc2VI ZWFkZXIuYnl0ZXMpLCByZXNwb25zZUhlYWRlci5sZW5ndGggfTsKKyAgICAgICAgcmVzcG9uc2Uu YXBwZW5kKHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QqPihyZXNwb25zZUJvZHkuYnl0ZXMpLCBy ZXNwb25zZUJvZHkubGVuZ3RoKTsKKyAgICAgICAgY29ubmVjdGlvbi5zZW5kKFdURk1vdmUocmVz cG9uc2UpLCBbPV0geworICAgICAgICAgICAgcmVzcG9uZFRvUmFuZ2VSZXF1ZXN0cyhjb25uZWN0 aW9uLCBkYXRhKTsKKyAgICAgICAgfSk7CisgICAgfSk7Cit9CisKIFRFU1QoV2ViS2l0LCBNZWRp YUNhY2hlKQogewogICAgIEpTQzo6Q29uZmlnOjpjb25maWd1cmVGb3JUZXN0aW5nKCk7CiAKLSAg ICBzdGQ6OmF0b21pYzxib29sPiBkb25lID0gZmFsc2U7CiAgICAgdXNpbmcgbmFtZXNwYWNlIFRl c3RXZWJLaXRBUEk7CiAgICAgUmV0YWluUHRyPE5TRGF0YT4gZGF0YSA9IFtOU0RhdGEgZGF0YVdp dGhDb250ZW50c09mVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJ0 ZXN0IiB3aXRoRXh0ZW5zaW9uOkAibXA0IiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJl c291cmNlcyJdXTsKLSAgICB1aW50NjRfdCBkYXRhTGVuZ3RoID0gW2RhdGEgbGVuZ3RoXTsKLQot ICAgIFRDUFNlcnZlciBzZXJ2ZXIoWyZdIChpbnQgc29ja2V0KSB7Ci0gICAgICAgIFRDUFNlcnZl cjo6cmVhZChzb2NrZXQpOwotICAgICAgICBjb25zdCBjaGFyKiBmaXJzdFJlc3BvbnNlID0KLSAg ICAgICAgIkhUVFAvMS4xIDIwMCBPS1xyXG4iCi0gICAgICAgICJDb250ZW50LVR5cGU6IHRleHQv aHRtbFxyXG4iCi0gICAgICAgICJDb250ZW50LUxlbmd0aDogNTVcclxuXHJcbiIKLSAgICAgICAg Ijx2aWRlbz48c291cmNlIHNyYz0ndGVzdC5tcDQnIHR5cGU9J3ZpZGVvL21wNCc+PC92aWRlbz4i OwotICAgICAgICBUQ1BTZXJ2ZXI6OndyaXRlKHNvY2tldCwgZmlyc3RSZXNwb25zZSwgc3RybGVu KGZpcnN0UmVzcG9uc2UpKTsKLQotICAgICAgICB3aGlsZSAoIWRvbmUpIHsKLSAgICAgICAgICAg IGF1dG8gYnl0ZXMgPSBUQ1BTZXJ2ZXI6OnJlYWQoc29ja2V0KTsKLSAgICAgICAgICAgIGlmIChk b25lIHx8IGJ5dGVzLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgIFN0cmluZ1ZpZXcgcmVxdWVzdChzdGF0aWNfY2FzdDxjb25zdCBMQ2hhcio+KGJ5dGVzLmRh dGEoKSksIGJ5dGVzLnNpemUoKSk7Ci0gICAgICAgICAgICBTdHJpbmcgcmFuZ2VCeXRlcyA9ICJS YW5nZTogYnl0ZXM9Il9zOwotICAgICAgICAgICAgYXV0byBiZWdpbiA9IHJlcXVlc3QuZmluZChT dHJpbmdWaWV3KHJhbmdlQnl0ZXMpLCAwKTsKLSAgICAgICAgICAgIEFTU0VSVChiZWdpbiAhPSBu b3RGb3VuZCk7Ci0gICAgICAgICAgICBhdXRvIGRhc2ggPSByZXF1ZXN0LmZpbmQoJy0nLCBiZWdp bik7Ci0gICAgICAgICAgICBBU1NFUlQoZGFzaCAhPSBub3RGb3VuZCk7Ci0gICAgICAgICAgICBh dXRvIGVuZCA9IHJlcXVlc3QuZmluZCgnXHInLCBkYXNoKTsKLSAgICAgICAgICAgIEFTU0VSVChl bmQgIT0gbm90Rm91bmQpOwotCi0gICAgICAgICAgICBhdXRvIHJhbmdlQmVnaW4gPSBwYXJzZUlu dGVnZXI8dWludDY0X3Q+KHJlcXVlc3Quc3Vic3RyaW5nKGJlZ2luICsgcmFuZ2VCeXRlcy5sZW5n dGgoKSwgZGFzaCAtIGJlZ2luIC0gcmFuZ2VCeXRlcy5sZW5ndGgoKSkpLnZhbHVlKCk7Ci0gICAg ICAgICAgICBhdXRvIHJhbmdlRW5kID0gcGFyc2VJbnRlZ2VyPHVpbnQ2NF90PihyZXF1ZXN0LnN1 YnN0cmluZyhkYXNoICsgMSwgZW5kIC0gZGFzaCAtIDEpKS52YWx1ZSgpOwotCi0gICAgICAgICAg ICBOU1N0cmluZyAqcmVzcG9uc2VIZWFkZXJTdHJpbmcgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZv cm1hdDoKLSAgICAgICAgICAgICAgICBAIkhUVFAvMS4xIDIwNiBQYXJ0aWFsIENvbnRlbnRcclxu IgotICAgICAgICAgICAgICAgICJDb250ZW50LVJhbmdlOiBieXRlcyAlbGx1LSVsbHUvJWxsdVxy XG4iCi0gICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAlbGx1XHJcblxyXG4iLAotICAg ICAgICAgICAgICAgIHJhbmdlQmVnaW4sIHJhbmdlRW5kLCBkYXRhTGVuZ3RoLCByYW5nZUVuZCAt IHJhbmdlQmVnaW5dOwotICAgICAgICAgICAgTlNEYXRhICpyZXNwb25zZUhlYWRlciA9IFtyZXNw b25zZUhlYWRlclN0cmluZyBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ107 Ci0gICAgICAgICAgICBOU0RhdGEgKnJlc3BvbnNlQm9keSA9IFtkYXRhIHN1YmRhdGFXaXRoUmFu Z2U6TlNNYWtlUmFuZ2UocmFuZ2VCZWdpbiwgcmFuZ2VFbmQgLSByYW5nZUJlZ2luKV07Ci0gICAg ICAgICAgICBOU011dGFibGVEYXRhICpyZXNwb25zZSA9IFtOU011dGFibGVEYXRhIGRhdGFXaXRo Q2FwYWNpdHk6cmVzcG9uc2VIZWFkZXIubGVuZ3RoICsgcmVzcG9uc2VCb2R5Lmxlbmd0aF07Ci0g ICAgICAgICAgICBbcmVzcG9uc2UgYXBwZW5kRGF0YTpyZXNwb25zZUhlYWRlcl07Ci0gICAgICAg ICAgICBbcmVzcG9uc2UgYXBwZW5kRGF0YTpyZXNwb25zZUJvZHldOwotICAgICAgICAgICAgVENQ U2VydmVyOjp3cml0ZShzb2NrZXQsIHJlc3BvbnNlLmJ5dGVzLCByZXNwb25zZS5sZW5ndGgpOwot ICAgICAgICB9CisKKyAgICBIVFRQU2VydmVyIHNlcnZlcihbJl0gKENvbm5lY3Rpb24gY29ubmVj dGlvbikgeworICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVzdChbPV0gKFZlY3Rv cjxjaGFyPiYmKSB7CisgICAgICAgICAgICBjb25zdCBjaGFyKiBmaXJzdFJlc3BvbnNlID0KKyAg ICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgorICAgICAgICAgICAgIkNvbnRlbnQtVHlw ZTogdGV4dC9odG1sXHJcbiIKKyAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogNTVcclxuXHJc biIKKyAgICAgICAgICAgICI8dmlkZW8+PHNvdXJjZSBzcmM9J3Rlc3QubXA0JyB0eXBlPSd2aWRl by9tcDQnPjwvdmlkZW8+IjsKKyAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChmaXJzdFJlc3Bv bnNlLCBbPV0geworICAgICAgICAgICAgICAgIHJlc3BvbmRUb1JhbmdlUmVxdWVzdHMoY29ubmVj dGlvbiwgZGF0YSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CiAgICAgfSk7CiAKICAg ICBOU1VSTCAqdGVtcERpciA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6W05TVGVtcG9yYXJ5RGly ZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiQ3VzdG9tUGF0aHNUZXN0 Il0gaXNEaXJlY3Rvcnk6WUVTXTsKQEAgLTgwNyw3ICs4MDksNiBAQCBURVNUKFdlYktpdCwgTWVk aWFDYWNoZSkKICAgICAgICAgVXRpbDo6c3BpblJ1bkxvb3AoKTsKICAgICBFWFBFQ1RfRkFMU0Uo ZXJyb3IpOwogCi0gICAgZG9uZSA9IHRydWU7CiAgICAgW1t3ZWJWaWV3IGNvbmZpZ3VyYXRpb25d LndlYnNpdGVEYXRhU3RvcmUgX3Rlcm1pbmF0ZU5ldHdvcmtQcm9jZXNzXTsKIAogICAgIFtmaWxl TWFuYWdlciByZW1vdmVJdGVtQXRQYXRoOnBhdGggZXJyb3I6JmVycm9yXTsK