230980 2021-09-29 13:44:51 -0700 Migrate _WKDownload tests from TCPServer to HTTPServer 2021-09-29 16:02:53 -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 1798534 0 achristensen 2021-09-29 13:44:51 -0700 Migrate _WKDownload tests from TCPServer to HTTPServer 1798536 1 439649 achristensen 2021-09-29 13:46:48 -0700 Created attachment 439649 Patch 1798537 2 achristensen 2021-09-29 13:46:51 -0700 <rdar://problem/82100878> 1798568 3 439660 achristensen 2021-09-29 14:31:03 -0700 Created attachment 439660 Patch 1798569 4 439649 cdumez 2021-09-29 14:31:06 -0700 Comment on attachment 439649 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439649&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm:858 > +void respondSlowly(Connection connection, double kbps) Why aren't we passing connection by reference here? Seems odd to cause ref counting churn. > Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm:899 > + HTTPServer server([&](Connection connection) { Not new to this patch but I think Connection should be passed by reference to the lambda. > Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm:1156 > + auto websiteDataStore = [WKWebsiteDataStore defaultDataStore]; Nice bug you fixed :) 1798644 5 ews-feeder 2021-09-29 16:02:51 -0700 Committed r283272 (242301@main): <https://commits.webkit.org/242301@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439660. 439649 2021-09-29 13:46:48 -0700 2021-09-29 14:32:17 -0700 Patch bug-230980-20210929134647.patch text/plain 9796 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjMxNDZkZjk3ZjE1NDIxYTRlNzNkMzBhZTkwNmMwYzMx MDljZTk5NS4uOWNhNzcyY2U0ZjA4MmViYmRlMmVmZmU2ZTE4ZGNiNTg1NmRjZmQ4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTA5LTI5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgTWlncmF0ZSBfV0tEb3dubG9hZCB0ZXN0cyBmcm9tIFRDUFNlcnZlciB0 byBIVFRQU2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzA5ODAKKyAgICAgICAgPHJkYXI6Ly84MjEwMDg3OD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZm9ybWVyIGlzIHZlcnkgcGlja3kg d2hlbiBpdCBjb21lcyB0byBudW1iZXJzIG9mIFRDUCBjb25uZWN0aW9ucywgYW5kIGNhdXNlcyB0 ZXN0cyB0byB0aW1lIG91dCB3aGVuCisgICAgICAgIHRoZSBudW1iZXIgb2YgY29ubmVjdGlvbnMg Y2hhbmdlcy4gIFRoZSBsYXR0ZXIgaXMgbW9yZSBmb3JnaXZpbmcgYW5kIHJ1bnMgY29kZSBvbiB0 aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0Rvd25sb2FkLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6cmVzcG9uZFNsb3dseSk6 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpkb3dubG9hZEF0UmF0ZSk6CisgICAgICAgIChURVNU KToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW06CisgICAgICAg IChUZXN0V2ViS2l0QVBJOjpDb25uZWN0aW9uOjpzZW5kIGNvbnN0KToKKwogMjAyMS0wOS0yOSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgV1BUIGltcG9ydGVy IHNob3VsZCBjcmVhdGUgc2VydmljZXdvcmtlciB0ZW1wbGF0ZSBmb3IgdGVtcGxhdGVkIHRlc3Qg dGhhdCBoYXZlIHdvcmtlciBhcyBnbG9iYWwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvRG93bmxvYWQubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0Rvd25sb2FkLm1tCmluZGV4IDAyZmJjYmQxZGEwYjdjYWY4NmQ3YWY0 ZmQ2MmY2MWYzZDU2MDcwYzQuLjExNmZlOGQ2M2QxNTk1ZTRhNjU4ZTU3NTE2YWI1OWI3YjMyYTll YzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRG93 bmxvYWQubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb3du bG9hZC5tbQpAQCAtMjYsMTEgKzI2LDggQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCA8 V2ViS2l0L1dLRm91bmRhdGlvbi5oPgogCi0jaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJ T1MpCi0KICNpbXBvcnQgIkhUVFBTZXJ2ZXIuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVz LmgiCi0jaW1wb3J0ICJUQ1BTZXJ2ZXIuaCIKICNpbXBvcnQgIlRlc3QuaCIKICNpbXBvcnQgIlRl c3REb3dubG9hZERlbGVnYXRlLmgiCiAjaW1wb3J0ICJUZXN0TGVnYWN5RG93bmxvYWREZWxlZ2F0 ZS5oIgpAQCAtODU4LDMxICs4NTUsMjAgQEAgc3RhdGljIFJldGFpblB0cjxOU1N0cmluZz4gZGVz dGluYXRpb247CiAKIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIAotdm9pZCByZXNwb25kU2xv d2x5KGludCBzb2NrZXQsIGRvdWJsZSBrYnBzLCBib29sJiB0ZXJtaW5hdGVTZXJ2ZXIpCit2b2lk IHJlc3BvbmRTbG93bHkoQ29ubmVjdGlvbiBjb25uZWN0aW9uLCBkb3VibGUga2JwcykKIHsKLSAg ICBFWFBFQ1RfRkFMU0UoaXNNYWluVGhyZWFkKCkpOwotICAgIGNoYXIgcmVhZEJ1ZmZlclsxMDAw XTsKLSAgICBhdXRvIGJ5dGVzUmVhZCA9IDo6cmVhZChzb2NrZXQsIHJlYWRCdWZmZXIsIHNpemVv ZihyZWFkQnVmZmVyKSk7Ci0gICAgRVhQRUNUX0dUKGJ5dGVzUmVhZCwgMCk7Ci0gICAgRVhQRUNU X1RSVUUoc3RhdGljX2Nhc3Q8c2l6ZV90PihieXRlc1JlYWQpIDwgc2l6ZW9mKHJlYWRCdWZmZXIp KTsKLSAgICAKLSAgICBjb25zdCBjaGFyKiByZXNwb25zZUhlYWRlciA9Ci0gICAgIkhUVFAvMS4x IDIwMCBPS1xyXG4iCi0gICAgIkNvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQ7IGZpbGVu YW1lPVwiZmlsZW5hbWUuZGF0XCJcclxuIgotICAgICJDb250ZW50LUxlbmd0aDogMTAwMDAwMDAw XHJcblxyXG4iOwotICAgIGF1dG8gYnl0ZXNXcml0dGVuID0gOjp3cml0ZShzb2NrZXQsIHJlc3Bv bnNlSGVhZGVyLCBzdHJsZW4ocmVzcG9uc2VIZWFkZXIpKTsKLSAgICBFWFBFQ1RfRVEoc3RhdGlj X2Nhc3Q8c2l6ZV90PihieXRlc1dyaXR0ZW4pLCBzdHJsZW4ocmVzcG9uc2VIZWFkZXIpKTsKLSAg ICAKKyAgICBFWFBFQ1RfVFJVRShpc01haW5UaHJlYWQoKSk7CisKICAgICBjb25zdCBkb3VibGUg d3JpdGVzUGVyU2Vjb25kID0gMTAwOwotICAgIFZlY3RvcjxjaGFyPiB3cml0ZUJ1ZmZlcihzdGF0 aWNfY2FzdDxzaXplX3Q+KDEwMjQgKiBrYnBzIC8gd3JpdGVzUGVyU2Vjb25kKSk7Ci0gICAgd2hp bGUgKCF0ZXJtaW5hdGVTZXJ2ZXIpIHsKLSAgICAgICAgYXV0byBiZWZvcmUgPSBNb25vdG9uaWNU aW1lOjpub3coKTsKLSAgICAgICAgOjp3cml0ZShzb2NrZXQsIHdyaXRlQnVmZmVyLmRhdGEoKSwg d3JpdGVCdWZmZXIuc2l6ZSgpKTsKKyAgICBWZWN0b3I8dWludDhfdD4gd3JpdGVCdWZmZXIoc3Rh dGljX2Nhc3Q8c2l6ZV90PigxMDI0ICoga2JwcyAvIHdyaXRlc1BlclNlY29uZCkpOworICAgIGF1 dG8gYmVmb3JlID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisgICAgY29ubmVjdGlvbi5zZW5kKFdU Rk1vdmUod3JpdGVCdWZmZXIpLCBbPV0gewogICAgICAgICBkb3VibGUgd3JpdGVEdXJhdGlvbiA9 IChNb25vdG9uaWNUaW1lOjpub3coKSAtIGJlZm9yZSkuc2Vjb25kcygpOwogICAgICAgICBkb3Vi bGUgZGVzaXJlZFNsZWVwID0gMS4wIC8gd3JpdGVzUGVyU2Vjb25kOwogICAgICAgICBpZiAod3Jp dGVEdXJhdGlvbiA8IGRlc2lyZWRTbGVlcCkKICAgICAgICAgICAgIHVzbGVlcChVU0VDX1BFUl9T RUMgKiAoZGVzaXJlZFNsZWVwIC0gd3JpdGVEdXJhdGlvbikpOwotICAgIH0KKyAgICAgICAgcmVz cG9uZFNsb3dseShjb25uZWN0aW9uLCBrYnBzKTsKKyAgICB9KTsKIH0KIAogc3RhdGljIFJldGFp blB0cjxEb3dubG9hZE1vbml0b3JUZXN0RGVsZWdhdGU+IG1vbml0b3JEZWxlZ2F0ZSgpCkBAIC05 MTAsOSArODk2LDE2IEBAIGVudW0gY2xhc3MgQXBwUmV0dXJuc1RvRm9yZWdyb3VuZCB7IE5vLCBZ ZXMgfTsKICAgICAKIHZvaWQgZG93bmxvYWRBdFJhdGUoZG91YmxlIGRlc2lyZWRLYnBzLCB1bnNp Z25lZCBzcGVlZE11bHRpcGxpZXIsIEFwcFJldHVybnNUb0ZvcmVncm91bmQgcmV0dXJuVG9Gb3Jl Z3JvdW5kID0gQXBwUmV0dXJuc1RvRm9yZWdyb3VuZDo6Tm8pCiB7Ci0gICAgYm9vbCB0ZXJtaW5h dGVTZXJ2ZXIgPSBmYWxzZTsKLSAgICBUQ1BTZXJ2ZXIgc2VydmVyKFsmXShpbnQgc29ja2V0KSB7 Ci0gICAgICAgIHJlc3BvbmRTbG93bHkoc29ja2V0LCBkZXNpcmVkS2JwcywgdGVybWluYXRlU2Vy dmVyKTsKKyAgICBIVFRQU2VydmVyIHNlcnZlcihbJl0oQ29ubmVjdGlvbiBjb25uZWN0aW9uKSB7 CisgICAgICAgIGNvbm5lY3Rpb24ucmVjZWl2ZUhUVFBSZXF1ZXN0KFs9XShWZWN0b3I8Y2hhcj4m JikgeworICAgICAgICAgICAgY29uc3QgY2hhciogcmVzcG9uc2VIZWFkZXIgPQorICAgICAgICAg ICAgIkhUVFAvMS4xIDIwMCBPS1xyXG4iCisgICAgICAgICAgICAiQ29udGVudC1EaXNwb3NpdGlv bjogYXR0YWNobWVudDsgZmlsZW5hbWU9XCJmaWxlbmFtZS5kYXRcIlxyXG4iCisgICAgICAgICAg ICAiQ29udGVudC1MZW5ndGg6IDEwMDAwMDAwMFxyXG5cclxuIjsKKyAgICAgICAgICAgIGNvbm5l Y3Rpb24uc2VuZChyZXNwb25zZUhlYWRlciwgWz1dIHsKKyAgICAgICAgICAgICAgICByZXNwb25k U2xvd2x5KGNvbm5lY3Rpb24sIGRlc2lyZWRLYnBzKTsKKyAgICAgICAgICAgIH0pOworICAgICAg ICB9KTsKICAgICB9KTsKICAgICAKICAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3V2l0aERvd25s b2FkTW9uaXRvclNwZWVkTXVsdGlwbGllcihzcGVlZE11bHRpcGxpZXIpOwpAQCAtOTI0LDcgKzkx Nyw2IEBAIHZvaWQgZG93bmxvYWRBdFJhdGUoZG91YmxlIGRlc2lyZWRLYnBzLCB1bnNpZ25lZCBz cGVlZE11bHRpcGxpZXIsIEFwcFJldHVybnNUb0ZvCiAgICAgaWYgKHJldHVyblRvRm9yZWdyb3Vu ZCA9PSBBcHBSZXR1cm5zVG9Gb3JlZ3JvdW5kOjpZZXMpCiAgICAgICAgIFtbd2ViVmlldyBjb25m aWd1cmF0aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF9zeW50aGVzaXplQXBwSXNCYWNrZ3JvdW5kOk5P XTsKICAgICBbbW9uaXRvckRlbGVnYXRlKCkgd2FpdEZvckRpZEZhaWxdOwotICAgIHRlcm1pbmF0 ZVNlcnZlciA9IHRydWU7CiAgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSByZW1v dmVJdGVtQXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpkZXN0aW5hdGlvbi5nZXQoKSBpc0Rp cmVjdG9yeTpOT10gZXJyb3I6bmlsXTsKIH0KIApAQCAtMTEyNiw2NCArMTExOCw1NiBAQCBURVNU KF9XS0Rvd25sb2FkLCBSZXN1bWVkRG93bmxvYWRDYW5IYW5kbGVBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSkKIHsKICAgICB1c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKIAotICAgIHN0ZDo6 YXRvbWljPGJvb2w+IHJlY2VpdmVkRmlyc3RDb25uZWN0aW9uIHsgZmFsc2UgfTsKLQotICAgIFRD UFNlcnZlciBzZXJ2ZXIoWyZdKGludCBzb2NrZXQpIHsKLSAgICAgICAgaWYgKCFyZWNlaXZlZEZp cnN0Q29ubmVjdGlvbi5leGNoYW5nZSh0cnVlKSkgewotICAgICAgICAgICAgVENQU2VydmVyOjpy ZWFkKHNvY2tldCk7Ci0KLSAgICAgICAgICAgIGNvbnN0IGNoYXIqIHJlc3BvbnNlSGVhZGVyID0K LSAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgotICAgICAgICAgICAgIkVUYWc6IHRl c3RcclxuIgotICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAxMDAwMFxyXG5cclxuIjsKLSAg ICAgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCByZXNwb25zZUhlYWRlciwgc3RybGVu KHJlc3BvbnNlSGVhZGVyKSk7Ci0KLSAgICAgICAgICAgIGNoYXIgZGF0YVs1MDAwXTsKLSAgICAg ICAgICAgIG1lbXNldChkYXRhLCAwLCA1MDAwKTsKLSAgICAgICAgICAgIFRDUFNlcnZlcjo6d3Jp dGUoc29ja2V0LCBkYXRhLCA1MDAwKTsKLQotICAgICAgICAgICAgLy8gV2FpdCBmb3IgdGhlIGNs aWVudCB0byBjYW5jZWwgdGhlIGRvd25sb2FkIGJlZm9yZSBjbG9zaW5nIHRoZSBjb25uZWN0aW9u LgotICAgICAgICAgICAgVXRpbDo6cnVuKCZpc0RvbmUpOwotICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIo W3JlY2VpdmVkRmlyc3RDb25uZWN0aW9uID0gZmFsc2VdIChDb25uZWN0aW9uIGNvbm5lY3Rpb24p IG11dGFibGUgeworICAgICAgICBpZiAoIXN0ZDo6ZXhjaGFuZ2UocmVjZWl2ZWRGaXJzdENvbm5l Y3Rpb24sIHRydWUpKSB7CisgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVz dChbPV0oVmVjdG9yPGNoYXI+JiYpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBjaGFyKiByZXNw b25zZUhlYWRlciA9CisgICAgICAgICAgICAgICAgIkhUVFAvMS4xIDIwMCBPS1xyXG4iCisgICAg ICAgICAgICAgICAgIkVUYWc6IHRlc3RcclxuIgorICAgICAgICAgICAgICAgICJDb250ZW50LUxl bmd0aDogMTAwMDBcclxuXHJcbiI7CisgICAgICAgICAgICAgICAgY29ubmVjdGlvbi5zZW5kKHJl c3BvbnNlSGVhZGVyLCBbPV0geworICAgICAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQo VmVjdG9yPHVpbnQ4X3Q+KDUwMDAsIDApKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgIH0pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGNvbm5lY3Rp b24ucmVjZWl2ZUhUVFBSZXF1ZXN0KFs9XShWZWN0b3I8Y2hhcj4mJikgewogICAgICAgICAgICAg Y29uc3QgY2hhciogY2hhbGxlbmdlSGVhZGVyID0KICAgICAgICAgICAgICJIVFRQLzEuMSA0MDEg VW5hdXRob3JpemVkXHJcbiIKICAgICAgICAgICAgICJEYXRlOiBTYXQsIDIzIE1hciAyMDE5IDA2 OjI5OjAxIEdNVFxyXG4iCiAgICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6IDBcclxuIgogICAg ICAgICAgICAgIldXVy1BdXRoZW50aWNhdGU6IEJhc2ljIHJlYWxtPVwidGVzdHJlYWxtXCJcclxu XHJcbiI7Ci0gICAgICAgICAgICBUQ1BTZXJ2ZXI6OndyaXRlKHNvY2tldCwgY2hhbGxlbmdlSGVh ZGVyLCBzdHJsZW4oY2hhbGxlbmdlSGVhZGVyKSk7Ci0KLSAgICAgICAgICAgIFRDUFNlcnZlcjo6 cmVhZChzb2NrZXQpOwotCi0gICAgICAgICAgICBjb25zdCBjaGFyKiByZXNwb25zZUhlYWRlciA9 Ci0gICAgICAgICAgICAiSFRUUC8xLjEgMjA2IFBhcnRpYWwgQ29udGVudFxyXG4iCi0gICAgICAg ICAgICAiRVRhZzogdGVzdFxyXG4iCi0gICAgICAgICAgICAiQ29udGVudC1SYW5nZTogYnl0ZXMg NTAwMC05OTk5LzEwMDAwXHJcbiIKLSAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogNTAwMFxy XG5cclxuIjsKLSAgICAgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0LCByZXNwb25zZUhl YWRlciwgc3RybGVuKHJlc3BvbnNlSGVhZGVyKSk7Ci0KLSAgICAgICAgICAgIGNoYXIgZGF0YVs1 MDAwXTsKLSAgICAgICAgICAgIG1lbXNldChkYXRhLCAxLCA1MDAwKTsKLSAgICAgICAgICAgIFRD UFNlcnZlcjo6d3JpdGUoc29ja2V0LCBkYXRhLCA1MDAwKTsKLSAgICAgICAgfQotICAgIH0sIDIp OworICAgICAgICAgICAgY29ubmVjdGlvbi5zZW5kKGNoYWxsZW5nZUhlYWRlciwgWz1dIHsKKyAg ICAgICAgICAgICAgICBjb25uZWN0aW9uLnJlY2VpdmVIVFRQUmVxdWVzdChbPV0oVmVjdG9yPGNo YXI+JiYpIHsKKyAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciogcmVzcG9uc2VIZWFkZXIg PQorICAgICAgICAgICAgICAgICAgICAiSFRUUC8xLjEgMjA2IFBhcnRpYWwgQ29udGVudFxyXG4i CisgICAgICAgICAgICAgICAgICAgICJFVGFnOiB0ZXN0XHJcbiIKKyAgICAgICAgICAgICAgICAg ICAgIkNvbnRlbnQtUmFuZ2U6IGJ5dGVzIDUwMDAtOTk5OS8xMDAwMFxyXG4iCisgICAgICAgICAg ICAgICAgICAgICJDb250ZW50LUxlbmd0aDogNTAwMFxyXG5cclxuIjsKKyAgICAgICAgICAgICAg ICAgICAgY29ubmVjdGlvbi5zZW5kKHJlc3BvbnNlSGVhZGVyLCBbPV0geworICAgICAgICAgICAg ICAgICAgICAgICAgY29ubmVjdGlvbi5zZW5kKFZlY3Rvcjx1aW50OF90Pig1MDAwLCAxKSk7Cisg ICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAg fSk7CisgICAgICAgIH0pOworICAgIH0pOwogCiAgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0 TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBpbml0XSk7Ci0gICAgYXV0byB3ZWJzaXRlRGF0YVN0 b3JlID0gYWRvcHROUyhbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdKTsKKyAg ICBhdXRvIHdlYnNpdGVEYXRhU3RvcmUgPSBbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRh U3RvcmVdOwogCiAgICAgYXV0byBkZWxlZ2F0ZTEgPSBhZG9wdE5TKFtbRG93bmxvYWRDYW5jZWxp bmdEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIFtwcm9jZXNzUG9vbCBfc2V0RG93bmxvYWRE ZWxlZ2F0ZTpkZWxlZ2F0ZTEuZ2V0KCldOwogCiAgICAgaXNEb25lID0gZmFsc2U7CiAgICAgTlNV UkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwg VVJMV2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImh0dHA6Ly8xMjcuMC4w LjE6JWQvIiwgc2VydmVyLnBvcnQoKV1dXTsKLSAgICBbcHJvY2Vzc1Bvb2wgX2Rvd25sb2FkVVJM UmVxdWVzdDpyZXF1ZXN0IHdlYnNpdGVEYXRhU3RvcmU6d2Vic2l0ZURhdGFTdG9yZS5nZXQoKSBv cmlnaW5hdGluZ1dlYlZpZXc6bmlsXTsKKyAgICBbcHJvY2Vzc1Bvb2wgX2Rvd25sb2FkVVJMUmVx dWVzdDpyZXF1ZXN0IHdlYnNpdGVEYXRhU3RvcmU6d2Vic2l0ZURhdGFTdG9yZSBvcmlnaW5hdGlu Z1dlYlZpZXc6bmlsXTsKIAogICAgIFV0aWw6OnJ1bigmaXNEb25lKTsKIAogICAgIGlzRG9uZSA9 IGZhbHNlOwogICAgIGF1dG8gZGVsZWdhdGUyID0gYWRvcHROUyhbW0F1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlSGFuZGxpbmdEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIFtwcm9jZXNzUG9vbCBf c2V0RG93bmxvYWREZWxlZ2F0ZTpkZWxlZ2F0ZTIuZ2V0KCldOwotICAgIFtwcm9jZXNzUG9vbCBf cmVzdW1lRG93bmxvYWRGcm9tRGF0YTpbZGVsZWdhdGUxIHJlc3VtZURhdGFdLmdldCgpIHdlYnNp dGVEYXRhU3RvcmU6d2Vic2l0ZURhdGFTdG9yZS5nZXQoKSBwYXRoOltkZWxlZ2F0ZTEgcGF0aF0u Z2V0KCkgb3JpZ2luYXRpbmdXZWJWaWV3Om5pbF07CisgICAgW3Byb2Nlc3NQb29sIF9yZXN1bWVE b3dubG9hZEZyb21EYXRhOltkZWxlZ2F0ZTEgcmVzdW1lRGF0YV0uZ2V0KCkgd2Vic2l0ZURhdGFT dG9yZTp3ZWJzaXRlRGF0YVN0b3JlIHBhdGg6W2RlbGVnYXRlMSBwYXRoXS5nZXQoKSBvcmlnaW5h dGluZ1dlYlZpZXc6bmlsXTsKIAogICAgIFV0aWw6OnJ1bigmaXNEb25lKTsKIH0KQEAgLTI2MzUs NSArMjYxOSwzIEBAIFRFU1QoV0tEb3dubG9hZCwgU3ViZnJhbWVPcmlnaW5hdG9yKQogfQogCiB9 Ci0KLSNlbmRpZiAvLyBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbQppbmRleCBiYzNhMjk0NjBkOWRlNjdjYTk5MDIyOGUw NTExMDJiZWVjOWQxNDQwLi5kNzIwYmE2NGRiNDMwNjliZjczNWIzMDViZGUzMGY0NGU3N2U5MjBl IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCkBAIC0zMjEsNyArMzIx LDYgQEAgdm9pZCBDb25uZWN0aW9uOjpzZW5kKFZlY3Rvcjx1aW50OF90PiYmIG1lc3NhZ2UsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb20KIHZvaWQgQ29ubmVjdGlvbjo6c2VuZChSZXRh aW5QdHI8ZGlzcGF0Y2hfZGF0YV90PiYmIG1lc3NhZ2UsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo KT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QKIHsKICAgICBud19jb25uZWN0aW9uX3NlbmQo bV9jb25uZWN0aW9uLmdldCgpLCBtZXNzYWdlLmdldCgpLCBOV19DT05ORUNUSU9OX0RFRkFVTFRf TUVTU0FHRV9DT05URVhULCB0cnVlLCBtYWtlQmxvY2tQdHIoW2NvbXBsZXRpb25IYW5kbGVyID0g V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKG53X2Vycm9yX3QgZXJyb3IpIG11dGFibGUgewot ICAgICAgICBBU1NFUlQoIWVycm9yKTsKICAgICAgICAgaWYgKGNvbXBsZXRpb25IYW5kbGVyKQog ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKICAgICB9KS5nZXQoKSk7Cg== 439660 2021-09-29 14:31:03 -0700 2021-09-29 16:02:52 -0700 Patch bug-230980-20210929143102.patch text/plain 9810 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjMxNDZkZjk3ZjE1NDIxYTRlNzNkMzBhZTkwNmMwYzMx MDljZTk5NS4uOWNhNzcyY2U0ZjA4MmViYmRlMmVmZmU2ZTE4ZGNiNTg1NmRjZmQ4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTA5LTI5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgTWlncmF0ZSBfV0tEb3dubG9hZCB0ZXN0cyBmcm9tIFRDUFNlcnZlciB0 byBIVFRQU2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzA5ODAKKyAgICAgICAgPHJkYXI6Ly84MjEwMDg3OD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZm9ybWVyIGlzIHZlcnkgcGlja3kg d2hlbiBpdCBjb21lcyB0byBudW1iZXJzIG9mIFRDUCBjb25uZWN0aW9ucywgYW5kIGNhdXNlcyB0 ZXN0cyB0byB0aW1lIG91dCB3aGVuCisgICAgICAgIHRoZSBudW1iZXIgb2YgY29ubmVjdGlvbnMg Y2hhbmdlcy4gIFRoZSBsYXR0ZXIgaXMgbW9yZSBmb3JnaXZpbmcgYW5kIHJ1bnMgY29kZSBvbiB0 aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0Rvd25sb2FkLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6cmVzcG9uZFNsb3dseSk6 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpkb3dubG9hZEF0UmF0ZSk6CisgICAgICAgIChURVNU KToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW06CisgICAgICAg IChUZXN0V2ViS2l0QVBJOjpDb25uZWN0aW9uOjpzZW5kIGNvbnN0KToKKwogMjAyMS0wOS0yOSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgV1BUIGltcG9ydGVy IHNob3VsZCBjcmVhdGUgc2VydmljZXdvcmtlciB0ZW1wbGF0ZSBmb3IgdGVtcGxhdGVkIHRlc3Qg dGhhdCBoYXZlIHdvcmtlciBhcyBnbG9iYWwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvRG93bmxvYWQubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0Rvd25sb2FkLm1tCmluZGV4IDAyZmJjYmQxZGEwYjdjYWY4NmQ3YWY0 ZmQ2MmY2MWYzZDU2MDcwYzQuLmJmZjAzNGExYzhkYTMzODg5MWY5ZjFhYTdjZTQ3MjM1M2U5Mjk3 N2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRG93 bmxvYWQubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb3du bG9hZC5tbQpAQCAtMjYsMTEgKzI2LDggQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCA8 V2ViS2l0L1dLRm91bmRhdGlvbi5oPgogCi0jaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJ T1MpCi0KICNpbXBvcnQgIkhUVFBTZXJ2ZXIuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVz LmgiCi0jaW1wb3J0ICJUQ1BTZXJ2ZXIuaCIKICNpbXBvcnQgIlRlc3QuaCIKICNpbXBvcnQgIlRl c3REb3dubG9hZERlbGVnYXRlLmgiCiAjaW1wb3J0ICJUZXN0TGVnYWN5RG93bmxvYWREZWxlZ2F0 ZS5oIgpAQCAtODU4LDMxICs4NTUsMjAgQEAgc3RhdGljIFJldGFpblB0cjxOU1N0cmluZz4gZGVz dGluYXRpb247CiAKIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKIAotdm9pZCByZXNwb25kU2xv d2x5KGludCBzb2NrZXQsIGRvdWJsZSBrYnBzLCBib29sJiB0ZXJtaW5hdGVTZXJ2ZXIpCit2b2lk IHJlc3BvbmRTbG93bHkoY29uc3QgQ29ubmVjdGlvbiYgY29ubmVjdGlvbiwgZG91YmxlIGticHMp CiB7Ci0gICAgRVhQRUNUX0ZBTFNFKGlzTWFpblRocmVhZCgpKTsKLSAgICBjaGFyIHJlYWRCdWZm ZXJbMTAwMF07Ci0gICAgYXV0byBieXRlc1JlYWQgPSA6OnJlYWQoc29ja2V0LCByZWFkQnVmZmVy LCBzaXplb2YocmVhZEJ1ZmZlcikpOwotICAgIEVYUEVDVF9HVChieXRlc1JlYWQsIDApOwotICAg IEVYUEVDVF9UUlVFKHN0YXRpY19jYXN0PHNpemVfdD4oYnl0ZXNSZWFkKSA8IHNpemVvZihyZWFk QnVmZmVyKSk7Ci0gICAgCi0gICAgY29uc3QgY2hhciogcmVzcG9uc2VIZWFkZXIgPQotICAgICJI VFRQLzEuMSAyMDAgT0tcclxuIgotICAgICJDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50 OyBmaWxlbmFtZT1cImZpbGVuYW1lLmRhdFwiXHJcbiIKLSAgICAiQ29udGVudC1MZW5ndGg6IDEw MDAwMDAwMFxyXG5cclxuIjsKLSAgICBhdXRvIGJ5dGVzV3JpdHRlbiA9IDo6d3JpdGUoc29ja2V0 LCByZXNwb25zZUhlYWRlciwgc3RybGVuKHJlc3BvbnNlSGVhZGVyKSk7Ci0gICAgRVhQRUNUX0VR KHN0YXRpY19jYXN0PHNpemVfdD4oYnl0ZXNXcml0dGVuKSwgc3RybGVuKHJlc3BvbnNlSGVhZGVy KSk7Ci0gICAgCisgICAgRVhQRUNUX1RSVUUoaXNNYWluVGhyZWFkKCkpOworCiAgICAgY29uc3Qg ZG91YmxlIHdyaXRlc1BlclNlY29uZCA9IDEwMDsKLSAgICBWZWN0b3I8Y2hhcj4gd3JpdGVCdWZm ZXIoc3RhdGljX2Nhc3Q8c2l6ZV90PigxMDI0ICoga2JwcyAvIHdyaXRlc1BlclNlY29uZCkpOwot ICAgIHdoaWxlICghdGVybWluYXRlU2VydmVyKSB7Ci0gICAgICAgIGF1dG8gYmVmb3JlID0gTW9u b3RvbmljVGltZTo6bm93KCk7Ci0gICAgICAgIDo6d3JpdGUoc29ja2V0LCB3cml0ZUJ1ZmZlci5k YXRhKCksIHdyaXRlQnVmZmVyLnNpemUoKSk7CisgICAgVmVjdG9yPHVpbnQ4X3Q+IHdyaXRlQnVm ZmVyKHN0YXRpY19jYXN0PHNpemVfdD4oMTAyNCAqIGticHMgLyB3cml0ZXNQZXJTZWNvbmQpKTsK KyAgICBhdXRvIGJlZm9yZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworICAgIGNvbm5lY3Rpb24u c2VuZChXVEZNb3ZlKHdyaXRlQnVmZmVyKSwgWz1dIHsKICAgICAgICAgZG91YmxlIHdyaXRlRHVy YXRpb24gPSAoTW9ub3RvbmljVGltZTo6bm93KCkgLSBiZWZvcmUpLnNlY29uZHMoKTsKICAgICAg ICAgZG91YmxlIGRlc2lyZWRTbGVlcCA9IDEuMCAvIHdyaXRlc1BlclNlY29uZDsKICAgICAgICAg aWYgKHdyaXRlRHVyYXRpb24gPCBkZXNpcmVkU2xlZXApCiAgICAgICAgICAgICB1c2xlZXAoVVNF Q19QRVJfU0VDICogKGRlc2lyZWRTbGVlcCAtIHdyaXRlRHVyYXRpb24pKTsKLSAgICB9CisgICAg ICAgIHJlc3BvbmRTbG93bHkoY29ubmVjdGlvbiwga2Jwcyk7CisgICAgfSk7CiB9CiAKIHN0YXRp YyBSZXRhaW5QdHI8RG93bmxvYWRNb25pdG9yVGVzdERlbGVnYXRlPiBtb25pdG9yRGVsZWdhdGUo KQpAQCAtOTEwLDkgKzg5NiwxNiBAQCBlbnVtIGNsYXNzIEFwcFJldHVybnNUb0ZvcmVncm91bmQg eyBObywgWWVzIH07CiAgICAgCiB2b2lkIGRvd25sb2FkQXRSYXRlKGRvdWJsZSBkZXNpcmVkS2Jw cywgdW5zaWduZWQgc3BlZWRNdWx0aXBsaWVyLCBBcHBSZXR1cm5zVG9Gb3JlZ3JvdW5kIHJldHVy blRvRm9yZWdyb3VuZCA9IEFwcFJldHVybnNUb0ZvcmVncm91bmQ6Ok5vKQogewotICAgIGJvb2wg dGVybWluYXRlU2VydmVyID0gZmFsc2U7Ci0gICAgVENQU2VydmVyIHNlcnZlcihbJl0oaW50IHNv Y2tldCkgewotICAgICAgICByZXNwb25kU2xvd2x5KHNvY2tldCwgZGVzaXJlZEticHMsIHRlcm1p bmF0ZVNlcnZlcik7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoWz1dKGNvbnN0IENvbm5lY3Rpb24m IGNvbm5lY3Rpb24pIHsKKyAgICAgICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVlc3QoWz1d KFZlY3RvcjxjaGFyPiYmKSB7CisgICAgICAgICAgICBjb25zdCBjaGFyKiByZXNwb25zZUhlYWRl ciA9CisgICAgICAgICAgICAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgICAgICJDb250 ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50OyBmaWxlbmFtZT1cImZpbGVuYW1lLmRhdFwiXHJc biIKKyAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogMTAwMDAwMDAwXHJcblxyXG4iOworICAg ICAgICAgICAgY29ubmVjdGlvbi5zZW5kKHJlc3BvbnNlSGVhZGVyLCBbPV0geworICAgICAgICAg ICAgICAgIHJlc3BvbmRTbG93bHkoY29ubmVjdGlvbiwgZGVzaXJlZEticHMpOworICAgICAgICAg ICAgfSk7CisgICAgICAgIH0pOwogICAgIH0pOwogICAgIAogICAgIGF1dG8gd2ViVmlldyA9IHdl YlZpZXdXaXRoRG93bmxvYWRNb25pdG9yU3BlZWRNdWx0aXBsaWVyKHNwZWVkTXVsdGlwbGllcik7 CkBAIC05MjQsNyArOTE3LDYgQEAgdm9pZCBkb3dubG9hZEF0UmF0ZShkb3VibGUgZGVzaXJlZEti cHMsIHVuc2lnbmVkIHNwZWVkTXVsdGlwbGllciwgQXBwUmV0dXJuc1RvRm8KICAgICBpZiAocmV0 dXJuVG9Gb3JlZ3JvdW5kID09IEFwcFJldHVybnNUb0ZvcmVncm91bmQ6OlllcykKICAgICAgICAg W1t3ZWJWaWV3IGNvbmZpZ3VyYXRpb25dLndlYnNpdGVEYXRhU3RvcmUgX3N5bnRoZXNpemVBcHBJ c0JhY2tncm91bmQ6Tk9dOwogICAgIFttb25pdG9yRGVsZWdhdGUoKSB3YWl0Rm9yRGlkRmFpbF07 Ci0gICAgdGVybWluYXRlU2VydmVyID0gdHJ1ZTsKICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVs dE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOmRlc3RpbmF0 aW9uLmdldCgpIGlzRGlyZWN0b3J5Ok5PXSBlcnJvcjpuaWxdOwogfQogCkBAIC0xMTI2LDY0ICsx MTE4LDU2IEBAIFRFU1QoX1dLRG93bmxvYWQsIFJlc3VtZWREb3dubG9hZENhbkhhbmRsZUF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlKQogewogICAgIHVzaW5nIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJ OwogCi0gICAgc3RkOjphdG9taWM8Ym9vbD4gcmVjZWl2ZWRGaXJzdENvbm5lY3Rpb24geyBmYWxz ZSB9OwotCi0gICAgVENQU2VydmVyIHNlcnZlcihbJl0oaW50IHNvY2tldCkgewotICAgICAgICBp ZiAoIXJlY2VpdmVkRmlyc3RDb25uZWN0aW9uLmV4Y2hhbmdlKHRydWUpKSB7Ci0gICAgICAgICAg ICBUQ1BTZXJ2ZXI6OnJlYWQoc29ja2V0KTsKLQotICAgICAgICAgICAgY29uc3QgY2hhciogcmVz cG9uc2VIZWFkZXIgPQotICAgICAgICAgICAgIkhUVFAvMS4xIDIwMCBPS1xyXG4iCi0gICAgICAg ICAgICAiRVRhZzogdGVzdFxyXG4iCi0gICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6IDEwMDAw XHJcblxyXG4iOwotICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2NrZXQsIHJlc3BvbnNl SGVhZGVyLCBzdHJsZW4ocmVzcG9uc2VIZWFkZXIpKTsKLQotICAgICAgICAgICAgY2hhciBkYXRh WzUwMDBdOwotICAgICAgICAgICAgbWVtc2V0KGRhdGEsIDAsIDUwMDApOwotICAgICAgICAgICAg VENQU2VydmVyOjp3cml0ZShzb2NrZXQsIGRhdGEsIDUwMDApOwotCi0gICAgICAgICAgICAvLyBX YWl0IGZvciB0aGUgY2xpZW50IHRvIGNhbmNlbCB0aGUgZG93bmxvYWQgYmVmb3JlIGNsb3Npbmcg dGhlIGNvbm5lY3Rpb24uCi0gICAgICAgICAgICBVdGlsOjpydW4oJmlzRG9uZSk7Ci0gICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBUQ1BTZXJ2ZXI6OnJlYWQoc29ja2V0KTsKKyAgICBIVFRQ U2VydmVyIHNlcnZlcihbcmVjZWl2ZWRGaXJzdENvbm5lY3Rpb24gPSBmYWxzZV0gKENvbm5lY3Rp b24gY29ubmVjdGlvbikgbXV0YWJsZSB7CisgICAgICAgIGlmICghc3RkOjpleGNoYW5nZShyZWNl aXZlZEZpcnN0Q29ubmVjdGlvbiwgdHJ1ZSkpIHsKKyAgICAgICAgICAgIGNvbm5lY3Rpb24ucmVj ZWl2ZUhUVFBSZXF1ZXN0KFs9XShWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICAgICAgICAgIGNv bnN0IGNoYXIqIHJlc3BvbnNlSGVhZGVyID0KKyAgICAgICAgICAgICAgICAiSFRUUC8xLjEgMjAw IE9LXHJcbiIKKyAgICAgICAgICAgICAgICAiRVRhZzogdGVzdFxyXG4iCisgICAgICAgICAgICAg ICAgIkNvbnRlbnQtTGVuZ3RoOiAxMDAwMFxyXG5cclxuIjsKKyAgICAgICAgICAgICAgICBjb25u ZWN0aW9uLnNlbmQocmVzcG9uc2VIZWFkZXIsIFs9XSB7CisgICAgICAgICAgICAgICAgICAgIGNv bm5lY3Rpb24uc2VuZChWZWN0b3I8dWludDhfdD4oNTAwMCwgMCkpOworICAgICAgICAgICAgICAg IH0pOworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgY29ubmVjdGlvbi5yZWNlaXZlSFRUUFJlcXVlc3QoWz1dKFZlY3RvcjxjaGFyPiYmKSB7 CiAgICAgICAgICAgICBjb25zdCBjaGFyKiBjaGFsbGVuZ2VIZWFkZXIgPQogICAgICAgICAgICAg IkhUVFAvMS4xIDQwMSBVbmF1dGhvcml6ZWRcclxuIgogICAgICAgICAgICAgIkRhdGU6IFNhdCwg MjMgTWFyIDIwMTkgMDY6Mjk6MDEgR01UXHJcbiIKICAgICAgICAgICAgICJDb250ZW50LUxlbmd0 aDogMFxyXG4iCiAgICAgICAgICAgICAiV1dXLUF1dGhlbnRpY2F0ZTogQmFzaWMgcmVhbG09XCJ0 ZXN0cmVhbG1cIlxyXG5cclxuIjsKLSAgICAgICAgICAgIFRDUFNlcnZlcjo6d3JpdGUoc29ja2V0 LCBjaGFsbGVuZ2VIZWFkZXIsIHN0cmxlbihjaGFsbGVuZ2VIZWFkZXIpKTsKLQotICAgICAgICAg ICAgVENQU2VydmVyOjpyZWFkKHNvY2tldCk7Ci0KLSAgICAgICAgICAgIGNvbnN0IGNoYXIqIHJl c3BvbnNlSGVhZGVyID0KLSAgICAgICAgICAgICJIVFRQLzEuMSAyMDYgUGFydGlhbCBDb250ZW50 XHJcbiIKLSAgICAgICAgICAgICJFVGFnOiB0ZXN0XHJcbiIKLSAgICAgICAgICAgICJDb250ZW50 LVJhbmdlOiBieXRlcyA1MDAwLTk5OTkvMTAwMDBcclxuIgotICAgICAgICAgICAgIkNvbnRlbnQt TGVuZ3RoOiA1MDAwXHJcblxyXG4iOwotICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2Nr ZXQsIHJlc3BvbnNlSGVhZGVyLCBzdHJsZW4ocmVzcG9uc2VIZWFkZXIpKTsKLQotICAgICAgICAg ICAgY2hhciBkYXRhWzUwMDBdOwotICAgICAgICAgICAgbWVtc2V0KGRhdGEsIDEsIDUwMDApOwot ICAgICAgICAgICAgVENQU2VydmVyOjp3cml0ZShzb2NrZXQsIGRhdGEsIDUwMDApOwotICAgICAg ICB9Ci0gICAgfSwgMik7CisgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQoY2hhbGxlbmdlSGVh ZGVyLCBbPV0geworICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24ucmVjZWl2ZUhUVFBSZXF1ZXN0 KFs9XShWZWN0b3I8Y2hhcj4mJikgeworICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyKiBy ZXNwb25zZUhlYWRlciA9CisgICAgICAgICAgICAgICAgICAgICJIVFRQLzEuMSAyMDYgUGFydGlh bCBDb250ZW50XHJcbiIKKyAgICAgICAgICAgICAgICAgICAgIkVUYWc6IHRlc3RcclxuIgorICAg ICAgICAgICAgICAgICAgICAiQ29udGVudC1SYW5nZTogYnl0ZXMgNTAwMC05OTk5LzEwMDAwXHJc biIKKyAgICAgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiA1MDAwXHJcblxyXG4iOwor ICAgICAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQocmVzcG9uc2VIZWFkZXIsIFs9XSB7 CisgICAgICAgICAgICAgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQoVmVjdG9yPHVpbnQ4X3Q+ KDUwMDAsIDEpKTsKKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgfSk7 CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CisgICAgfSk7CiAKICAgICBhdXRvIHByb2Nl c3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIGluaXRdKTsKLSAgICBhdXRv IHdlYnNpdGVEYXRhU3RvcmUgPSBhZG9wdE5TKFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERh dGFTdG9yZV0pOworICAgIGF1dG8gd2Vic2l0ZURhdGFTdG9yZSA9IFtXS1dlYnNpdGVEYXRhU3Rv cmUgZGVmYXVsdERhdGFTdG9yZV07CiAKICAgICBhdXRvIGRlbGVnYXRlMSA9IGFkb3B0TlMoW1tE b3dubG9hZENhbmNlbGluZ0RlbGVnYXRlIGFsbG9jXSBpbml0XSk7CiAgICAgW3Byb2Nlc3NQb29s IF9zZXREb3dubG9hZERlbGVnYXRlOmRlbGVnYXRlMS5nZXQoKV07CiAKICAgICBpc0RvbmUgPSBm YWxzZTsKICAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RX aXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAi aHR0cDovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1dOwotICAgIFtwcm9jZXNzUG9v bCBfZG93bmxvYWRVUkxSZXF1ZXN0OnJlcXVlc3Qgd2Vic2l0ZURhdGFTdG9yZTp3ZWJzaXRlRGF0 YVN0b3JlLmdldCgpIG9yaWdpbmF0aW5nV2ViVmlldzpuaWxdOworICAgIFtwcm9jZXNzUG9vbCBf ZG93bmxvYWRVUkxSZXF1ZXN0OnJlcXVlc3Qgd2Vic2l0ZURhdGFTdG9yZTp3ZWJzaXRlRGF0YVN0 b3JlIG9yaWdpbmF0aW5nV2ViVmlldzpuaWxdOwogCiAgICAgVXRpbDo6cnVuKCZpc0RvbmUpOwog CiAgICAgaXNEb25lID0gZmFsc2U7CiAgICAgYXV0byBkZWxlZ2F0ZTIgPSBhZG9wdE5TKFtbQXV0 aGVudGljYXRpb25DaGFsbGVuZ2VIYW5kbGluZ0RlbGVnYXRlIGFsbG9jXSBpbml0XSk7CiAgICAg W3Byb2Nlc3NQb29sIF9zZXREb3dubG9hZERlbGVnYXRlOmRlbGVnYXRlMi5nZXQoKV07Ci0gICAg W3Byb2Nlc3NQb29sIF9yZXN1bWVEb3dubG9hZEZyb21EYXRhOltkZWxlZ2F0ZTEgcmVzdW1lRGF0 YV0uZ2V0KCkgd2Vic2l0ZURhdGFTdG9yZTp3ZWJzaXRlRGF0YVN0b3JlLmdldCgpIHBhdGg6W2Rl bGVnYXRlMSBwYXRoXS5nZXQoKSBvcmlnaW5hdGluZ1dlYlZpZXc6bmlsXTsKKyAgICBbcHJvY2Vz c1Bvb2wgX3Jlc3VtZURvd25sb2FkRnJvbURhdGE6W2RlbGVnYXRlMSByZXN1bWVEYXRhXS5nZXQo KSB3ZWJzaXRlRGF0YVN0b3JlOndlYnNpdGVEYXRhU3RvcmUgcGF0aDpbZGVsZWdhdGUxIHBhdGhd LmdldCgpIG9yaWdpbmF0aW5nV2ViVmlldzpuaWxdOwogCiAgICAgVXRpbDo6cnVuKCZpc0RvbmUp OwogfQpAQCAtMjYzNSw1ICsyNjE5LDMgQEAgVEVTVChXS0Rvd25sb2FkLCBTdWJmcmFtZU9yaWdp bmF0b3IpCiB9CiAKIH0KLQotI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9T KQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCmluZGV4IGJjM2EyOTQ2MGQ5 ZGU2N2NhOTkwMjI4ZTA1MTEwMmJlZWM5ZDE0NDAuLmQ3MjBiYTY0ZGI0MzA2OWJmNzM1YjMwNWJk ZTMwZjQ0ZTc3ZTkyMGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRU UFNlcnZlci5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0K QEAgLTMyMSw3ICszMjEsNiBAQCB2b2lkIENvbm5lY3Rpb246OnNlbmQoVmVjdG9yPHVpbnQ4X3Q+ JiYgbWVzc2FnZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbQogdm9pZCBDb25uZWN0 aW9uOjpzZW5kKFJldGFpblB0cjxkaXNwYXRjaF9kYXRhX3Q+JiYgbWVzc2FnZSwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSBjb25zdAogewogICAgIG53X2Nv bm5lY3Rpb25fc2VuZChtX2Nvbm5lY3Rpb24uZ2V0KCksIG1lc3NhZ2UuZ2V0KCksIE5XX0NPTk5F Q1RJT05fREVGQVVMVF9NRVNTQUdFX0NPTlRFWFQsIHRydWUsIG1ha2VCbG9ja1B0cihbY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0obndfZXJyb3JfdCBlcnJv cikgbXV0YWJsZSB7Ci0gICAgICAgIEFTU0VSVCghZXJyb3IpOwogICAgICAgICBpZiAoY29tcGxl dGlvbkhhbmRsZXIpCiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogICAgIH0pLmdl dCgpKTsK