232404 2021-10-27 14:33:27 -0700 [Tools] Enable -Wformat=2 warnings 2021-10-28 08:12:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ddkilzer ddkilzer bfulgham darin webkit-bug-importer oldest_to_newest 1809431 0 ddkilzer 2021-10-27 14:33:27 -0700 Enable -Wformat=2 warnings on projects in the Tools folder. In practice, only TestWebKitAPI required any changes after adding this warning flag. 1809432 1 webkit-bug-importer 2021-10-27 14:33:48 -0700 <rdar://problem/84728058> 1809456 2 442638 ddkilzer 2021-10-27 15:26:25 -0700 Created attachment 442638 Patch v1 1809459 3 442638 darin 2021-10-27 15:34:59 -0700 Comment on attachment 442638 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=442638&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm:174 > + NSString *const html = @"<script>var xhr = new XMLHttpRequest(); xhr.open('GET', 'http://127.0.0.1:%d/', true); xhr.send();</script>"; I suggest you use constexpr instead. One nice thing about that is that then it can be at the beginning of the line. > Tools/TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm:239 > + NSString *const windowOpenFormatString = @"window.open(\"about:blank\", \"_blank\", \"%@\")"; Ditto. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerTCPServer.h:83 > + NSString *const format = @"HTTP/1.1 200 OK\r\n" Ditto. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerTCPServer.h:95 > + NSURLRequest *requestWithURLString(NSString *url) { return [NSURLRequest requestWithURL:[NSURL URLWithString:url]]; } I would name this argument "string", not "url". > Tools/TestWebKitAPI/cocoa/HTTPServer.mm:368 > + return [NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%s://127.0.0.1:%d%s", scheme, port(), path.utf8().data()]]]; No good reason to convert to a UTF8 string just to format. Can use %@ and use path.createCFString().get() instead. 1809493 4 442638 ddkilzer 2021-10-27 16:58:21 -0700 Comment on attachment 442638 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=442638&action=review >> Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerTCPServer.h:95 >> + NSURLRequest *requestWithURLString(NSString *url) { return [NSURLRequest requestWithURL:[NSURL URLWithString:url]]; } > > I would name this argument "string", not "url". Changed `url` to `urlString`, and will make the other changes as suggested. Thanks! 1809494 5 442652 ddkilzer 2021-10-27 16:59:35 -0700 Created attachment 442652 Patch for landing 1809671 6 ews-feeder 2021-10-28 08:12:15 -0700 Committed r284977 (243625@main): <https://commits.webkit.org/243625@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442652. 442638 2021-10-27 15:26:25 -0700 2021-10-27 15:34:59 -0700 Patch v1 bug-232404-20211027152624.patch text/plain 14755 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Nzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjg3MWQ3NTAyMGEyY2Q2NmVmYTJkM2I1ZDNkODdlOGJj MzQ5MzcxNi4uYmU3N2FkODliNzAzNzU4NjNhOGYzOGZkZTE5ZGYyZDM2YzhmODI3ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1 IEBACisyMDIxLTEwLTI3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgW1Rvb2xzXSBFbmFibGUgLVdmb3JtYXQ9MiB3YXJuaW5ncworICAgICAgICA8aHR0cHM6 Ly93ZWJraXQub3JnL2IvMjMyNDA0PgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ3MjgwNTg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZzoKKyAgICAgICAgKFdB Uk5JTkdTX0NGTEFHUyk6CisgICAgICAgICogSW1hZ2VEaWZmL2NnL0NvbmZpZ3VyYXRpb25zL0Jh c2UueGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxBR1MpOgorICAgICAgICAqIE1pbmlC cm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19D RkxBR1MpOgorICAgICAgICAqIE1vYmlsZU1pbmlCcm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxBR1MpOgorICAgICAgICAqIFRlc3RXZWJL aXRBUEkvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZzoKKyAgICAgICAgKFdBUk5JTkdTX0NG TEFHUyk6CisgICAgICAgIC0gQWRkIC1XZm9ybWF0PTIgc3dpdGNoLCB3aGljaCBpbmNsdWRlcyAt V2Zvcm1hdC1ub25saXRlcmFsLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVV0 aWxpdGllcy5oOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VXRpbDo6d2FpdEZvckNvbmRpdGlv bldpdGhMb2dnaW5nKToKKyAgICAgICAgLSBBZGQgTlNfRk9STUFUX0ZVTkNUSU9OKCkgYXR0cmli dXRlLgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVy bmF0ZUhUTUxTdHJpbmcubW06CisgICAgICAgIChURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL09wZW5BbmRDbG9zZVdpbmRvdy5tbToKKyAgICAgICAgKFRF U1QpOgorICAgICAgICAtIENoYW5nZSB0eXBlIG9mIGZvcm1hdCBzdHJpbmcgdG8gYE5TU3RyaW5n ICpjb25zdGAuCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2 aWNlV29ya2VyVENQU2VydmVyLmg6CisgICAgICAgIChTZXJ2aWNlV29ya2VyVENQU2VydmVyOjpy ZXF1ZXN0KToKKyAgICAgICAgKFNlcnZpY2VXb3JrZXJUQ1BTZXJ2ZXI6OnJlcXVlc3RXaXRoTG9j YWxob3N0KToKKyAgICAgICAgKFNlcnZpY2VXb3JrZXJUQ1BTZXJ2ZXI6OnJlcXVlc3RXaXRoRnJh Z21lbnQpOgorICAgICAgICAtIENhbGwgLVtOU1N0cmluZyBpbml0V2l0aEZvcm1hdDpdIGluIGVh Y2ggbWV0aG9kIHNvIHRoZSBmb3JtYXQKKyAgICAgICAgICBzdHJpbmcgaXMgdXNlZCBkaXJlY3Rs eSBpbiB0aGUgbWV0aG9kIGNhbGwuCisgICAgICAgIChTZXJ2aWNlV29ya2VyVENQU2VydmVyOjpy ZXNwb25kVG9SZXF1ZXN0cyk6CisgICAgICAgIC0gQ2hhbmdlIHR5cGUgb2YgZm9ybWF0IHN0cmlu ZyB0byBgTlNTdHJpbmcgKmNvbnN0YCwgYW5kIGZpeAorICAgICAgICAgIHBsYWNlaG9sZGVyIGZv ciBzdHJsZW4oKSByZXR1cm4gdmFsdWUuCisgICAgICAgIChTZXJ2aWNlV29ya2VyVENQU2VydmVy OjpyZXF1ZXN0V2l0aEZvcm1hdCk6IERlbGV0ZS4KKyAgICAgICAgKFNlcnZpY2VXb3JrZXJUQ1BT ZXJ2ZXI6OnJlcXVlc3RXaXRoVVJMU3RyaW5nKToKKyAgICAgICAgLSBSZW5hbWUgZnJvbSByZXF1 ZXN0V2l0aEZvcm1hdCgpIGFuZCB0YWtlIGEgYHVybGAgcGFyYW1ldGVyCisgICAgICAgICAgaW5z dGVhZCBvZiBhIGBmb3JtYXRgIHBhcmFtZXRlci4KKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2Nv Y29hL0hUVFBTZXJ2ZXIubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyOjpy ZXF1ZXN0IGNvbnN0KToKKyAgICAgICAgLSBDaGFuZ2Ugc3dpdGNoIHN0YXRlbWVudCB0byBzZXQg dGhlIHNjaGVtZSBmb3IgdGhlIFVSTCwgYW5kCisgICAgICAgICAgbW92ZSB0aGUgZm9ybWF0IHN0 cmluZyBpbnRvICtbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpdLgorCisgICAgICAgICogV2Vi RWRpdGluZ1Rlc3Rlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnOgorICAgICAgICAoV0FS TklOR1NfQ0ZMQUdTKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25z L0Jhc2UueGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxBR1MpOgorICAgICAgICAtIEFk ZCAtV2Zvcm1hdD0yIHN3aXRjaCwgd2hpY2ggaW5jbHVkZXMgLVdmb3JtYXQtbm9ubGl0ZXJhbC4K KwogMjAyMS0xMC0yNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OIChyMjg0MDc5KTogQXVkaW8gY29udGludWVzIHBsYXlpbmcgb24g aHVsdS5jb20gaW4gcHJpdmF0ZSBicm93c2luZyBtb2RlIGFmdGVyIGNsb3NpbmcgdGhlIHRhYgpk aWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWcgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54 Y2NvbmZpZwppbmRleCA1MzJkYThjNjAyNWNjYTRjYjllY2YxYjdiZjBlNGQzMzI2OGE4NjIyLi5i NDQ2OTg1ZDkxMjIzZDY2NmM2N2E0MDNiNTgxNzVjODA3YzUyMWQwIDEwMDY0NAotLS0gYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZworKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAt ODMsNyArODMsNyBAQCBDTEFOR19BTkFMWVpFUl9MT0NBTElaQUJJTElUWV9OT05MT0NBTElaRUQg PSBZRVM7CiAvLyBGSVhNRTogPGh0dHA6Ly93ZWJraXQub3JnL2IvMTE4NTkwPiBEdW1wUmVuZGVy VHJlZSBzaG91bGQgYnVpbGQgd2l0aCAtV3Nob3J0ZW4tNjQtdG8tMzIKIEdDQ19XQVJOXzY0X1RP XzMyX0JJVF9DT05WRVJTSU9OW2FyY2g9YXJtNjQqXSA9IE5POwogR0NDX1dBUk5fNjRfVE9fMzJf QklUX0NPTlZFUlNJT05bYXJjaD14ODZfNjRdID0gTk87Ci1XQVJOSU5HX0NGTEFHUyA9IC1XYWxs IC1XIC1XY29uZGl0aW9uYWwtdW5pbml0aWFsaXplZCAtV25vLXVudXNlZC1wYXJhbWV0ZXIgLVd1 bmRlZjsKK1dBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdjb25kaXRpb25hbC11bmluaXRpYWxp emVkIC1XZm9ybWF0PTIgLVduby11bnVzZWQtcGFyYW1ldGVyIC1XdW5kZWY7CiAKIERFQlVHX0RF RklORVMgPSBOREVCVUc7CiBERUJVR19ERUZJTkVTW2NvbmZpZz1EZWJ1Z10gPSA7CmRpZmYgLS1n aXQgYS9Ub29scy9JbWFnZURpZmYvY2cvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZyBiL1Rv b2xzL0ltYWdlRGlmZi9jZy9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDc3MmNk ZDE5MmM2YTcxM2RkMTIzNDZkNmRhNzk4ZDRjZTZjODM3NDkuLmYwYjRmMzQwNDUxOWE0MGJhNDUz NzA1ZjRmNjM3NDIzMDRlMzQ0NDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlmZi9jZy9Db25m aWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCisrKyBiL1Rvb2xzL0ltYWdlRGlmZi9jZy9Db25maWd1 cmF0aW9ucy9CYXNlLnhjY29uZmlnCkBAIC02Myw3ICs2Myw3IEBAIENMQU5HX1dBUk5fX0RVUExJ Q0FURV9NRVRIT0RfTUFUQ0ggPSBZRVM7CiBHQ0NfV0FSTl9VTkRFQ0xBUkVEX1NFTEVDVE9SID0g WUVTOwogR0NDX1dBUk5fNjRfVE9fMzJfQklUX0NPTlZFUlNJT05bYXJjaD1hcm02NCpdID0gTk87 CiBHQ0NfV0FSTl82NF9UT18zMl9CSVRfQ09OVkVSU0lPTlthcmNoPXg4Nl82NF0gPSBOTzsKLVdB Uk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVduby11bnVzZWQtcGFyYW1ldGVyIC1XdW5kZWYKK1dB Uk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJhbWV0ZXIg LVd1bmRlZjsKIAogREVCVUdfREVGSU5FUyA9IE5ERUJVRzsKIERFQlVHX0RFRklORVNbY29uZmln PURlYnVnXSA9IDsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL0NvbmZpZ3VyYXRpb25z L0Jhc2UueGNjb25maWcgYi9Ub29scy9NaW5pQnJvd3Nlci9Db25maWd1cmF0aW9ucy9CYXNlLnhj Y29uZmlnCmluZGV4IDhhMzY5YjUwYmQ5ZGJkM2RhYTI0M2I5OWQ3MTQxMWZiM2M4MzNjMDUuLjQw ZjdkNDA3YTE3MDBmNWJmNzk0YjQyYTViNDllNTMwNDRjZjEzMTUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKKysrIGIvVG9vbHMvTWlu aUJyb3dzZXIvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAtNjcsNyArNjcsNyBAQCBH Q0NfV0FSTl9VTkRFQ0xBUkVEX1NFTEVDVE9SID0gWUVTOwogQ0xBTkdfV0FSTl9PQkpDX0lNUExJ Q0lUX1JFVEFJTl9TRUxGID0gWUVTOwogQ0xBTkdfQU5BTFlaRVJfTE9DQUxJWkFCSUxJVFlfTk9O TE9DQUxJWkVEID0gWUVTOwogR0NDX1ZFUlNJT04gPSBjb20uYXBwbGUuY29tcGlsZXJzLmxsdm0u Y2xhbmcuMV8wOwotV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAtV25vLXVudXNlZC1wYXJhbWV0 ZXIKK1dBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJh bWV0ZXI7CiBHQ0NfTk9fQ09NTU9OX0JMT0NLUyA9IFlFUzsKIAogU1VQUE9SVEVEX1BMQVRGT1JN UyA9IGlwaG9uZW9zIGlwaG9uZXNpbXVsYXRvciBtYWNvc3ggYXBwbGV0dm9zIGFwcGxldHZzaW11 bGF0b3Igd2F0Y2hvcyB3YXRjaHNpbXVsYXRvcjsKZGlmZiAtLWdpdCBhL1Rvb2xzL01vYmlsZU1p bmlCcm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcgYi9Ub29scy9Nb2JpbGVNaW5p QnJvd3Nlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDYxOGEzODYzZGM1MTEx ZGVjYmM1N2E1NzJlZTUzNjhlMGUwMjY5MGMuLmNhMDllMGYzODExYmI2NjI4MmQzMGY5N2I4ODI2 MmE3ZTJhYjU3MzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01vYmlsZU1pbmlCcm93c2VyL0NvbmZpZ3Vy YXRpb25zL0Jhc2UueGNjb25maWcKKysrIGIvVG9vbHMvTW9iaWxlTWluaUJyb3dzZXIvQ29uZmln dXJhdGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAtNzksNyArNzksNyBAQCBHQ0NfV0FSTl82NF9UT18z Ml9CSVRfQ09OVkVSU0lPTlthcmNoPWFybTY0Kl0gPSBOTzsKIEdDQ19XQVJOXzY0X1RPXzMyX0JJ VF9DT05WRVJTSU9OW2FyY2g9eDg2XzY0XSA9IE5POwogTVRMX0VOQUJMRV9ERUJVR19JTkZPID0g Tk87CiBWQUxJREFURV9QUk9EVUNUID0gWUVTOwotV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAt V25vLXVudXNlZC1wYXJhbWV0ZXIgLVd1bmRlZgorV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAt V2Zvcm1hdD0yIC1Xbm8tdW51c2VkLXBhcmFtZXRlciAtV3VuZGVmOwogCiBTVVBQT1JURURfUExB VEZPUk1TID0gaXBob25lb3MgaXBob25lc2ltdWxhdG9yOwogU0RLUk9PVCA9ICQoU0RLUk9PVF8k KFVTRV9JTlRFUk5BTF9TREspKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29u ZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJh dGlvbnMvQmFzZS54Y2NvbmZpZwppbmRleCA0YjgxMzBjZWEyZjk4ZTc0OWE1ZDhmMWM0MjJjYjBk MGUzOTJmNzM5Li4zZjNhMjE2ZTA2ZjE5ZTgxM2EzNjc1MjJhMmM2ZGRhNTkxMjZkMjM1IDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcK KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCkBA IC03Miw3ICs3Miw3IEBAIENMQU5HX1dBUk5fT0JKQ19JTVBMSUNJVF9SRVRBSU5fU0VMRiA9IFlF UzsKIENMQU5HX0FOQUxZWkVSX0xPQ0FMSVpBQklMSVRZX05PTkxPQ0FMSVpFRCA9IFlFUzsKIEdD Q19XQVJOXzY0X1RPXzMyX0JJVF9DT05WRVJTSU9OW2FyY2g9YXJtNjQqXSA9IE5POwogR0NDX1dB Uk5fNjRfVE9fMzJfQklUX0NPTlZFUlNJT05bYXJjaD14ODZfNjRdID0gTk87Ci1XQVJOSU5HX0NG TEFHUyA9IC1XYWxsIC1XIC1Xbm8tdW51c2VkLXBhcmFtZXRlciAtV3RocmVhZC1zYWZldHkKK1dB Uk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJhbWV0ZXIg LVd0aHJlYWQtc2FmZXR5OwogCiBERUJVR19ERUZJTkVTID0gTkRFQlVHOwogREVCVUdfREVGSU5F U1tjb25maWc9RGVidWddID0gOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0 Zm9ybVV0aWxpdGllcy5oIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVV0aWxpdGllcy5o CmluZGV4IGU4NTVhZDliMjkwZGVkOWVhZmQyODNlNTI4NzNiYTlhY2ZmMmMxNGUuLjQ5Yzk0M2Y0 ZWE2NWRhOTUxYzFiMjU5ZDQzNWZkYzE3MmU4MjRjZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvUGxhdGZvcm1VdGlsaXRpZXMuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Bs YXRmb3JtVXRpbGl0aWVzLmgKQEAgLTQ3LDcgKzQ3LDkgQEAgc3RkOjpzdHJpbmcgdG9TVEQoY29u c3QgY2hhciopOwogI2lmIFVTRShGT1VOREFUSU9OKQogc3RkOjpzdHJpbmcgdG9TVEQoTlNTdHJp bmcgKik7CiBib29sIGpzb25NYXRjaGVzRXhwZWN0ZWRWYWx1ZXMoTlNTdHJpbmcgKmpzb25TdHJp bmcsIE5TRGljdGlvbmFyeSAqZXhwZWN0ZWQpOwotdm9pZCB3YWl0Rm9yQ29uZGl0aW9uV2l0aExv Z2dpbmcoc3RkOjpmdW5jdGlvbjxib29sKCk+JiYsIE5TVGltZUludGVydmFsIGxvZ2dpbmdUaW1l b3V0LCBOU1N0cmluZyAqbWVzc2FnZSwgLi4uKTsKKyNpZmRlZiBfX09CSkNfXwordm9pZCB3YWl0 Rm9yQ29uZGl0aW9uV2l0aExvZ2dpbmcoc3RkOjpmdW5jdGlvbjxib29sKCk+JiYsIE5TVGltZUlu dGVydmFsIGxvZ2dpbmdUaW1lb3V0LCBOU1N0cmluZyAqbWVzc2FnZSwgLi4uKSBOU19GT1JNQVRf RlVOQ1RJT04oMywgNCk7CisjZW5kaWYKICNlbmRpZgogCiAjaWYgV0tfSEFWRV9DX1NQSQpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2FkQWx0ZXJu YXRlSFRNTFN0cmluZy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev TG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcubW0KaW5kZXggMmM3MGQyN2I3ZDQyMjY4NjY0YzVjYzZl MmE3NzhlYzE0ODRkZmJiNi4uNGZhYWM0NWJmZGUwYTg1NDYyZWUyMWI4M2U0ZjVkZGU1MDc1YTAz YiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL0xvYWRBbHRlcm5hdGVIVE1MU3RyaW5nLm1tCkBAIC0xNzEsNyArMTcxLDcgQEAg VEVTVChXS1dlYlZpZXcsIExvYWRIVE1MU3RyaW5nT3JpZ2luKQogICAgICAgICBjb21wbGV0aW9u SGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7CiAgICAgfTsKICAgICB3ZWJW aWV3LmdldCgpLm5hdmlnYXRpb25EZWxlZ2F0ZSA9IGRlbGVnYXRlLmdldCgpOwotICAgIE5TU3Ry aW5nICpodG1sID0gQCI8c2NyaXB0PnZhciB4aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsgeGhy Lm9wZW4oJ0dFVCcsICdodHRwOi8vMTI3LjAuMC4xOiVkLycsIHRydWUpOyB4aHIuc2VuZCgpOzwv c2NyaXB0PiI7CisgICAgTlNTdHJpbmcgKmNvbnN0IGh0bWwgPSBAIjxzY3JpcHQ+dmFyIHhociA9 IG5ldyBYTUxIdHRwUmVxdWVzdCgpOyB4aHIub3BlbignR0VUJywgJ2h0dHA6Ly8xMjcuMC4wLjE6 JWQvJywgdHJ1ZSk7IHhoci5zZW5kKCk7PC9zY3JpcHQ+IjsKICAgICBbd2ViVmlldyBsb2FkSFRN TFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpodG1sLCBzZXJ2ZXIucG9ydCgpXSBi YXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiY3VzdG9tLXNjaGVtZTovLyJdXTsKICAgICBV dGlsOjpydW4oJmRvbmUpOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9PcGVuQW5kQ2xvc2VXaW5kb3cubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL09wZW5BbmRDbG9zZVdpbmRvdy5tbQppbmRleCA1MTc1Mjc2ZGEy OGQ4YjA2MzcyZWJiYjA3ZDI4OTdhYTQ4YTZkN2JmLi40NzA5MDQ4MmE3MDI5ZTgxY2MyMWQyMTE3 ZDA0MDE5YTliMTRlNWNlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL09wZW5BbmRDbG9zZVdpbmRvdy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL09wZW5BbmRDbG9zZVdpbmRvdy5tbQpAQCAtMjM2LDcgKzIzNiw3 IEBAIFRFU1QoV2ViS2l0LCBPcGVuV2luZG93RmVhdHVyZXMpCiAgICAgc2hhcmVkQ2hlY2tXaW5k b3dGZWF0dXJlc1VJRGVsZWdhdGUgPSBhZG9wdE5TKFtbQ2hlY2tXaW5kb3dGZWF0dXJlc1VJRGVs ZWdhdGUgYWxsb2NdIGluaXRdKTsKICAgICBbd2ViVmlldyBzZXRVSURlbGVnYXRlOnNoYXJlZENo ZWNrV2luZG93RmVhdHVyZXNVSURlbGVnYXRlLmdldCgpXTsKICAgICBbd2ViVmlldyBjb25maWd1 cmF0aW9uXS5wcmVmZXJlbmNlcy5qYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5 ID0gWUVTOwotICAgIE5TU3RyaW5nICp3aW5kb3dPcGVuRm9ybWF0U3RyaW5nID0gQCJ3aW5kb3cu b3BlbihcImFib3V0OmJsYW5rXCIsIFwiX2JsYW5rXCIsIFwiJUBcIikiOworICAgIE5TU3RyaW5n ICpjb25zdCB3aW5kb3dPcGVuRm9ybWF0U3RyaW5nID0gQCJ3aW5kb3cub3BlbihcImFib3V0OmJs YW5rXCIsIFwiX2JsYW5rXCIsIFwiJUBcIikiOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0OkAid2luZG93Lm9wZW4oXCJhYm91dDpibGFua1wiKSIgY29tcGxldGlvbkhhbmRsZXI6 bmlsXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7CmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZpY2VXb3JrZXJUQ1BT ZXJ2ZXIuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdv cmtlclRDUFNlcnZlci5oCmluZGV4IGVhMjA3YzdiMjc4N2RiMGMwYzRjYWM3NDFjNjU4MWNiYmU0 NzNkMTUuLmI2NGE1ZTJmYWUwMWU0YzU5Y2ZjNTU5MWE0NTkxNDY1ZjMxZTc0NzYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtlclRD UFNlcnZlci5oCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2Vy dmljZVdvcmtlclRDUFNlcnZlci5oCkBAIC00OCw5ICs0OCwyNCBAQCBwdWJsaWM6CiAgICAgICAg ICAgICByZXNwb25kVG9SZXF1ZXN0cyhjb25uZWN0aW9uLCBzdGQ6OmV4Y2hhbmdlKHRoaXJkQ29u bmVjdGlvbiwgeyB9KSwgeyB9KTsKICAgICAgICAgfSkgeyB9CiAKLSAgICBOU1VSTFJlcXVlc3Qg KnJlcXVlc3QoKSB7IHJldHVybiByZXF1ZXN0V2l0aEZvcm1hdChAImh0dHA6Ly8xMjcuMC4wLjE6 JWQvbWFpbi5odG1sIik7IH0KLSAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3RXaXRoTG9jYWxob3N0 KCkgeyByZXR1cm4gcmVxdWVzdFdpdGhGb3JtYXQoQCJodHRwOi8vbG9jYWxob3N0OiVkL21haW4u aHRtbCIpOyB9Ci0gICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0V2l0aEZyYWdtZW50KCkgeyByZXR1 cm4gcmVxdWVzdFdpdGhGb3JtYXQoQCJodHRwOi8vMTI3LjAuMC4xOiVkL21haW4uaHRtbCNmcmFn bWVudCIpOyB9CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KCkKKyAgICB7CisgICAgICAgIGF1 dG8gdXJsID0gYWRvcHROUyhbW05TU3RyaW5nIGFsbG9jXSBpbml0V2l0aEZvcm1hdDpAImh0dHA6 Ly8xMjcuMC4wLjE6JWQvbWFpbi5odG1sIiwgcG9ydCgpXSk7CisgICAgICAgIHJldHVybiByZXF1 ZXN0V2l0aFVSTFN0cmluZyh1cmwuZ2V0KCkpOworICAgIH0KKworICAgIE5TVVJMUmVxdWVzdCAq cmVxdWVzdFdpdGhMb2NhbGhvc3QoKQorICAgIHsKKyAgICAgICAgYXV0byB1cmwgPSBhZG9wdE5T KFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRm9ybWF0OkAiaHR0cDovL2xvY2FsaG9zdDolZC9t YWluLmh0bWwiLCBwb3J0KCldKTsKKyAgICAgICAgcmV0dXJuIHJlcXVlc3RXaXRoVVJMU3RyaW5n KHVybC5nZXQoKSk7CisgICAgfQorCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0V2l0aEZyYWdt ZW50KCkKKyAgICB7CisgICAgICAgIGF1dG8gdXJsID0gYWRvcHROUyhbW05TU3RyaW5nIGFsbG9j XSBpbml0V2l0aEZvcm1hdDpAImh0dHA6Ly8xMjcuMC4wLjE6JWQvbWFpbi5odG1sI2ZyYWdtZW50 IiwgcG9ydCgpXSk7CisgICAgICAgIHJldHVybiByZXF1ZXN0V2l0aFVSTFN0cmluZyh1cmwuZ2V0 KCkpOworICAgIH0KKwogICAgIHNpemVfdCB1c2VyQWdlbnRzQ2hlY2tlZCgpIGNvbnN0IHsgcmV0 dXJuIG1fdXNlckFnZW50c0NoZWNrZWQ7IH0KIAogcHJpdmF0ZToKQEAgLTY1LDkgKzgwLDkgQEAg cHJpdmF0ZToKICAgICAgICAgICAgICAgICBFWFBFQ1RfVFJVRShzdHJuc3RyKChjb25zdCBjaGFy KilyZXF1ZXN0LmRhdGEoKSwgbWFrZVN0cmluZygiVXNlci1BZ2VudDogIiwgZXhwZWN0ZWRVc2Vy QWdlbnQpLnV0ZjgoKS5kYXRhKCksIHJlcXVlc3Quc2l6ZSgpKSk7CiAgICAgICAgICAgICAgICAg bV91c2VyQWdlbnRzQ2hlY2tlZCsrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgTlNTdHJp bmcgKmZvcm1hdCA9IEAiSFRUUC8xLjEgMjAwIE9LXHJcbiIKKyAgICAgICAgICAgIE5TU3RyaW5n ICpjb25zdCBmb3JtYXQgPSBAIkhUVFAvMS4xIDIwMCBPS1xyXG4iCiAgICAgICAgICAgICAiQ29u dGVudC1UeXBlOiAlc1xyXG4iCi0gICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6ICVkXHJcblxy XG4iCisgICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6ICV6dVxyXG5cclxuIgogICAgICAgICAg ICAgIiVzIjsKICAgICAgICAgICAgIGF1dG8mIGluZm8gPSB2ZWN0b3JbdmVjdG9ySW5kZXhdOwog ICAgICAgICAgICAgTlNTdHJpbmcgKnJlc3BvbnNlID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3Jt YXQ6Zm9ybWF0LCBpbmZvLm1pbWVUeXBlLCBzdHJsZW4oaW5mby5yZXNwb25zZSksIGluZm8ucmVz cG9uc2VdOwpAQCAtNzcsNiArOTIsNiBAQCBwcml2YXRlOgogICAgICAgICB9KTsKICAgICB9CiAK LSAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3RXaXRoRm9ybWF0KE5TU3RyaW5nICpmb3JtYXQpIHsg cmV0dXJuIFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6 W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6Zm9ybWF0LCBwb3J0KCldXV07IH0KKyAgICBOU1VS TFJlcXVlc3QgKnJlcXVlc3RXaXRoVVJMU3RyaW5nKE5TU3RyaW5nICp1cmwpIHsgcmV0dXJuIFtO U1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6dXJsXV07IH0K ICAgICBzaXplX3QgbV91c2VyQWdlbnRzQ2hlY2tlZCB7IDAgfTsKIH07CmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0gYi9Ub29scy9UZXN0V2ViS2l0 QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0KaW5kZXggOTUxNDU2ZjdhMTFlNWU2ZTRhNDQ4NjVlZTli ZDgyOTc0YjNkMGJiMS4uY2VkNDRmMTgwMjc3ZWM3OTE1MzIwNzUyNTRmY2E3M2EwNTkxNzYxMiAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZlci5tbQpAQCAtMzUxLDIxICszNTEs MjEgQEAgdWludDE2X3QgSFRUUFNlcnZlcjo6cG9ydCgpIGNvbnN0CiAKIE5TVVJMUmVxdWVzdCAq SFRUUFNlcnZlcjo6cmVxdWVzdChjb25zdCBTdHJpbmcmIHBhdGgpIGNvbnN0CiB7Ci0gICAgTlNT dHJpbmcgKmZvcm1hdCA9IG5pbDsKKyAgICBjb25zdCBjaGFyKiBzY2hlbWUgPSBudWxscHRyOwog ICAgIHN3aXRjaCAobV9wcm90b2NvbCkgewogICAgIGNhc2UgUHJvdG9jb2w6Okh0dHA6Ci0gICAg ICAgIGZvcm1hdCA9IEAiaHR0cDovLzEyNy4wLjAuMTolZCVzIjsKKyAgICAgICAgc2NoZW1lID0g Imh0dHAiOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFByb3RvY29sOjpIdHRwczoKICAgICBj YXNlIFByb3RvY29sOjpIdHRwc1dpdGhMZWdhY3lUTFM6CiAgICAgY2FzZSBQcm90b2NvbDo6SHR0 cDI6Ci0gICAgICAgIGZvcm1hdCA9IEAiaHR0cHM6Ly8xMjcuMC4wLjE6JWQlcyI7CisgICAgICAg IHNjaGVtZSA9ICJodHRwcyI7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgUHJvdG9jb2w6Okh0 dHBzUHJveHk6CiAgICAgY2FzZSBQcm90b2NvbDo6SHR0cHNQcm94eVdpdGhBdXRoZW50aWNhdGlv bjoKICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9Ci0gICAgcmV0 dXJuIFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05T U3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6Zm9ybWF0LCBwb3J0KCksIHBhdGgudXRmOCgpLmRhdGEo KV1dXTsKKyAgICByZXR1cm4gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVzOi8vMTI3LjAuMC4xOiVk JXMiLCBzY2hlbWUsIHBvcnQoKSwgcGF0aC51dGY4KCkuZGF0YSgpXV1dOwogfQogCiB2b2lkIENv bm5lY3Rpb246OnJlY2VpdmVCeXRlcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3Rvcjx1aW50 OF90PiYmKT4mJiBjb21wbGV0aW9uSGFuZGxlciwgc2l6ZV90IG1pbmltdW1TaXplKSBjb25zdApk aWZmIC0tZ2l0IGEvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9Db25maWd1cmF0aW9ucy9CYXNlLnhj Y29uZmlnIGIvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29u ZmlnCmluZGV4IDUzMDU5N2ViOWJkZTRhYWMzMmFkMzJhMDc0OTI5MmM4MGY2Y2M2NWUuLjRkMDZj NmE4ZThkMmMxYjA2MmM3YTg1YzZjMzg2Y2RlY2IzOTdkZjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dl YkVkaXRpbmdUZXN0ZXIvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZworKysgYi9Ub29scy9X ZWJFZGl0aW5nVGVzdGVyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKQEAgLTUzLDcgKzUz LDcgQEAgR0NDX1dBUk5fVU5VU0VEX1ZBUklBQkxFID0gWUVTCiBDTEFOR19XQVJOX19EVVBMSUNB VEVfTUVUSE9EX01BVENIID0gWUVTOwogR0NDX1dBUk5fVU5ERUNMQVJFRF9TRUxFQ1RPUiA9IFlF UzsKIEdDQ19WRVJTSU9OID0gY29tLmFwcGxlLmNvbXBpbGVycy5sbHZtLmNsYW5nLjFfMDsKLVdB Uk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVduby11bnVzZWQtcGFyYW1ldGVyCitXQVJOSU5HX0NG TEFHUyA9IC1XYWxsIC1XIC1XZm9ybWF0PTIgLVduby11bnVzZWQtcGFyYW1ldGVyOwogCiBUQVJH RVRfTUFDX09TX1hfVkVSU0lPTl9NQUpPUiA9ICQoVEFSR0VUX01BQ19PU19YX1ZFUlNJT05fTUFK T1JfJChNQUNPU1hfREVQTE9ZTUVOVF9UQVJHRVQ6YmFzZSkkKE1BQ09TWF9ERVBMT1lNRU5UX1RB UkdFVDpzdWZmaXg6aWRlbnRpZmllcikpOwogVEFSR0VUX01BQ19PU19YX1ZFUlNJT05fTUFKT1Jf MTBfMTMgPSAxMDEzMDA7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0NvbmZp Z3VyYXRpb25zL0Jhc2UueGNjb25maWcgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0NvbmZpZ3Vy YXRpb25zL0Jhc2UueGNjb25maWcKaW5kZXggYmEzMmE0NTlmNmE3YTlkZjM3Yjg3NGJlMGMzZTEy YjAxOWI1MTI3NC4uZTMwOWUwMTFlZDg5YTI0MDY2YTIwNDEwOThmOGFlY2IzNGZiMDM5YiAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29u ZmlnCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2Nv bmZpZwpAQCAtNzAsNyArNzAsNyBAQCBHQ0NfV0FSTl9VTlVTRURfRlVOQ1RJT04gPSBZRVMKIEdD Q19XQVJOX1VOVVNFRF9WQVJJQUJMRSA9IFlFUwogR0NDX1dBUk5fNjRfVE9fMzJfQklUX0NPTlZF UlNJT05bYXJjaD1hcm02NCpdID0gTk87CiBHQ0NfV0FSTl82NF9UT18zMl9CSVRfQ09OVkVSU0lP TlthcmNoPXg4Nl82NF0gPSBOTzsKLVdBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdjb25kaXRp b25hbC11bmluaXRpYWxpemVkIC1Xbm8tdW51c2VkLXBhcmFtZXRlciAtV3VuZGVmOworV0FSTklO R19DRkxBR1MgPSAtV2FsbCAtVyAtV2NvbmRpdGlvbmFsLXVuaW5pdGlhbGl6ZWQgLVdmb3JtYXQ9 MiAtV25vLXVudXNlZC1wYXJhbWV0ZXIgLVd1bmRlZjsKIEdDQ19QUkVGSVhfSEVBREVSID0gV2Vi S2l0VGVzdFJ1bm5lclByZWZpeC5oCiAKIERFQlVHX0RFRklORVMgPSBOREVCVUc7Cg== 442652 2021-10-27 16:59:35 -0700 2021-10-28 08:12:16 -0700 Patch for landing bug-232404-20211027165934.patch text/plain 14785 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Nzg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjg3MWQ3NTAyMGEyY2Q2NmVmYTJkM2I1ZDNkODdlOGJj MzQ5MzcxNi4uMDlhNTZjOTZhMWMyZWQyMjU3ZGFhMGMzNWIwNDhjMGIzNDEyNmViMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1 IEBACisyMDIxLTEwLTI3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgW1Rvb2xzXSBFbmFibGUgLVdmb3JtYXQ9MiB3YXJuaW5ncworICAgICAgICA8aHR0cHM6 Ly93ZWJraXQub3JnL2IvMjMyNDA0PgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ3MjgwNTg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZzoKKyAgICAgICAgKFdBUk5J TkdTX0NGTEFHUyk6CisgICAgICAgICogSW1hZ2VEaWZmL2NnL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxBR1MpOgorICAgICAgICAqIE1pbmlCcm93 c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxB R1MpOgorICAgICAgICAqIE1vYmlsZU1pbmlCcm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNj b25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxBR1MpOgorICAgICAgICAqIFRlc3RXZWJLaXRB UEkvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZzoKKyAgICAgICAgKFdBUk5JTkdTX0NGTEFH Uyk6CisgICAgICAgIC0gQWRkIC1XZm9ybWF0PTIgc3dpdGNoLCB3aGljaCBpbmNsdWRlcyAtV2Zv cm1hdC1ub25saXRlcmFsLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVV0aWxp dGllcy5oOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VXRpbDo6d2FpdEZvckNvbmRpdGlvbldp dGhMb2dnaW5nKToKKyAgICAgICAgLSBBZGQgTlNfRk9STUFUX0ZVTkNUSU9OKCkgYXR0cmlidXRl LgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVybmF0 ZUhUTUxTdHJpbmcubW06CisgICAgICAgIChURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL09wZW5BbmRDbG9zZVdpbmRvdy5tbToKKyAgICAgICAgKFRFU1Qp OgorICAgICAgICAtIENoYW5nZSB0eXBlIG9mIGZvcm1hdCBzdHJpbmcgdG8gYE5TU3RyaW5nICpj b25zdGAuCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNl V29ya2VyVENQU2VydmVyLmg6CisgICAgICAgIChTZXJ2aWNlV29ya2VyVENQU2VydmVyOjpyZXF1 ZXN0KToKKyAgICAgICAgKFNlcnZpY2VXb3JrZXJUQ1BTZXJ2ZXI6OnJlcXVlc3RXaXRoTG9jYWxo b3N0KToKKyAgICAgICAgKFNlcnZpY2VXb3JrZXJUQ1BTZXJ2ZXI6OnJlcXVlc3RXaXRoRnJhZ21l bnQpOgorICAgICAgICAtIENhbGwgLVtOU1N0cmluZyBpbml0V2l0aEZvcm1hdDpdIGluIGVhY2gg bWV0aG9kIHNvIHRoZSBmb3JtYXQKKyAgICAgICAgICBzdHJpbmcgaXMgdXNlZCBkaXJlY3RseSBp biB0aGUgbWV0aG9kIGNhbGwuCisgICAgICAgIChTZXJ2aWNlV29ya2VyVENQU2VydmVyOjpyZXNw b25kVG9SZXF1ZXN0cyk6CisgICAgICAgIC0gQ2hhbmdlIHR5cGUgb2YgZm9ybWF0IHN0cmluZyB0 byBgTlNTdHJpbmcgKmNvbnN0YCwgYW5kIGZpeAorICAgICAgICAgIHBsYWNlaG9sZGVyIGZvciBz dHJsZW4oKSByZXR1cm4gdmFsdWUuCisgICAgICAgIChTZXJ2aWNlV29ya2VyVENQU2VydmVyOjpy ZXF1ZXN0V2l0aEZvcm1hdCk6IERlbGV0ZS4KKyAgICAgICAgKFNlcnZpY2VXb3JrZXJUQ1BTZXJ2 ZXI6OnJlcXVlc3RXaXRoVVJMU3RyaW5nKToKKyAgICAgICAgLSBSZW5hbWUgZnJvbSByZXF1ZXN0 V2l0aEZvcm1hdCgpIGFuZCB0YWtlIGEgYHVybGAgcGFyYW1ldGVyCisgICAgICAgICAgaW5zdGVh ZCBvZiBhIGBmb3JtYXRgIHBhcmFtZXRlci4KKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29h L0hUVFBTZXJ2ZXIubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyOjpyZXF1 ZXN0IGNvbnN0KToKKyAgICAgICAgLSBDaGFuZ2Ugc3dpdGNoIHN0YXRlbWVudCB0byBzZXQgdGhl IHNjaGVtZSBmb3IgdGhlIFVSTCwgYW5kCisgICAgICAgICAgbW92ZSB0aGUgZm9ybWF0IHN0cmlu ZyBpbnRvICtbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpdLgorCisgICAgICAgICogV2ViRWRp dGluZ1Rlc3Rlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnOgorICAgICAgICAoV0FSTklO R1NfQ0ZMQUdTKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25zL0Jh c2UueGNjb25maWc6CisgICAgICAgIChXQVJOSU5HU19DRkxBR1MpOgorICAgICAgICAtIEFkZCAt V2Zvcm1hdD0yIHN3aXRjaCwgd2hpY2ggaW5jbHVkZXMgLVdmb3JtYXQtbm9ubGl0ZXJhbC4KKwog MjAyMS0xMC0yNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OIChyMjg0MDc5KTogQXVkaW8gY29udGludWVzIHBsYXlpbmcgb24gaHVs dS5jb20gaW4gcHJpdmF0ZSBicm93c2luZyBtb2RlIGFmdGVyIGNsb3NpbmcgdGhlIHRhYgpkaWZm IC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNj b25maWcgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2Nv bmZpZwppbmRleCA1MzJkYThjNjAyNWNjYTRjYjllY2YxYjdiZjBlNGQzMzI2OGE4NjIyLi5iNDQ2 OTg1ZDkxMjIzZDY2NmM2N2E0MDNiNTgxNzVjODA3YzUyMWQwIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZworKysgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9tYWMvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAtODMs NyArODMsNyBAQCBDTEFOR19BTkFMWVpFUl9MT0NBTElaQUJJTElUWV9OT05MT0NBTElaRUQgPSBZ RVM7CiAvLyBGSVhNRTogPGh0dHA6Ly93ZWJraXQub3JnL2IvMTE4NTkwPiBEdW1wUmVuZGVyVHJl ZSBzaG91bGQgYnVpbGQgd2l0aCAtV3Nob3J0ZW4tNjQtdG8tMzIKIEdDQ19XQVJOXzY0X1RPXzMy X0JJVF9DT05WRVJTSU9OW2FyY2g9YXJtNjQqXSA9IE5POwogR0NDX1dBUk5fNjRfVE9fMzJfQklU X0NPTlZFUlNJT05bYXJjaD14ODZfNjRdID0gTk87Ci1XQVJOSU5HX0NGTEFHUyA9IC1XYWxsIC1X IC1XY29uZGl0aW9uYWwtdW5pbml0aWFsaXplZCAtV25vLXVudXNlZC1wYXJhbWV0ZXIgLVd1bmRl ZjsKK1dBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdjb25kaXRpb25hbC11bmluaXRpYWxpemVk IC1XZm9ybWF0PTIgLVduby11bnVzZWQtcGFyYW1ldGVyIC1XdW5kZWY7CiAKIERFQlVHX0RFRklO RVMgPSBOREVCVUc7CiBERUJVR19ERUZJTkVTW2NvbmZpZz1EZWJ1Z10gPSA7CmRpZmYgLS1naXQg YS9Ub29scy9JbWFnZURpZmYvY2cvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZyBiL1Rvb2xz L0ltYWdlRGlmZi9jZy9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDc3MmNkZDE5 MmM2YTcxM2RkMTIzNDZkNmRhNzk4ZDRjZTZjODM3NDkuLmYwYjRmMzQwNDUxOWE0MGJhNDUzNzA1 ZjRmNjM3NDIzMDRlMzQ0NDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlmZi9jZy9Db25maWd1 cmF0aW9ucy9CYXNlLnhjY29uZmlnCisrKyBiL1Rvb2xzL0ltYWdlRGlmZi9jZy9Db25maWd1cmF0 aW9ucy9CYXNlLnhjY29uZmlnCkBAIC02Myw3ICs2Myw3IEBAIENMQU5HX1dBUk5fX0RVUExJQ0FU RV9NRVRIT0RfTUFUQ0ggPSBZRVM7CiBHQ0NfV0FSTl9VTkRFQ0xBUkVEX1NFTEVDVE9SID0gWUVT OwogR0NDX1dBUk5fNjRfVE9fMzJfQklUX0NPTlZFUlNJT05bYXJjaD1hcm02NCpdID0gTk87CiBH Q0NfV0FSTl82NF9UT18zMl9CSVRfQ09OVkVSU0lPTlthcmNoPXg4Nl82NF0gPSBOTzsKLVdBUk5J TkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVduby11bnVzZWQtcGFyYW1ldGVyIC1XdW5kZWYKK1dBUk5J TkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJhbWV0ZXIgLVd1 bmRlZjsKIAogREVCVUdfREVGSU5FUyA9IE5ERUJVRzsKIERFQlVHX0RFRklORVNbY29uZmlnPURl YnVnXSA9IDsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jh c2UueGNjb25maWcgYi9Ub29scy9NaW5pQnJvd3Nlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29u ZmlnCmluZGV4IDhhMzY5YjUwYmQ5ZGJkM2RhYTI0M2I5OWQ3MTQxMWZiM2M4MzNjMDUuLjQwZjdk NDA3YTE3MDBmNWJmNzk0YjQyYTViNDllNTMwNDRjZjEzMTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAtNjcsNyArNjcsNyBAQCBHQ0Nf V0FSTl9VTkRFQ0xBUkVEX1NFTEVDVE9SID0gWUVTOwogQ0xBTkdfV0FSTl9PQkpDX0lNUExJQ0lU X1JFVEFJTl9TRUxGID0gWUVTOwogQ0xBTkdfQU5BTFlaRVJfTE9DQUxJWkFCSUxJVFlfTk9OTE9D QUxJWkVEID0gWUVTOwogR0NDX1ZFUlNJT04gPSBjb20uYXBwbGUuY29tcGlsZXJzLmxsdm0uY2xh bmcuMV8wOwotV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAtV25vLXVudXNlZC1wYXJhbWV0ZXIK K1dBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJhbWV0 ZXI7CiBHQ0NfTk9fQ09NTU9OX0JMT0NLUyA9IFlFUzsKIAogU1VQUE9SVEVEX1BMQVRGT1JNUyA9 IGlwaG9uZW9zIGlwaG9uZXNpbXVsYXRvciBtYWNvc3ggYXBwbGV0dm9zIGFwcGxldHZzaW11bGF0 b3Igd2F0Y2hvcyB3YXRjaHNpbXVsYXRvcjsKZGlmZiAtLWdpdCBhL1Rvb2xzL01vYmlsZU1pbmlC cm93c2VyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcgYi9Ub29scy9Nb2JpbGVNaW5pQnJv d3Nlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDYxOGEzODYzZGM1MTExZGVj YmM1N2E1NzJlZTUzNjhlMGUwMjY5MGMuLmNhMDllMGYzODExYmI2NjI4MmQzMGY5N2I4ODI2MmE3 ZTJhYjU3MzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01vYmlsZU1pbmlCcm93c2VyL0NvbmZpZ3VyYXRp b25zL0Jhc2UueGNjb25maWcKKysrIGIvVG9vbHMvTW9iaWxlTWluaUJyb3dzZXIvQ29uZmlndXJh dGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAtNzksNyArNzksNyBAQCBHQ0NfV0FSTl82NF9UT18zMl9C SVRfQ09OVkVSU0lPTlthcmNoPWFybTY0Kl0gPSBOTzsKIEdDQ19XQVJOXzY0X1RPXzMyX0JJVF9D T05WRVJTSU9OW2FyY2g9eDg2XzY0XSA9IE5POwogTVRMX0VOQUJMRV9ERUJVR19JTkZPID0gTk87 CiBWQUxJREFURV9QUk9EVUNUID0gWUVTOwotV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAtV25v LXVudXNlZC1wYXJhbWV0ZXIgLVd1bmRlZgorV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAtV2Zv cm1hdD0yIC1Xbm8tdW51c2VkLXBhcmFtZXRlciAtV3VuZGVmOwogCiBTVVBQT1JURURfUExBVEZP Uk1TID0gaXBob25lb3MgaXBob25lc2ltdWxhdG9yOwogU0RLUk9PVCA9ICQoU0RLUk9PVF8kKFVT RV9JTlRFUk5BTF9TREspKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmln dXJhdGlvbnMvQmFzZS54Y2NvbmZpZyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlv bnMvQmFzZS54Y2NvbmZpZwppbmRleCA0YjgxMzBjZWEyZjk4ZTc0OWE1ZDhmMWM0MjJjYjBkMGUz OTJmNzM5Li4zZjNhMjE2ZTA2ZjE5ZTgxM2EzNjc1MjJhMmM2ZGRhNTkxMjZkMjM1IDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCkBAIC03 Miw3ICs3Miw3IEBAIENMQU5HX1dBUk5fT0JKQ19JTVBMSUNJVF9SRVRBSU5fU0VMRiA9IFlFUzsK IENMQU5HX0FOQUxZWkVSX0xPQ0FMSVpBQklMSVRZX05PTkxPQ0FMSVpFRCA9IFlFUzsKIEdDQ19X QVJOXzY0X1RPXzMyX0JJVF9DT05WRVJTSU9OW2FyY2g9YXJtNjQqXSA9IE5POwogR0NDX1dBUk5f NjRfVE9fMzJfQklUX0NPTlZFUlNJT05bYXJjaD14ODZfNjRdID0gTk87Ci1XQVJOSU5HX0NGTEFH UyA9IC1XYWxsIC1XIC1Xbm8tdW51c2VkLXBhcmFtZXRlciAtV3RocmVhZC1zYWZldHkKK1dBUk5J TkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJhbWV0ZXIgLVd0 aHJlYWQtc2FmZXR5OwogCiBERUJVR19ERUZJTkVTID0gTkRFQlVHOwogREVCVUdfREVGSU5FU1tj b25maWc9RGVidWddID0gOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9y bVV0aWxpdGllcy5oIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9QbGF0Zm9ybVV0aWxpdGllcy5oCmlu ZGV4IGU4NTVhZDliMjkwZGVkOWVhZmQyODNlNTI4NzNiYTlhY2ZmMmMxNGUuLjQ5Yzk0M2Y0ZWE2 NWRhOTUxYzFiMjU5ZDQzNWZkYzE3MmU4MjRjZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvUGxhdGZvcm1VdGlsaXRpZXMuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1BsYXRm b3JtVXRpbGl0aWVzLmgKQEAgLTQ3LDcgKzQ3LDkgQEAgc3RkOjpzdHJpbmcgdG9TVEQoY29uc3Qg Y2hhciopOwogI2lmIFVTRShGT1VOREFUSU9OKQogc3RkOjpzdHJpbmcgdG9TVEQoTlNTdHJpbmcg Kik7CiBib29sIGpzb25NYXRjaGVzRXhwZWN0ZWRWYWx1ZXMoTlNTdHJpbmcgKmpzb25TdHJpbmcs IE5TRGljdGlvbmFyeSAqZXhwZWN0ZWQpOwotdm9pZCB3YWl0Rm9yQ29uZGl0aW9uV2l0aExvZ2dp bmcoc3RkOjpmdW5jdGlvbjxib29sKCk+JiYsIE5TVGltZUludGVydmFsIGxvZ2dpbmdUaW1lb3V0 LCBOU1N0cmluZyAqbWVzc2FnZSwgLi4uKTsKKyNpZmRlZiBfX09CSkNfXwordm9pZCB3YWl0Rm9y Q29uZGl0aW9uV2l0aExvZ2dpbmcoc3RkOjpmdW5jdGlvbjxib29sKCk+JiYsIE5TVGltZUludGVy dmFsIGxvZ2dpbmdUaW1lb3V0LCBOU1N0cmluZyAqbWVzc2FnZSwgLi4uKSBOU19GT1JNQVRfRlVO Q1RJT04oMywgNCk7CisjZW5kaWYKICNlbmRpZgogCiAjaWYgV0tfSEFWRV9DX1NQSQpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2FkQWx0ZXJuYXRl SFRNTFN0cmluZy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9h ZEFsdGVybmF0ZUhUTUxTdHJpbmcubW0KaW5kZXggMmM3MGQyN2I3ZDQyMjY4NjY0YzVjYzZlMmE3 NzhlYzE0ODRkZmJiNi4uMWQ5NjdkNzZjMTg3MTRkMmI5NDE2NzVlZTNkNDEzYzJmZTdjYmYwOSAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2FkQWx0 ZXJuYXRlSFRNTFN0cmluZy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0xvYWRBbHRlcm5hdGVIVE1MU3RyaW5nLm1tCkBAIC0xNzEsNyArMTcxLDcgQEAgVEVT VChXS1dlYlZpZXcsIExvYWRIVE1MU3RyaW5nT3JpZ2luKQogICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7CiAgICAgfTsKICAgICB3ZWJWaWV3 LmdldCgpLm5hdmlnYXRpb25EZWxlZ2F0ZSA9IGRlbGVnYXRlLmdldCgpOwotICAgIE5TU3RyaW5n ICpodG1sID0gQCI8c2NyaXB0PnZhciB4aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsgeGhyLm9w ZW4oJ0dFVCcsICdodHRwOi8vMTI3LjAuMC4xOiVkLycsIHRydWUpOyB4aHIuc2VuZCgpOzwvc2Ny aXB0PiI7CisgICAgY29uc3RleHByIE5TU3RyaW5nICpodG1sID0gQCI8c2NyaXB0PnZhciB4aHIg PSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsgeGhyLm9wZW4oJ0dFVCcsICdodHRwOi8vMTI3LjAuMC4x OiVkLycsIHRydWUpOyB4aHIuc2VuZCgpOzwvc2NyaXB0PiI7CiAgICAgW3dlYlZpZXcgbG9hZEhU TUxTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6aHRtbCwgc2VydmVyLnBvcnQoKV0g YmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImN1c3RvbS1zY2hlbWU6Ly8iXV07CiAgICAg VXRpbDo6cnVuKCZkb25lKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvT3BlbkFuZENsb3NlV2luZG93Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9PcGVuQW5kQ2xvc2VXaW5kb3cubW0KaW5kZXggNTE3NTI3NmRh MjhkOGIwNjM3MmViYmIwN2QyODk3YWE0OGE2ZDdiZi4uOTMyMGM4NTc3MmI1OWY3ODI2OTc2ZThi M2Y3NjNiMjU1OWZmNTYyOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9PcGVuQW5kQ2xvc2VXaW5kb3cubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9PcGVuQW5kQ2xvc2VXaW5kb3cubW0KQEAgLTIzNiw3ICsyMzYs NyBAQCBURVNUKFdlYktpdCwgT3BlbldpbmRvd0ZlYXR1cmVzKQogICAgIHNoYXJlZENoZWNrV2lu ZG93RmVhdHVyZXNVSURlbGVnYXRlID0gYWRvcHROUyhbW0NoZWNrV2luZG93RmVhdHVyZXNVSURl bGVnYXRlIGFsbG9jXSBpbml0XSk7CiAgICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpzaGFyZWRD aGVja1dpbmRvd0ZlYXR1cmVzVUlEZWxlZ2F0ZS5nZXQoKV07CiAgICAgW3dlYlZpZXcgY29uZmln dXJhdGlvbl0ucHJlZmVyZW5jZXMuamF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxs eSA9IFlFUzsKLSAgICBOU1N0cmluZyAqd2luZG93T3BlbkZvcm1hdFN0cmluZyA9IEAid2luZG93 Lm9wZW4oXCJhYm91dDpibGFua1wiLCBcIl9ibGFua1wiLCBcIiVAXCIpIjsKKyAgICBjb25zdGV4 cHIgTlNTdHJpbmcgKndpbmRvd09wZW5Gb3JtYXRTdHJpbmcgPSBAIndpbmRvdy5vcGVuKFwiYWJv dXQ6YmxhbmtcIiwgXCJfYmxhbmtcIiwgXCIlQFwiKSI7CiAKICAgICBbd2ViVmlldyBldmFsdWF0 ZUphdmFTY3JpcHQ6QCJ3aW5kb3cub3BlbihcImFib3V0OmJsYW5rXCIpIiBjb21wbGV0aW9uSGFu ZGxlcjpuaWxdOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdvcmtl clRDUFNlcnZlci5oIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2 aWNlV29ya2VyVENQU2VydmVyLmgKaW5kZXggZWEyMDdjN2IyNzg3ZGIwYzBjNGNhYzc0MWM2NTgx Y2JiZTQ3M2QxNS4uOTBkNTY0NzJkYTcwM2NlZWZkMTY0N2VjZmVlNGFmMmRiNmViZWU5MSAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29y a2VyVENQU2VydmVyLmgKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9TZXJ2aWNlV29ya2VyVENQU2VydmVyLmgKQEAgLTQ4LDkgKzQ4LDI0IEBAIHB1YmxpYzoKICAg ICAgICAgICAgIHJlc3BvbmRUb1JlcXVlc3RzKGNvbm5lY3Rpb24sIHN0ZDo6ZXhjaGFuZ2UodGhp cmRDb25uZWN0aW9uLCB7IH0pLCB7IH0pOwogICAgICAgICB9KSB7IH0KIAotICAgIE5TVVJMUmVx dWVzdCAqcmVxdWVzdCgpIHsgcmV0dXJuIHJlcXVlc3RXaXRoRm9ybWF0KEAiaHR0cDovLzEyNy4w LjAuMTolZC9tYWluLmh0bWwiKTsgfQotICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdFdpdGhMb2Nh bGhvc3QoKSB7IHJldHVybiByZXF1ZXN0V2l0aEZvcm1hdChAImh0dHA6Ly9sb2NhbGhvc3Q6JWQv bWFpbi5odG1sIik7IH0KLSAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3RXaXRoRnJhZ21lbnQoKSB7 IHJldHVybiByZXF1ZXN0V2l0aEZvcm1hdChAImh0dHA6Ly8xMjcuMC4wLjE6JWQvbWFpbi5odG1s I2ZyYWdtZW50Iik7IH0KKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QoKQorICAgIHsKKyAgICAg ICAgYXV0byB1cmwgPSBhZG9wdE5TKFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRm9ybWF0OkAi aHR0cDovLzEyNy4wLjAuMTolZC9tYWluLmh0bWwiLCBwb3J0KCldKTsKKyAgICAgICAgcmV0dXJu IHJlcXVlc3RXaXRoVVJMU3RyaW5nKHVybC5nZXQoKSk7CisgICAgfQorCisgICAgTlNVUkxSZXF1 ZXN0ICpyZXF1ZXN0V2l0aExvY2FsaG9zdCgpCisgICAgeworICAgICAgICBhdXRvIHVybCA9IGFk b3B0TlMoW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhGb3JtYXQ6QCJodHRwOi8vbG9jYWxob3N0 OiVkL21haW4uaHRtbCIsIHBvcnQoKV0pOworICAgICAgICByZXR1cm4gcmVxdWVzdFdpdGhVUkxT dHJpbmcodXJsLmdldCgpKTsKKyAgICB9CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3RXaXRo RnJhZ21lbnQoKQorICAgIHsKKyAgICAgICAgYXV0byB1cmwgPSBhZG9wdE5TKFtbTlNTdHJpbmcg YWxsb2NdIGluaXRXaXRoRm9ybWF0OkAiaHR0cDovLzEyNy4wLjAuMTolZC9tYWluLmh0bWwjZnJh Z21lbnQiLCBwb3J0KCldKTsKKyAgICAgICAgcmV0dXJuIHJlcXVlc3RXaXRoVVJMU3RyaW5nKHVy bC5nZXQoKSk7CisgICAgfQorCiAgICAgc2l6ZV90IHVzZXJBZ2VudHNDaGVja2VkKCkgY29uc3Qg eyByZXR1cm4gbV91c2VyQWdlbnRzQ2hlY2tlZDsgfQogCiBwcml2YXRlOgpAQCAtNjUsOSArODAs OSBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEVYUEVDVF9UUlVFKHN0cm5zdHIoKGNvbnN0 IGNoYXIqKXJlcXVlc3QuZGF0YSgpLCBtYWtlU3RyaW5nKCJVc2VyLUFnZW50OiAiLCBleHBlY3Rl ZFVzZXJBZ2VudCkudXRmOCgpLmRhdGEoKSwgcmVxdWVzdC5zaXplKCkpKTsKICAgICAgICAgICAg ICAgICBtX3VzZXJBZ2VudHNDaGVja2VkKys7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBO U1N0cmluZyAqZm9ybWF0ID0gQCJIVFRQLzEuMSAyMDAgT0tcclxuIgorICAgICAgICAgICAgY29u c3RleHByIE5TU3RyaW5nICpmb3JtYXQgPSBAIkhUVFAvMS4xIDIwMCBPS1xyXG4iCiAgICAgICAg ICAgICAiQ29udGVudC1UeXBlOiAlc1xyXG4iCi0gICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6 ICVkXHJcblxyXG4iCisgICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6ICV6dVxyXG5cclxuIgog ICAgICAgICAgICAgIiVzIjsKICAgICAgICAgICAgIGF1dG8mIGluZm8gPSB2ZWN0b3JbdmVjdG9y SW5kZXhdOwogICAgICAgICAgICAgTlNTdHJpbmcgKnJlc3BvbnNlID0gW05TU3RyaW5nIHN0cmlu Z1dpdGhGb3JtYXQ6Zm9ybWF0LCBpbmZvLm1pbWVUeXBlLCBzdHJsZW4oaW5mby5yZXNwb25zZSks IGluZm8ucmVzcG9uc2VdOwpAQCAtNzcsNiArOTIsNiBAQCBwcml2YXRlOgogICAgICAgICB9KTsK ICAgICB9CiAKLSAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3RXaXRoRm9ybWF0KE5TU3RyaW5nICpm b3JtYXQpIHsgcmV0dXJuIFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdp dGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6Zm9ybWF0LCBwb3J0KCldXV07IH0K KyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3RXaXRoVVJMU3RyaW5nKE5TU3RyaW5nICp1cmxTdHJp bmcpIHsgcmV0dXJuIFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhT dHJpbmc6dXJsU3RyaW5nXV07IH0KICAgICBzaXplX3QgbV91c2VyQWdlbnRzQ2hlY2tlZCB7IDAg fTsKIH07CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIu bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0KaW5kZXggOTUxNDU2 ZjdhMTFlNWU2ZTRhNDQ4NjVlZTliZDgyOTc0YjNkMGJiMS4uYzEwZDAxOGZhYThjOGVkMTViM2Zl NDQxZmUwZjc5NjFhMzFkNzZkOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2Nv YS9IVFRQU2VydmVyLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvSFRUUFNlcnZl ci5tbQpAQCAtMzUxLDIxICszNTEsMjEgQEAgdWludDE2X3QgSFRUUFNlcnZlcjo6cG9ydCgpIGNv bnN0CiAKIE5TVVJMUmVxdWVzdCAqSFRUUFNlcnZlcjo6cmVxdWVzdChjb25zdCBTdHJpbmcmIHBh dGgpIGNvbnN0CiB7Ci0gICAgTlNTdHJpbmcgKmZvcm1hdCA9IG5pbDsKKyAgICBjb25zdCBjaGFy KiBzY2hlbWUgPSBudWxscHRyOwogICAgIHN3aXRjaCAobV9wcm90b2NvbCkgewogICAgIGNhc2Ug UHJvdG9jb2w6Okh0dHA6Ci0gICAgICAgIGZvcm1hdCA9IEAiaHR0cDovLzEyNy4wLjAuMTolZCVz IjsKKyAgICAgICAgc2NoZW1lID0gImh0dHAiOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFBy b3RvY29sOjpIdHRwczoKICAgICBjYXNlIFByb3RvY29sOjpIdHRwc1dpdGhMZWdhY3lUTFM6CiAg ICAgY2FzZSBQcm90b2NvbDo6SHR0cDI6Ci0gICAgICAgIGZvcm1hdCA9IEAiaHR0cHM6Ly8xMjcu MC4wLjE6JWQlcyI7CisgICAgICAgIHNjaGVtZSA9ICJodHRwcyI7CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgUHJvdG9jb2w6Okh0dHBzUHJveHk6CiAgICAgY2FzZSBQcm90b2NvbDo6SHR0cHNQ cm94eVdpdGhBdXRoZW50aWNhdGlvbjoKICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNI RUQoKTsKICAgICB9Ci0gICAgcmV0dXJuIFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6Zm9ybWF0LCBwb3J0 KCksIHBhdGgudXRmOCgpLmRhdGEoKV1dXTsKKyAgICByZXR1cm4gW05TVVJMUmVxdWVzdCByZXF1 ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1h dDpAIiVzOi8vMTI3LjAuMC4xOiVkJUAiLCBzY2hlbWUsIHBvcnQoKSwgcGF0aC5jcmVhdGVDRlN0 cmluZygpLmdldCgpXV1dOwogfQogCiB2b2lkIENvbm5lY3Rpb246OnJlY2VpdmVCeXRlcyhDb21w bGV0aW9uSGFuZGxlcjx2b2lkKFZlY3Rvcjx1aW50OF90PiYmKT4mJiBjb21wbGV0aW9uSGFuZGxl ciwgc2l6ZV90IG1pbmltdW1TaXplKSBjb25zdApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViRWRpdGlu Z1Rlc3Rlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnIGIvVG9vbHMvV2ViRWRpdGluZ1Rl c3Rlci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDUzMDU5N2ViOWJkZTRhYWMz MmFkMzJhMDc0OTI5MmM4MGY2Y2M2NWUuLjRkMDZjNmE4ZThkMmMxYjA2MmM3YTg1YzZjMzg2Y2Rl Y2IzOTdkZjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvQ29uZmlndXJhdGlv bnMvQmFzZS54Y2NvbmZpZworKysgYi9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL0NvbmZpZ3VyYXRp b25zL0Jhc2UueGNjb25maWcKQEAgLTUzLDcgKzUzLDcgQEAgR0NDX1dBUk5fVU5VU0VEX1ZBUklB QkxFID0gWUVTCiBDTEFOR19XQVJOX19EVVBMSUNBVEVfTUVUSE9EX01BVENIID0gWUVTOwogR0ND X1dBUk5fVU5ERUNMQVJFRF9TRUxFQ1RPUiA9IFlFUzsKIEdDQ19WRVJTSU9OID0gY29tLmFwcGxl LmNvbXBpbGVycy5sbHZtLmNsYW5nLjFfMDsKLVdBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdu by11bnVzZWQtcGFyYW1ldGVyCitXQVJOSU5HX0NGTEFHUyA9IC1XYWxsIC1XIC1XZm9ybWF0PTIg LVduby11bnVzZWQtcGFyYW1ldGVyOwogCiBUQVJHRVRfTUFDX09TX1hfVkVSU0lPTl9NQUpPUiA9 ICQoVEFSR0VUX01BQ19PU19YX1ZFUlNJT05fTUFKT1JfJChNQUNPU1hfREVQTE9ZTUVOVF9UQVJH RVQ6YmFzZSkkKE1BQ09TWF9ERVBMT1lNRU5UX1RBUkdFVDpzdWZmaXg6aWRlbnRpZmllcikpOwog VEFSR0VUX01BQ19PU19YX1ZFUlNJT05fTUFKT1JfMTBfMTMgPSAxMDEzMDA7CmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKaW5kZXgg YmEzMmE0NTlmNmE3YTlkZjM3Yjg3NGJlMGMzZTEyYjAxOWI1MTI3NC4uZTMwOWUwMTFlZDg5YTI0 MDY2YTIwNDEwOThmOGFlY2IzNGZiMDM5YiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwpAQCAtNzAsNyArNzAsNyBAQCBHQ0Nf V0FSTl9VTlVTRURfRlVOQ1RJT04gPSBZRVMKIEdDQ19XQVJOX1VOVVNFRF9WQVJJQUJMRSA9IFlF UwogR0NDX1dBUk5fNjRfVE9fMzJfQklUX0NPTlZFUlNJT05bYXJjaD1hcm02NCpdID0gTk87CiBH Q0NfV0FSTl82NF9UT18zMl9CSVRfQ09OVkVSU0lPTlthcmNoPXg4Nl82NF0gPSBOTzsKLVdBUk5J TkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVdjb25kaXRpb25hbC11bmluaXRpYWxpemVkIC1Xbm8tdW51 c2VkLXBhcmFtZXRlciAtV3VuZGVmOworV0FSTklOR19DRkxBR1MgPSAtV2FsbCAtVyAtV2NvbmRp dGlvbmFsLXVuaW5pdGlhbGl6ZWQgLVdmb3JtYXQ9MiAtV25vLXVudXNlZC1wYXJhbWV0ZXIgLVd1 bmRlZjsKIEdDQ19QUkVGSVhfSEVBREVSID0gV2ViS2l0VGVzdFJ1bm5lclByZWZpeC5oCiAKIERF QlVHX0RFRklORVMgPSBOREVCVUc7Cg==