84910 2012-04-25 17:08:03 -0700 nrwt: clean up server process, webkit driver so chromium can use it 2012-04-26 15:09:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tkent tony webkit.review.bot oldest_to_newest 610182 0 dpranke 2012-04-25 17:08:03 -0700 nrwt: clean up server process, webkit driver so chromium can use it 610192 1 138904 dpranke 2012-04-25 17:16:20 -0700 Created attachment 138904 Patch 610194 2 138905 dpranke 2012-04-25 17:18:50 -0700 Created attachment 138905 use correct baseline for patch 611023 3 dpranke 2012-04-26 15:09:40 -0700 Committed r115377: <http://trac.webkit.org/changeset/115377> 138904 2012-04-25 17:16:20 -0700 2012-04-25 17:18:42 -0700 Patch bug-84910-20120425171619.patch text/plain 17506 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGMwZjljMjJiYzFkYmI1NDE1YzU2Yjc5ODNmODhhNWE2 MzEwYmZjZC4uNjU2OTAyYzVkYzIxMGU5ZDBkYTMxMGZhOTRiNGE3NjQyNjQzYTYwMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcx IEBACisyMDEyLTA0LTI1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIHNlcnZlciBwcm9jZXNzLCB3ZWJraXQgZHJpdmVyIHNvIGNo cm9taXVtIGNhbiB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg0OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBjaGFuZ2UgbW92ZXMgdGhlICJzYW1wbGUgYSBwcm9jZXNzIiBsb2dpYyBv dXQgb2YKKyAgICAgICAgc2VydmVyX3Byb2Nlc3MucHkgYW5kIGludG8gYSBwb3J0LXNwZWNpZmlj IGNsYXNzICh3aGVyZSByZWFsbHkKKyAgICAgICAgb25seSB0aGUgbWFjIGhhcyBhbiBpbXBsZW1l bnRhdGlvbiksIGFuZCBhbHNvIHByZWVtcHRpdmVseSBraWxscworICAgICAgICBEUlQgd2hlbiBh IHRlc3QgdGltZXMgb3V0IGluIFdlYktpdERyaXZlciAocmF0aGVyIHRoYW4gd2FpdGluZyB0aHJv dWdoIHRoZQorICAgICAgICBhZGRpdGlvbmFsIGRlbGF5cyBjYXVzZWQgYnkgY2FsbGluZyBzdG9w KCkgd2hlbiB3ZSB3b3VsZCB3YW50IHRvCisgICAgICAgIHJlc3RhcnQgdGhlIGRyaXZlciBnZW5l cmljYWxseSBpbiB3b3JrZXIucHkpLgorCisgICAgICAgIFRoZXNlIGNoYW5nZXMgd2lsbCBtYWtl IGl0IHBvc3NpYmxlIGZvciB0aGUgY2hyb21pdW0gcG9ydCB0bworICAgICAgICBzd2l0Y2ggb3Zl ciB0byB0aGUgc3RvY2sgV2ViS2l0RHJpdmVyIGltcGxlbWVudGF0aW9uLCBhdCBsZWFzdAorICAg ICAgICBvbiBtYWMgYW5kIGxpbnV4LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5zYW1wbGVfcHJvY2Vzcyk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHk6CisgICAg ICAgIChNYWNQb3J0LnNhbXBsZV9wcm9jZXNzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfaGVscGVy X2ZhaWxzX3RvX3N0b3ApOgorICAgICAgICAodGVzdF9zYW1wbGVfcHJvY2Vzcyk6CisgICAgICAg ICh0ZXN0X3NhbXBsZV9wcm9jZXNzLmxvZ2dpbmdfcnVuX2NvbW1hbmQpOgorICAgICAgICAodGVz dF9zYW1wbGVfcHJvY2Vzc190aHJvd3NfZXhjZXB0aW9uKToKKyAgICAgICAgKHRlc3Rfc2FtcGxl X3Byb2Nlc3NfdGhyb3dzX2V4Y2VwdGlvbi50aHJvd2luZ19ydW5fY29tbWFuZCk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weToK KyAgICAgICAgKFNlcnZlclByb2Nlc3MuX2xvZyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9o YW5kbGVfdGltZW91dCk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLnN0b3ApOgorICAgICAgICAo U2VydmVyUHJvY2Vzcyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLmtpbGwpOiBIZXJlIHdlIGFk ZCBhIG1ldGhvZCB0byBpbW1lZGlhdGVseSBzdG9wCisgICAgICAgIHRoZSBwcm9jZXNzIHJhdGhl ciB0aGFuIHRyeWluZyB0byBzaHV0IGl0IGRvd24gY2xlYW5seS4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoVGVzdFNlcnZlclByb2Nlc3MudGVzdF9icm9rZW5fcGlwZSk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHk6CisgICAgICAgIChX ZWJLaXREcml2ZXIucnVuX3Rlc3QpOgorCisyMDEyLTA0LTI1ICBEaXJrIFByYW5rZSAgPGRwcmFu a2VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gY2hhbmdlIERSVCdzICJEUlQi IG91dHB1dCB0byBtYXRjaCB0aGUgb3RoZXIgcG9ydHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0OTA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2Ugd2UgcnVuIENocm9taXVtJ3MgRFJUIGluIC0t dGVzdC1zaGVsbCBtb2RlLCB0aGUKKyAgICAgICAgbm9uLXRlc3Qtc2hlbGwgb3V0cHV0IGhhcyBu ZXZlciBiZWVuIHJlYWxseSBiZWF0ZW4gb24gdG8gbWFrZQorICAgICAgICBzdXJlIGl0J3Mgcmln aHQuIFRoaXMgZml4ZXMgYSBmZXcgaXNzdWVzIGFuZCB3aWxsIGJlIHRlc3RlZAorICAgICAgICB3 aXRoIHVwY29taW5nIE5SV1QgY2hhbmdlcyB0aGF0J2xsIGxhbmQgaW4gYSBzZXBhcmF0ZSBwYXRj aC4KKyAgICAgICAgSW4gcGFydGljdWxhciB3ZSBzaG91bGQgbmV2ZXIgb3V0cHV0IGZyYW1pbmcg dGV4dCBsaWtlICJcbiIKKyAgICAgICAgb3IgIiNFT0YiIG91dHNpZGUgb2Ygc29tZXRoaW5nIG91 dHNpZGUgb2YgVGVzdEV2ZW50UHJpbnRlciwKKyAgICAgICAgYW5kIHdlIHdlcmVuJ3QgaGFuZGxp bmcgYXVkaW8gb3V0cHV0IHByb3Blcmx5IGF0IGFsbC4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwOgorICAgICAgICAoRFJUUHJpbnRlcik6 CisgICAgICAgIChUZXN0U2hlbGxQcmludGVyKToKKyAgICAgICAgKERSVFByaW50ZXI6OmhhbmRs ZVRleHRGb290ZXIpOgorICAgICAgICAoRFJUUHJpbnRlcjo6aGFuZGxlQXVkaW9Gb290ZXIpOgor ICAgICAgICAoRFJUUHJpbnRlcjo6aGFuZGxlVGVzdEZvb3Rlcik6CisgICAgICAgIChUZXN0U2hl bGxQcmludGVyOjpoYW5kbGVBdWRpb0Zvb3Rlcik6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdEV2ZW50UHJpbnRlci5oOgorICAgICAgICAoVGVzdEV2ZW50UHJpbnRlcik6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAg ICAgKFRlc3RTaGVsbDo6VGVzdFNoZWxsKToKKyAgICAgICAgKFRlc3RTaGVsbDo6ZHVtcCk6CisK IDIwMTItMDQtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMTUyMjIuCmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0RXZlbnRQcmludGVyLmNwcCBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwCmluZGV4IDgyNDZj MDliZTY0N2EzYmQ5MmY3ZDk2ODdlMGZhMDI2YWE4MWU2YjUuLjczMGQ3NmIyN2U0MzQ5NjY3OWZk ZGM1MWVlNjE1ZDczY2UxYjdmYmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RFdmVudFByaW50ZXIuY3BwCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIGhhbmRsZVRleHRIZWFkZXIoKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZVRleHRGb290 ZXIoKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZUF1ZGlvSGVhZGVyKCkgY29uc3Q7CisgICAgdm9p ZCBoYW5kbGVBdWRpb0Zvb3RlcigpIGNvbnN0OwogICAgIHZvaWQgaGFuZGxlSW1hZ2UoY29uc3Qg Y2hhciogYWN0dWFsSGFzaCwgY29uc3QgY2hhciogZXhwZWN0ZWRIYXNoLCBjb25zdCB1bnNpZ25l ZCBjaGFyKiBpbWFnZURhdGEsIHNpemVfdCBpbWFnZVNpemUsIGNvbnN0IGNoYXIqIGZpbGVOYW1l KSBjb25zdDsKICAgICB2b2lkIGhhbmRsZUltYWdlRm9vdGVyKCkgY29uc3Q7CiAgICAgdm9pZCBo YW5kbGVUZXN0Rm9vdGVyKGJvb2wgZHVtcGVkQW55dGhpbmcpIGNvbnN0OwpAQCAtNTYsNiArNTcs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCBoYW5kbGVUZXh0SGVhZGVyKCkgY29uc3Q7CiAgICAgdm9p ZCBoYW5kbGVUZXh0Rm9vdGVyKCkgY29uc3Q7CiAgICAgdm9pZCBoYW5kbGVBdWRpb0hlYWRlcigp IGNvbnN0OworICAgIHZvaWQgaGFuZGxlQXVkaW9Gb290ZXIoKSBjb25zdDsKICAgICB2b2lkIGhh bmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gsIGNvbnN0IGNoYXIqIGV4cGVjdGVkSGFz aCwgY29uc3QgdW5zaWduZWQgY2hhciogaW1hZ2VEYXRhLCBzaXplX3QgaW1hZ2VTaXplLCBjb25z dCBjaGFyKiBmaWxlTmFtZSkgY29uc3Q7CiAgICAgdm9pZCBoYW5kbGVJbWFnZUZvb3RlcigpIGNv bnN0OwogICAgIHZvaWQgaGFuZGxlVGVzdEZvb3Rlcihib29sIGR1bXBlZEFueXRoaW5nKSBjb25z dDsKQEAgLTk1LDYgKzk3LDcgQEAgdm9pZCBEUlRQcmludGVyOjpoYW5kbGVUZXh0SGVhZGVyKCkg Y29uc3QKIHZvaWQgRFJUUHJpbnRlcjo6aGFuZGxlVGV4dEZvb3RlcigpIGNvbnN0CiB7CiAgICAg cHJpbnRmKCIjRU9GXG4iKTsKKyAgICBmcHJpbnRmKHN0ZGVyciwgIiNFT0ZcbiIpOwogfQogCiB2 b2lkIERSVFByaW50ZXI6OmhhbmRsZUF1ZGlvSGVhZGVyKCkgY29uc3QKQEAgLTEwMiw2ICsxMDUs MTIgQEAgdm9pZCBEUlRQcmludGVyOjpoYW5kbGVBdWRpb0hlYWRlcigpIGNvbnN0CiAgICAgcHJp bnRmKCJDb250ZW50LVR5cGU6IGF1ZGlvL3dhdlxuIik7CiB9CiAKK3ZvaWQgRFJUUHJpbnRlcjo6 aGFuZGxlQXVkaW9Gb290ZXIoKSBjb25zdAoreworICAgIHByaW50ZigiI0VPRlxuIik7CisgICAg ZnByaW50ZihzdGRlcnIsICIjRU9GXG4iKTsKK30KKwogdm9pZCBEUlRQcmludGVyOjpoYW5kbGVJ bWFnZShjb25zdCBjaGFyKiBhY3R1YWxIYXNoLCBjb25zdCBjaGFyKiBleHBlY3RlZEhhc2gsIGNv bnN0IHVuc2lnbmVkIGNoYXIqIGltYWdlRGF0YSwgc2l6ZV90IGltYWdlU2l6ZSwgY29uc3QgY2hh ciopIGNvbnN0CiB7CiAgICAgQVNTRVJUKGFjdHVhbEhhc2gpOwpAQCAtMTE5LDEzICsxMjgsOSBA QCB2b2lkIERSVFByaW50ZXI6OmhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gsIGNv bnN0IGNoYXIqIGV4cGVjdGVkSGFzaCwgYwogICAgIH0KIH0KIAotdm9pZCBEUlRQcmludGVyOjpo YW5kbGVJbWFnZUZvb3RlcigpIGNvbnN0Ci17Ci0gICAgcHJpbnRmKCIjRU9GXG4iKTsKLX0KLQog dm9pZCBEUlRQcmludGVyOjpoYW5kbGVUZXN0Rm9vdGVyKGJvb2wpIGNvbnN0CiB7CisgICAgcHJp bnRmKCIjRU9GXG4iKTsKIH0KIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtMTUzLDYgKzE1OCwxMSBAQCB2b2lk IFRlc3RTaGVsbFByaW50ZXI6OmhhbmRsZUF1ZGlvSGVhZGVyKCkgY29uc3QKICAgICBwcmludGYo IkNvbnRlbnQtVHlwZTogYXVkaW8vd2F2XG4iKTsKIH0KIAordm9pZCBUZXN0U2hlbGxQcmludGVy OjpoYW5kbGVBdWRpb0Zvb3RlcigpIGNvbnN0Cit7CisgICAgcHJpbnRmKCJcbiIpOworfQorCiB2 b2lkIFRlc3RTaGVsbFByaW50ZXI6OmhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gs IGNvbnN0IGNoYXIqLCBjb25zdCB1bnNpZ25lZCBjaGFyKiBpbWFnZURhdGEsIHNpemVfdCBpbWFn ZVNpemUsIGNvbnN0IGNoYXIqIGZpbGVOYW1lKSBjb25zdAogewogICAgIEFTU0VSVChhY3R1YWxI YXNoKTsKQEAgLTE3MywxMCArMTgzLDYgQEAgdm9pZCBUZXN0U2hlbGxQcmludGVyOjpoYW5kbGVJ bWFnZShjb25zdCBjaGFyKiBhY3R1YWxIYXNoLCBjb25zdCBjaGFyKiwgY29uc3QgdW4KICAgICBw cmludGYoIiNNRDU6JXNcbiIsIGFjdHVhbEhhc2gpOwogfQogCi12b2lkIFRlc3RTaGVsbFByaW50 ZXI6OmhhbmRsZUltYWdlRm9vdGVyKCkgY29uc3QKLXsKLX0KLQogdm9pZCBUZXN0U2hlbGxQcmlu dGVyOjpoYW5kbGVUZXN0Rm9vdGVyKGJvb2wgZHVtcGVkQW55dGhpbmcpIGNvbnN0CiB7CiAgICAg aWYgKGR1bXBlZEFueXRoaW5nKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdEV2ZW50UHJpbnRlci5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v VGVzdEV2ZW50UHJpbnRlci5oCmluZGV4IGY2OTUyM2MzNGZhNmMxZTNjNjU1NDU3NDcxNDk2Nzk5 ZjAzZjNiNzcuLjM3NDgyN2UxODljYTlhYjE1ODlkNmJhMzZmNzlmYzQ4OTUyNjM4NDIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RFdmVudFByaW50ZXIuaAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0RXZlbnRQcmludGVyLmgKQEAg LTQ0LDggKzQ0LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVUZXh0SGVhZGVy KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVUZXh0Rm9vdGVyKCkgY29uc3Qg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVBdWRpb0hlYWRlcigpIGNvbnN0ID0gMDsKKyAg ICB2aXJ0dWFsIHZvaWQgaGFuZGxlQXVkaW9Gb290ZXIoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCB2b2lkIGhhbmRsZUltYWdlKGNvbnN0IGNoYXIqIGFjdHVhbEhhc2gsIGNvbnN0IGNoYXIqIGV4 cGVjdGVkSGFzaCwgY29uc3QgdW5zaWduZWQgY2hhciogaW1hZ2VEYXRhLCBzaXplX3QgaW1hZ2VT aXplLCBjb25zdCBjaGFyKiBmaWxlTmFtZSkgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBo YW5kbGVJbWFnZUZvb3RlcigpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlVGVz dEZvb3Rlcihib29sIGR1bXBlZEFueXRoaW5nKSBjb25zdCA9IDA7CiB9OwogCmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAppbmRleCAzOTNhM2I4Y2IzYWFiOWI3 YmZlZTVlZDI4OTEwZDg2MWNmMTMwMGMzLi4yZTAzNmYxYTk5YmU1YTU4N2RkOGIwZTkzOGUwMjUz YzIxNDc0MmQ2IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0 U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5j cHAKQEAgLTEyNyw3ICsxMjcsNyBAQCBUZXN0U2hlbGw6OlRlc3RTaGVsbCgpCiAgICAgV2ViUnVu dGltZUZlYXR1cmVzOjplbmFibGVFbmNyeXB0ZWRNZWRpYSh0cnVlKTsKICAgICBXZWJSdW50aW1l RmVhdHVyZXM6OmVuYWJsZU1lZGlhU3RyZWFtKHRydWUpOwogICAgIFdlYlJ1bnRpbWVGZWF0dXJl czo6ZW5hYmxlUGVlckNvbm5lY3Rpb24odHJ1ZSk7Ci0gICAgV2ViUnVudGltZUZlYXR1cmVzOjpl bmFibGVXZWJBdWRpbyh0cnVlKTsgCisgICAgV2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVXZWJB dWRpbyh0cnVlKTsKICAgICBXZWJSdW50aW1lRmVhdHVyZXM6OmVuYWJsZVZpZGVvVHJhY2sodHJ1 ZSk7CiAgICAgV2ViUnVudGltZUZlYXR1cmVzOjplbmFibGVHYW1lcGFkKHRydWUpOwogICAgIFdl YlJ1bnRpbWVGZWF0dXJlczo6ZW5hYmxlU2hhZG93RE9NKHRydWUpOwpAQCAtNTU2LDggKzU1Niw3 IEBAIHZvaWQgVGVzdFNoZWxsOjpkdW1wKCkKIAogICAgICAgICBpZiAoZndyaXRlKHdlYkFycmF5 QnVmZmVyVmlldy5iYXNlQWRkcmVzcygpLCAxLCB3ZWJBcnJheUJ1ZmZlclZpZXcuYnl0ZUxlbmd0 aCgpLCBzdGRvdXQpICE9IHdlYkFycmF5QnVmZmVyVmlldy5ieXRlTGVuZ3RoKCkpCiAgICAgICAg ICAgICBGQVRBTCgiU2hvcnQgd3JpdGUgdG8gc3Rkb3V0LCBkaXNrIGZ1bGw/XG4iKTsKLSAgICAg ICAgcHJpbnRmKCJcbiIpOwotCisgICAgICAgIG1fcHJpbnRlci0+aGFuZGxlQXVkaW9Gb290ZXIo KTsKICAgICAgICAgbV9wcmludGVyLT5oYW5kbGVUZXN0Rm9vdGVyKHRydWUpOwogCiAgICAgICAg IGZmbHVzaChzdGRvdXQpOwpAQCAtNjQyLDcgKzY0MSw2IEBAIHZvaWQgVGVzdFNoZWxsOjpkdW1w KCkKIAogICAgICAgICBkdW1wSW1hZ2UobV93ZWJWaWV3SG9zdC0+Y2FudmFzKCkpOwogICAgIH0K LSAgICBtX3ByaW50ZXItPmhhbmRsZUltYWdlRm9vdGVyKCk7CiAgICAgbV9wcmludGVyLT5oYW5k bGVUZXN0Rm9vdGVyKGR1bXBlZEFueXRoaW5nKTsKICAgICBmZmx1c2goc3Rkb3V0KTsKICAgICBm Zmx1c2goc3RkZXJyKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQppbmRleCA2YzQ1ZDlkZGNhZGZiYzIzNWEzZWNhNzU0ZmQ3NDM4ZjgxMWM1 MjRhLi5lYTkyMjViNzI3MGJlOTA3OGM2YzVlYjliNDNlOTliYTI5ODk1ODVhIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xMDgx LDYgKzEwODEsOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICAgICAnXG4nLmpvaW4o KCdTVERPVVQ6ICcgKyBsKSBmb3IgbCBpbiBzdGRvdXRfbGluZXMpLAogICAgICAgICAgICAgJ1xu Jy5qb2luKCgnU1RERVJSOiAnICsgbCkgZm9yIGwgaW4gc3RkZXJyX2xpbmVzKSkKIAorICAgIGRl ZiBzYW1wbGVfcHJvY2VzcyhzZWxmLCBuYW1lLCBwaWQpOgorICAgICAgICBwYXNzCisKICAgICBk ZWYgdmlydHVhbF90ZXN0X3N1aXRlcyhzZWxmKToKICAgICAgICAgcmV0dXJuIFtdCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKaW5kZXggYTYx MTQ1OGVkYjcxNzI3NDdkYzYzNWIwMDFlMmJmNGY4Y2ExNjU3Zi4uYTgxMjhkODIxNzVlNTk5NDE1 OTE1NDBlNDdmNzYzMmE0ZTcwY2Y5NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9tYWMucHkKQEAgLTMzLDYgKzMzLDcgQEAgaW1wb3J0IHN1YnByb2Nl c3MKIGltcG9ydCB0aW1lCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5jcmFzaGxvZ3Mg aW1wb3J0IENyYXNoTG9ncworZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBp bXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQuYXBwbGUg aW1wb3J0IEFwcGxlUG9ydAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5sZWFrZGV0 ZWN0b3IgaW1wb3J0IExlYWtEZXRlY3RvcgogCkBAIC0xOTgsNiArMTk5LDIwIEBAIGNsYXNzIE1h Y1BvcnQoQXBwbGVQb3J0KToKICAgICAgICAgICAgIF9sb2cud2FybmluZyhjcmFzaF9sb2cpCiAg ICAgICAgIHJldHVybiBjcmFzaF9sb2cKIAorICAgIGRlZiBzYW1wbGVfcHJvY2VzcyhzZWxmLCBu YW1lLCBwaWQpOgorICAgICAgICB0cnk6CisgICAgICAgICAgICBoYW5nX3JlcG9ydCA9IHNlbGYu X2ZpbGVzeXN0ZW0uam9pbihzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCksICIlcy0lcy5zYW1wbGUu dHh0IiAlIChuYW1lLCBwaWQpKQorICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21t YW5kKFsKKyAgICAgICAgICAgICAgICAiL3Vzci9iaW4vc2FtcGxlIiwKKyAgICAgICAgICAgICAg ICBwaWQsCisgICAgICAgICAgICAgICAgMTAsCisgICAgICAgICAgICAgICAgMTAsCisgICAgICAg ICAgICAgICAgIi1maWxlIiwKKyAgICAgICAgICAgICAgICBoYW5nX3JlcG9ydCwKKyAgICAgICAg ICAgIF0pCisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAgICAgICAgICAgIF9sb2cu d2FybmluZygnVW5hYmxlIHRvIHNhbXBsZSBwcm9jZXNzLicpCisKICAgICBkZWYgX3BhdGhfdG9f aGVscGVyKHNlbGYpOgogICAgICAgICBiaW5hcnlfbmFtZSA9ICdMYXlvdXRUZXN0SGVscGVyJwog ICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChiaW5hcnlfbmFtZSkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3Qu cHkKaW5kZXggYWUyZWVlNTJlNTM1YTgyOTg2ZTRkNzA3ZjdiZGFmMTg5OTFiYjk0OS4uMGI5YmNh OTc4ZjM4MTk4NjE1NGFjNDFmYmY3YWYzNzk1YmQwODI1YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkKQEAg LTMxLDcgKzMxLDcgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgcG9y dF90ZXN0Y2FzZQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW1fbW9jayBp bXBvcnQgTW9ja0ZpbGVTeXN0ZW0KIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRj YXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCiBmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wg aW1wb3J0IE1vY2tPcHRpb25zCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZl X21vY2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUsIE1vY2tQcm9jZXNzCitmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUsIE1vY2tFeGVj dXRpdmUyLCBNb2NrUHJvY2VzcywgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5zeXN0ZW1ob3N0X21vY2sgaW1wb3J0IE1vY2tTeXN0ZW1Ib3N0CiAKIApAQCAtMjM0LDMg KzIzNCwyMiBAQCBqYXZhLwogICAgICAgICBwb3J0LnN0YXJ0X2hlbHBlcigpCiAgICAgICAgIHBv cnQuc3RvcF9oZWxwZXIoKQogICAgICAgICBvYy5yZXN0b3JlX291dHB1dCgpCisKKyAgICBkZWYg dGVzdF9zYW1wbGVfcHJvY2VzcyhzZWxmKToKKworICAgICAgICBkZWYgbG9nZ2luZ19ydW5fY29t bWFuZChhcmdzKToKKyAgICAgICAgICAgIHByaW50IGFyZ3MKKworICAgICAgICBwb3J0ID0gc2Vs Zi5tYWtlX3BvcnQoKQorICAgICAgICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihy dW5fY29tbWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQorICAgICAgICBleHBlY3RlZF9zdGRv dXQgPSAiWycvdXNyL2Jpbi9zYW1wbGUnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stYnVp bGQvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLnNhbXBsZS50eHQnXVxuIgorICAgICAgICBP dXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2Vzcywg YXJncz1bJ3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCisKKyAg ICBkZWYgdGVzdF9zYW1wbGVfcHJvY2Vzc190aHJvd3NfZXhjZXB0aW9uKHNlbGYpOgorCisgICAg ICAgIGRlZiB0aHJvd2luZ19ydW5fY29tbWFuZChhcmdzKToKKyAgICAgICAgICAgIHJhaXNlIFNj cmlwdEVycm9yKCJNT0NLIHNjcmlwdCBlcnJvciIpCisKKyAgICAgICAgcG9ydCA9IHNlbGYubWFr ZV9wb3J0KCkKKyAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2Nv bW1hbmRfZm49dGhyb3dpbmdfcnVuX2NvbW1hbmQpCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5h c3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQy XSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv c2VydmVyX3Byb2Nlc3MucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3NlcnZlcl9wcm9jZXNzLnB5CmluZGV4IDI0NWI3N2E2YWM5YjdmYWZiZGM0MTNkZWZhM2Zi OWIxZTA4NTRhMzMuLmM1MGMwZTZlN2JiNTRiNjcxN2M5ZThjN2MwOTI0YzA3MjFiMGNjODcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVy X3Byb2Nlc3MucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9zZXJ2ZXJfcHJvY2Vzcy5weQpAQCAtMTc5LDI1ICsxNzksMTAgQEAgY2xhc3MgU2VydmVyUHJv Y2VzczoKICAgICAgICAgX2xvZy5pbmZvKCcnKQogICAgICAgICBfbG9nLmluZm8obWVzc2FnZSkK IAotICAgIGRlZiBfc2FtcGxlKHNlbGYpOgotICAgICAgICBpZiBzeXMucGxhdGZvcm0gIT0gImRh cndpbiI6Ci0gICAgICAgICAgICByZXR1cm4KLSAgICAgICAgdHJ5OgotICAgICAgICAgICAgaGFu Z19yZXBvcnQgPSBvcy5wYXRoLmpvaW4oc2VsZi5fcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpLCAi JXMtJXMuc2FtcGxlLnR4dCIgJSAoc2VsZi5fbmFtZSwgc2VsZi5fcHJvYy5waWQpKQotICAgICAg ICAgICAgc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsKLSAgICAgICAgICAgICAgICAiL3Vz ci9iaW4vc2FtcGxlIiwKLSAgICAgICAgICAgICAgICBzZWxmLl9wcm9jLnBpZCwKLSAgICAgICAg ICAgICAgICAxMCwKLSAgICAgICAgICAgICAgICAxMCwKLSAgICAgICAgICAgICAgICAiLWZpbGUi LAotICAgICAgICAgICAgICAgIGhhbmdfcmVwb3J0LAotICAgICAgICAgICAgXSkKLSAgICAgICAg ZXhjZXB0IFNjcmlwdEVycm9yLCBlOgotICAgICAgICAgICAgc2VsZi5fbG9nKCdVbmFibGUgdG8g c2FtcGxlIHByb2Nlc3MuJykKIAogICAgIGRlZiBfaGFuZGxlX3RpbWVvdXQoc2VsZik6CiAgICAg ICAgIHNlbGYudGltZWRfb3V0ID0gVHJ1ZQotICAgICAgICBzZWxmLl9zYW1wbGUoKQorICAgICAg ICBzZWxmLl9wb3J0LnNhbXBsZV9wcm9jZXNzKHNlbGYuX25hbWUsIHNlbGYuX3Byb2MucGlkKQog CiAgICAgZGVmIF9zcGxpdF9zdHJpbmdfYWZ0ZXJfaW5kZXgoc2VsZiwgc3RyaW5nLCBpbmRleCk6 CiAgICAgICAgIHJldHVybiBzdHJpbmdbOmluZGV4XSwgc3RyaW5nW2luZGV4Ol0KQEAgLTI3Nyw2 ICsyNjIsMTMgQEAgY2xhc3MgU2VydmVyUHJvY2VzczoKICAgICAgICAgICAgICAgICB0aW1lLnNs ZWVwKDAuMDEpCiAgICAgICAgICAgICBpZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBOb25lOgogICAg ICAgICAgICAgICAgIF9sb2cud2FybmluZygnc3RvcHBpbmcgJXMgdGltZWQgb3V0LCBraWxsaW5n IGl0JyAlIHNlbGYuX25hbWUpCi0gICAgICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtpbGxf cHJvY2VzcyhzZWxmLl9wcm9jLnBpZCkKKyAgICAgICAgICAgICAgICBzZWxmLmtpbGwoKQogICAg ICAgICAgICAgICAgIF9sb2cud2FybmluZygna2lsbGVkJykKICAgICAgICAgc2VsZi5fcmVzZXQo KQorCisgICAgZGVmIGtpbGwoc2VsZik6CisgICAgICAgIGlmIHNlbGYuX3Byb2M6CisgICAgICAg ICAgICBzZWxmLl9leGVjdXRpdmUua2lsbF9wcm9jZXNzKHNlbGYuX3Byb2MucGlkKQorICAgICAg ICAgICAgaWYgc2VsZi5fcHJvYy5wb2xsKCkgaXMgbm90IE5vbmU6CisgICAgICAgICAgICAgICAg c2VsZi5fcHJvYy53YWl0KCkKKyAgICAgICAgICAgIHNlbGYuX3Jlc2V0KCkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3Nf dW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Nl cnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5CmluZGV4IGYyYmM5OTY4NjUxNGUzYzQ2MTMzOTFhOTYx MzlmMTc4NGJlMDBiNjkuLmI0NWJhZDNhMjI4ZGM1YTA0M2U0OWZhM2ZmMTQ5ZjFjMTA0MDliMTIg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2Vy dmVyX3Byb2Nlc3NfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzc191bml0dGVzdC5weQpAQCAtMzUsMTMgKzM1LDYg QEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9ydCBNb2Nr RXhlY3V0aXZlMgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1w b3J0IE91dHB1dENhcHR1cmUKIAogCi1kZWYgX2xvZ2dpbmdfcnVuX2NvbW1hbmQoYXJncyk6Ci0g ICAgcHJpbnQgYXJncwotCi0KLWRlZiBfdGhyb3dpbmdfcnVuX2NvbW1hbmQoYXJncyk6Ci0gICAg cmFpc2UgU2NyaXB0RXJyb3IoIk1PQ0sgc2NyaXB0IGVycm9yIikKLQogCiBjbGFzcyBUcml2aWFs TW9ja1BvcnQob2JqZWN0KToKICAgICBkZWYgcmVzdWx0c19kaXJlY3Rvcnkoc2VsZik6CkBAIC05 MSwyMCArODQsMyBAQCBjbGFzcyBUZXN0U2VydmVyUHJvY2Vzcyh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZXJ2ZXJfcHJvY2Vzcy5oYXNfY3Jhc2hlZCgpKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZXJ2ZXJfcHJvY2Vzcy5fcHJvYywgTm9uZSkKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VydmVyX3Byb2Nlc3MuYnJva2VuX3BpcGVzLCBbc2Vy dmVyX3Byb2Nlc3Muc3RkaW5dKQotCi0gICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3Moc2VsZik6 Ci0gICAgICAgICMgQ3VycmVudGx5LCBzYW1wbGUtb24tdGltZW91dCBvbmx5IHdvcmtzIG9uIERh cndpbi4KLSAgICAgICAgaWYgc3lzLnBsYXRmb3JtICE9ICJkYXJ3aW4iOgotICAgICAgICAgICAg cmV0dXJuCi0gICAgICAgIHNlcnZlcl9wcm9jZXNzID0gRmFrZVNlcnZlclByb2Nlc3MocG9ydF9v Ymo9VHJpdmlhbE1vY2tQb3J0KCksIG5hbWU9InRlc3QiLCBjbWQ9WyJ0ZXN0Il0sIGV4ZWN1dGl2 ZT1Nb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj1fbG9nZ2luZ19ydW5fY29tbWFuZCkpCi0g ICAgICAgIHNlcnZlcl9wcm9jZXNzLl9wcm9jID0gTW9ja1Byb2Moc2VydmVyX3Byb2Nlc3MpCi0g ICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3NhbXBsZScsIDEsIDEwLCAxMCwg Jy1maWxlJywgJy9tb2NrLXJlc3VsdHMvdGVzdC0xLnNhbXBsZS50eHQnXVxuIgotICAgICAgICBP dXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgc2VydmVyX3Byb2Nlc3MuX3NhbXBs ZSwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKLQotICAgIGRlZiB0ZXN0X3NhbXBs ZV9wcm9jZXNzX3Rocm93c19leGNlcHRpb24oc2VsZik6Ci0gICAgICAgICMgQ3VycmVudGx5LCBz YW1wbGUtb24tdGltZW91dCBvbmx5IHdvcmtzIG9uIERhcndpbi4KLSAgICAgICAgaWYgc3lzLnBs YXRmb3JtICE9ICJkYXJ3aW4iOgotICAgICAgICAgICAgcmV0dXJuCi0gICAgICAgIHNlcnZlcl9w cm9jZXNzID0gRmFrZVNlcnZlclByb2Nlc3MocG9ydF9vYmo9VHJpdmlhbE1vY2tQb3J0KCksIG5h bWU9InRlc3QiLCBjbWQ9WyJ0ZXN0Il0sIGV4ZWN1dGl2ZT1Nb2NrRXhlY3V0aXZlMihydW5fY29t bWFuZF9mbj1fdGhyb3dpbmdfcnVuX2NvbW1hbmQpKQotICAgICAgICBzZXJ2ZXJfcHJvY2Vzcy5f cHJvYyA9IE1vY2tQcm9jKHNlcnZlcl9wcm9jZXNzKQotICAgICAgICBPdXRwdXRDYXB0dXJlKCku YXNzZXJ0X291dHB1dHMoc2VsZiwgc2VydmVyX3Byb2Nlc3MuX3NhbXBsZSkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKaW5kZXggYTkx YWY5YWQ2MDU1NDhiNjczY2I4OTBkNTI5ODEzMjhmNzJlY2YwOC4uNzlmOWFkMDhlNTVkZWU3M2Qz YjIyN2ZlOWI5YTM2YmMzOGJhZTliNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTU0Myw3ICs1NDMsNyBAQCBjbGFzcyBX ZWJLaXREcml2ZXIoRHJpdmVyKToKICAgICBkZWYgcnVuX3Rlc3Qoc2VsZiwgZHJpdmVyX2lucHV0 KToKICAgICAgICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCiAgICAgICAgIGlmIG5vdCBzZWxm Ll9zZXJ2ZXJfcHJvY2VzczoKLSAgICAgICAgICAgIHNlbGYuX3N0YXJ0KGRyaXZlcl9pbnB1dC5z aG91bGRfcnVuX3BpeGVsX3Rlc3QsIFtdKQorICAgICAgICAgICAgc2VsZi5fc3RhcnQoZHJpdmVy X2lucHV0LnNob3VsZF9ydW5fcGl4ZWxfdGVzdCwgZHJpdmVyX2lucHV0LmFyZ3MpCiAgICAgICAg IHNlbGYuZXJyb3JfZnJvbV90ZXN0ID0gc3RyKCkKICAgICAgICAgc2VsZi5lcnJfc2Vlbl9lb2Yg PSBGYWxzZQogCkBAIC01NjUsOSArNTY1LDE1IEBAIGNsYXNzIFdlYktpdERyaXZlcihEcml2ZXIp OgogICAgICAgICAgICAgY3Jhc2hfbG9nID0gc2VsZi5fcG9ydC5fZ2V0X2NyYXNoX2xvZyhzZWxm Ll9jcmFzaGVkX3Byb2Nlc3NfbmFtZSwgc2VsZi5fY3Jhc2hlZF9waWQsIHRleHQsIHNlbGYuZXJy b3JfZnJvbV90ZXN0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBuZXdlcl90aGFuPXN0YXJ0X3RpbWUpCiAKKyAgICAgICAgdGltZW91dCA9IHNlbGYu X3NlcnZlcl9wcm9jZXNzLnRpbWVkX291dAorICAgICAgICBpZiB0aW1lb3V0OgorICAgICAgICAg ICAgIyBEUlQgZG9lc24ndCBoYXZlIGEgYnVpbHQgaW4gdGltZXIgdG8gYWJvcnQgdGhlIHRlc3Qs IHNvIHdlIG1pZ2h0IGFzIHdlbGwKKyAgICAgICAgICAgICMga2lsbCB0aGUgcHJvY2VzcyBkaXJl Y3RseSBhbmQgbm90IHdhaXQgZm9yIGl0IHRvIHNodXQgZG93biBjbGVhbmx5IChzaW5jZSBpdCBt YXkgbm90KS4KKyAgICAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLmtpbGwoKQorCiAgICAg ICAgIHJldHVybiBEcml2ZXJPdXRwdXQodGV4dCwgaW1hZ2UsIGFjdHVhbF9pbWFnZV9oYXNoLCBh dWRpbywKICAgICAgICAgICAgIGNyYXNoPXNlbGYuaGFzX2NyYXNoZWQoKSwgdGVzdF90aW1lPXRp bWUudGltZSgpIC0gc3RhcnRfdGltZSwKLSAgICAgICAgICAgIHRpbWVvdXQ9c2VsZi5fc2VydmVy X3Byb2Nlc3MudGltZWRfb3V0LCBlcnJvcj1zZWxmLmVycm9yX2Zyb21fdGVzdCwKKyAgICAgICAg ICAgIHRpbWVvdXQ9dGltZW91dCwgZXJyb3I9c2VsZi5lcnJvcl9mcm9tX3Rlc3QsCiAgICAgICAg ICAgICBjcmFzaGVkX3Byb2Nlc3NfbmFtZT1zZWxmLl9jcmFzaGVkX3Byb2Nlc3NfbmFtZSwKICAg ICAgICAgICAgIGNyYXNoZWRfcGlkPXNlbGYuX2NyYXNoZWRfcGlkLCBjcmFzaF9sb2c9Y3Jhc2hf bG9nKQogCg== 138905 2012-04-25 17:18:50 -0700 2012-04-25 19:07:53 -0700 use correct baseline for patch bug-84910-20120425171849.patch text/plain 11658 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTU0MGI1Y2IwNTU0YTIyMjdlZjg3MWMwNTdiYmI5MThm M2VhNjVlNy4uOGRlN2YzMWI5OWY3OGYyZjY4YzlmNDQ3MjMxZGQ4ZDIyMzdkYmZmZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ3 IEBACiAyMDEyLTA0LTI1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIHNlcnZlciBwcm9jZXNzLCB3ZWJraXQgZHJpdmVyIHNvIGNo cm9taXVtIGNhbiB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg0OTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBjaGFuZ2UgbW92ZXMgdGhlICJzYW1wbGUgYSBwcm9jZXNzIiBsb2dpYyBv dXQgb2YKKyAgICAgICAgc2VydmVyX3Byb2Nlc3MucHkgYW5kIGludG8gYSBwb3J0LXNwZWNpZmlj IGNsYXNzICh3aGVyZSByZWFsbHkKKyAgICAgICAgb25seSB0aGUgbWFjIGhhcyBhbiBpbXBsZW1l bnRhdGlvbiksIGFuZCBhbHNvIHByZWVtcHRpdmVseSBraWxscworICAgICAgICBEUlQgd2hlbiBh IHRlc3QgdGltZXMgb3V0IGluIFdlYktpdERyaXZlciAocmF0aGVyIHRoYW4gd2FpdGluZyB0aHJv dWdoIHRoZQorICAgICAgICBhZGRpdGlvbmFsIGRlbGF5cyBjYXVzZWQgYnkgY2FsbGluZyBzdG9w KCkgd2hlbiB3ZSB3b3VsZCB3YW50IHRvCisgICAgICAgIHJlc3RhcnQgdGhlIGRyaXZlciBnZW5l cmljYWxseSBpbiB3b3JrZXIucHkpLgorCisgICAgICAgIFRoZXNlIGNoYW5nZXMgd2lsbCBtYWtl IGl0IHBvc3NpYmxlIGZvciB0aGUgY2hyb21pdW0gcG9ydCB0bworICAgICAgICBzd2l0Y2ggb3Zl ciB0byB0aGUgc3RvY2sgV2ViS2l0RHJpdmVyIGltcGxlbWVudGF0aW9uLCBhdCBsZWFzdAorICAg ICAgICBvbiBtYWMgYW5kIGxpbnV4LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5zYW1wbGVfcHJvY2Vzcyk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHk6CisgICAg ICAgIChNYWNQb3J0LnNhbXBsZV9wcm9jZXNzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfaGVscGVy X2ZhaWxzX3RvX3N0b3ApOgorICAgICAgICAodGVzdF9zYW1wbGVfcHJvY2Vzcyk6CisgICAgICAg ICh0ZXN0X3NhbXBsZV9wcm9jZXNzLmxvZ2dpbmdfcnVuX2NvbW1hbmQpOgorICAgICAgICAodGVz dF9zYW1wbGVfcHJvY2Vzc190aHJvd3NfZXhjZXB0aW9uKToKKyAgICAgICAgKHRlc3Rfc2FtcGxl X3Byb2Nlc3NfdGhyb3dzX2V4Y2VwdGlvbi50aHJvd2luZ19ydW5fY29tbWFuZCk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weToK KyAgICAgICAgKFNlcnZlclByb2Nlc3MuX2xvZyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9o YW5kbGVfdGltZW91dCk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLnN0b3ApOgorICAgICAgICAo U2VydmVyUHJvY2Vzcyk6CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLmtpbGwpOiBIZXJlIHdlIGFk ZCBhIG1ldGhvZCB0byBpbW1lZGlhdGVseSBzdG9wCisgICAgICAgIHRoZSBwcm9jZXNzIHJhdGhl ciB0aGFuIHRyeWluZyB0byBzaHV0IGl0IGRvd24gY2xlYW5seS4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoVGVzdFNlcnZlclByb2Nlc3MudGVzdF9icm9rZW5fcGlwZSk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHk6CisgICAgICAgIChX ZWJLaXREcml2ZXIucnVuX3Rlc3QpOiBGaXggYW4gaXNzdWUgd2hlcmUgd2Ugd2VyZW4ndCBwYXNz aW5nCisgICAgICAgIGFsb25nIGFueSBwZXItdGVzdCBhcmdzIChvbmx5IG5lZWRlZCBmb3IgQ2hy b21pdW0sIGJ1dCBzdGlsbCkuCisgICAgICAgIEFsc28sIGtpbGwgdGhlIGRyaXZlciBpbW1lZGlh dGVseSBpZiB3ZSB0aW1lIG91dCBhIHRlc3QuCisKKzIwMTItMDQtMjUgIERpcmsgUHJhbmtlICA8 ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW2Nocm9taXVtXSBjaGFuZ2UgRFJUJ3Mg IkRSVCIgb3V0cHV0IHRvIG1hdGNoIHRoZSBvdGhlciBwb3J0cwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5MDQKIApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDZjNDVkOWRkY2FkZmJj MjM1YTNlY2E3NTRmZDc0MzhmODExYzUyNGEuLmVhOTIyNWI3MjcwYmU5MDc4YzZjNWViOWI0M2U5 OWJhMjk4OTU4NWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Jhc2UucHkKQEAgLTEwODEsNiArMTA4MSw5IEBAIGNsYXNzIFBvcnQob2JqZWN0KToK ICAgICAgICAgICAgICdcbicuam9pbigoJ1NURE9VVDogJyArIGwpIGZvciBsIGluIHN0ZG91dF9s aW5lcyksCiAgICAgICAgICAgICAnXG4nLmpvaW4oKCdTVERFUlI6ICcgKyBsKSBmb3IgbCBpbiBz dGRlcnJfbGluZXMpKQogCisgICAgZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCk6 CisgICAgICAgIHBhc3MKKwogICAgIGRlZiB2aXJ0dWFsX3Rlc3Rfc3VpdGVzKHNlbGYpOgogICAg ICAgICByZXR1cm4gW10KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L21hYy5weQppbmRleCBhNjExNDU4ZWRiNzE3Mjc0N2RjNjM1YjAwMWUyYmY0ZjhjYTE2 NTdmLi5hODEyOGQ4MjE3NWU1OTk0MTU5MTU0MGU0N2Y3NjMyYTRlNzBjZjk0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtMzMsNiAr MzMsNyBAQCBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHRpbWUKIAogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmNyYXNobG9ncyBpbXBvcnQgQ3Jhc2hMb2dzCitmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMucG9ydC5hcHBsZSBpbXBvcnQgQXBwbGVQb3J0CiBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cy5wb3J0LmxlYWtkZXRlY3RvciBpbXBvcnQgTGVha0RldGVjdG9yCiAKQEAgLTE5 OCw2ICsxOTksMjAgQEAgY2xhc3MgTWFjUG9ydChBcHBsZVBvcnQpOgogICAgICAgICAgICAgX2xv Zy53YXJuaW5nKGNyYXNoX2xvZykKICAgICAgICAgcmV0dXJuIGNyYXNoX2xvZwogCisgICAgZGVm IHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCk6CisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIGhhbmdfcmVwb3J0ID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYucmVzdWx0c19kaXJl Y3RvcnkoKSwgIiVzLSVzLnNhbXBsZS50eHQiICUgKG5hbWUsIHBpZCkpCisgICAgICAgICAgICBz ZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWworICAgICAgICAgICAgICAgICIvdXNyL2Jpbi9z YW1wbGUiLAorICAgICAgICAgICAgICAgIHBpZCwKKyAgICAgICAgICAgICAgICAxMCwKKyAgICAg ICAgICAgICAgICAxMCwKKyAgICAgICAgICAgICAgICAiLWZpbGUiLAorICAgICAgICAgICAgICAg IGhhbmdfcmVwb3J0LAorICAgICAgICAgICAgXSkKKyAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9y LCBlOgorICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdVbmFibGUgdG8gc2FtcGxlIHByb2Nlc3Mu JykKKwogICAgIGRlZiBfcGF0aF90b19oZWxwZXIoc2VsZik6CiAgICAgICAgIGJpbmFyeV9uYW1l ID0gJ0xheW91dFRlc3RIZWxwZXInCiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGJp bmFyeV9uYW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQppbmRleCBhZTJlZWU1MmU1MzVhODI5ODZlNGQ3MDdm N2JkYWYxODk5MWJiOTQ5Li4wYjliY2E5NzhmMzgxOTg2MTU0YWM0MWZiZjdhZjM3OTViZDA4MjVi IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21h Y191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hY191bml0dGVzdC5weQpAQCAtMzEsNyArMzEsNyBAQCBmcm9tIHdlYmtpdHB5LmxheW91 dF90ZXN0cy5wb3J0IGltcG9ydCBwb3J0X3Rlc3RjYXNlCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQogZnJvbSB3ZWJraXRw eS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKIGZyb20g d2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMKLWZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4ZWN1dGl2ZSwgTW9ja1By b2Nlc3MKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQg TW9ja0V4ZWN1dGl2ZSwgTW9ja0V4ZWN1dGl2ZTIsIE1vY2tQcm9jZXNzLCBTY3JpcHRFcnJvcgog ZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5 c3RlbUhvc3QKIAogCkBAIC0yMzQsMyArMjM0LDIyIEBAIGphdmEvCiAgICAgICAgIHBvcnQuc3Rh cnRfaGVscGVyKCkKICAgICAgICAgcG9ydC5zdG9wX2hlbHBlcigpCiAgICAgICAgIG9jLnJlc3Rv cmVfb3V0cHV0KCkKKworICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNzKHNlbGYpOgorCisgICAg ICAgIGRlZiBsb2dnaW5nX3J1bl9jb21tYW5kKGFyZ3MpOgorICAgICAgICAgICAgcHJpbnQgYXJn cworCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBvcnQuX2V4ZWN1 dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdfcnVuX2NvbW1hbmQp CisgICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3NhbXBsZScsIDQyLCAxMCwg MTAsICctZmlsZScsICcvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDIuc2Ft cGxlLnR4dCddXG4iCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxm LCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQyXSwgZXhwZWN0ZWRfc3Rkb3V0 PWV4cGVjdGVkX3N0ZG91dCkKKworICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNzX3Rocm93c19l eGNlcHRpb24oc2VsZik6CisKKyAgICAgICAgZGVmIHRocm93aW5nX3J1bl9jb21tYW5kKGFyZ3Mp OgorICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IoIk1PQ0sgc2NyaXB0IGVycm9yIikKKwor ICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAgICAgICBwb3J0Ll9leGVjdXRpdmUg PSBNb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj10aHJvd2luZ19ydW5fY29tbWFuZCkKKyAg ICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3By b2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3MucHkKaW5kZXggMjQ1Yjc3 YTZhYzliN2ZhZmJkYzQxM2RlZmEzZmI5YjFlMDg1NGEzMy4uYzUwYzBlNmU3YmI1NGI2NzE3Yzll OGM3YzA5MjRjMDcyMWIwY2M4NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CkBAIC0xNzksMjUgKzE3 OSwxMCBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzOgogICAgICAgICBfbG9nLmluZm8oJycpCiAgICAg ICAgIF9sb2cuaW5mbyhtZXNzYWdlKQogCi0gICAgZGVmIF9zYW1wbGUoc2VsZik6Ci0gICAgICAg IGlmIHN5cy5wbGF0Zm9ybSAhPSAiZGFyd2luIjoKLSAgICAgICAgICAgIHJldHVybgotICAgICAg ICB0cnk6Ci0gICAgICAgICAgICBoYW5nX3JlcG9ydCA9IG9zLnBhdGguam9pbihzZWxmLl9wb3J0 LnJlc3VsdHNfZGlyZWN0b3J5KCksICIlcy0lcy5zYW1wbGUudHh0IiAlIChzZWxmLl9uYW1lLCBz ZWxmLl9wcm9jLnBpZCkpCi0gICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQo WwotICAgICAgICAgICAgICAgICIvdXNyL2Jpbi9zYW1wbGUiLAotICAgICAgICAgICAgICAgIHNl bGYuX3Byb2MucGlkLAotICAgICAgICAgICAgICAgIDEwLAotICAgICAgICAgICAgICAgIDEwLAot ICAgICAgICAgICAgICAgICItZmlsZSIsCi0gICAgICAgICAgICAgICAgaGFuZ19yZXBvcnQsCi0g ICAgICAgICAgICBdKQotICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6Ci0gICAgICAgICAg ICBzZWxmLl9sb2coJ1VuYWJsZSB0byBzYW1wbGUgcHJvY2Vzcy4nKQogCiAgICAgZGVmIF9oYW5k bGVfdGltZW91dChzZWxmKToKICAgICAgICAgc2VsZi50aW1lZF9vdXQgPSBUcnVlCi0gICAgICAg IHNlbGYuX3NhbXBsZSgpCisgICAgICAgIHNlbGYuX3BvcnQuc2FtcGxlX3Byb2Nlc3Moc2VsZi5f bmFtZSwgc2VsZi5fcHJvYy5waWQpCiAKICAgICBkZWYgX3NwbGl0X3N0cmluZ19hZnRlcl9pbmRl eChzZWxmLCBzdHJpbmcsIGluZGV4KToKICAgICAgICAgcmV0dXJuIHN0cmluZ1s6aW5kZXhdLCBz dHJpbmdbaW5kZXg6XQpAQCAtMjc3LDYgKzI2MiwxMyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzOgog ICAgICAgICAgICAgICAgIHRpbWUuc2xlZXAoMC4wMSkKICAgICAgICAgICAgIGlmIHNlbGYuX3By b2MucG9sbCgpIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdzdG9wcGlu ZyAlcyB0aW1lZCBvdXQsIGtpbGxpbmcgaXQnICUgc2VsZi5fbmFtZSkKLSAgICAgICAgICAgICAg ICBzZWxmLl9leGVjdXRpdmUua2lsbF9wcm9jZXNzKHNlbGYuX3Byb2MucGlkKQorICAgICAgICAg ICAgICAgIHNlbGYua2lsbCgpCiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdraWxsZWQn KQogICAgICAgICBzZWxmLl9yZXNldCgpCisKKyAgICBkZWYga2lsbChzZWxmKToKKyAgICAgICAg aWYgc2VsZi5fcHJvYzoKKyAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5raWxsX3Byb2Nlc3Mo c2VsZi5fcHJvYy5waWQpCisgICAgICAgICAgICBpZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3Qg Tm9uZToKKyAgICAgICAgICAgICAgICBzZWxmLl9wcm9jLndhaXQoKQorICAgICAgICAgICAgc2Vs Zi5fcmVzZXQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3NfdW5pdHRlc3QucHkKaW5kZXggZjJi Yzk5Njg2NTE0ZTNjNDYxMzM5MWE5NjEzOWYxNzg0YmUwMGI2OS4uYjQ1YmFkM2EyMjhkYzVhMDQz ZTQ5ZmEzZmYxNDlmMWMxMDQwOWIxMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzc191bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzX3VuaXR0 ZXN0LnB5CkBAIC0zNSwxMyArMzUsNiBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhl Y3V0aXZlX21vY2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUyCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogCiAKLWRlZiBfbG9nZ2lu Z19ydW5fY29tbWFuZChhcmdzKToKLSAgICBwcmludCBhcmdzCi0KLQotZGVmIF90aHJvd2luZ19y dW5fY29tbWFuZChhcmdzKToKLSAgICByYWlzZSBTY3JpcHRFcnJvcigiTU9DSyBzY3JpcHQgZXJy b3IiKQotCiAKIGNsYXNzIFRyaXZpYWxNb2NrUG9ydChvYmplY3QpOgogICAgIGRlZiByZXN1bHRz X2RpcmVjdG9yeShzZWxmKToKQEAgLTkxLDIwICs4NCwzIEBAIGNsYXNzIFRlc3RTZXJ2ZXJQcm9j ZXNzKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlcnZlcl9w cm9jZXNzLmhhc19jcmFzaGVkKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlcnZlcl9w cm9jZXNzLl9wcm9jLCBOb25lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZXJ2ZXJfcHJv Y2Vzcy5icm9rZW5fcGlwZXMsIFtzZXJ2ZXJfcHJvY2Vzcy5zdGRpbl0pCi0KLSAgICBkZWYgdGVz dF9zYW1wbGVfcHJvY2VzcyhzZWxmKToKLSAgICAgICAgIyBDdXJyZW50bHksIHNhbXBsZS1vbi10 aW1lb3V0IG9ubHkgd29ya3Mgb24gRGFyd2luLgotICAgICAgICBpZiBzeXMucGxhdGZvcm0gIT0g ImRhcndpbiI6Ci0gICAgICAgICAgICByZXR1cm4KLSAgICAgICAgc2VydmVyX3Byb2Nlc3MgPSBG YWtlU2VydmVyUHJvY2Vzcyhwb3J0X29iaj1Ucml2aWFsTW9ja1BvcnQoKSwgbmFtZT0idGVzdCIs IGNtZD1bInRlc3QiXSwgZXhlY3V0aXZlPU1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPV9s b2dnaW5nX3J1bl9jb21tYW5kKSkKLSAgICAgICAgc2VydmVyX3Byb2Nlc3MuX3Byb2MgPSBNb2Nr UHJvYyhzZXJ2ZXJfcHJvY2VzcykKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9i aW4vc2FtcGxlJywgMSwgMTAsIDEwLCAnLWZpbGUnLCAnL21vY2stcmVzdWx0cy90ZXN0LTEuc2Ft cGxlLnR4dCddXG4iCi0gICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxm LCBzZXJ2ZXJfcHJvY2Vzcy5fc2FtcGxlLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0 KQotCi0gICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3NfdGhyb3dzX2V4Y2VwdGlvbihzZWxmKToK LSAgICAgICAgIyBDdXJyZW50bHksIHNhbXBsZS1vbi10aW1lb3V0IG9ubHkgd29ya3Mgb24gRGFy d2luLgotICAgICAgICBpZiBzeXMucGxhdGZvcm0gIT0gImRhcndpbiI6Ci0gICAgICAgICAgICBy ZXR1cm4KLSAgICAgICAgc2VydmVyX3Byb2Nlc3MgPSBGYWtlU2VydmVyUHJvY2Vzcyhwb3J0X29i aj1Ucml2aWFsTW9ja1BvcnQoKSwgbmFtZT0idGVzdCIsIGNtZD1bInRlc3QiXSwgZXhlY3V0aXZl PU1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPV90aHJvd2luZ19ydW5fY29tbWFuZCkpCi0g ICAgICAgIHNlcnZlcl9wcm9jZXNzLl9wcm9jID0gTW9ja1Byb2Moc2VydmVyX3Byb2Nlc3MpCi0g ICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZXJ2ZXJfcHJvY2Vz cy5fc2FtcGxlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC93ZWJraXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dlYmtpdC5weQppbmRleCBhOTFhZjlhZDYwNTU0OGI2NzNjYjg5MGQ1Mjk4MTMyOGY3MmVj ZjA4Li43OWY5YWQwOGU1NWRlZTczZDNiMjI3ZmU5YjlhMzZiYzM4YmFlOWI1IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAt NTQzLDcgKzU0Myw3IEBAIGNsYXNzIFdlYktpdERyaXZlcihEcml2ZXIpOgogICAgIGRlZiBydW5f dGVzdChzZWxmLCBkcml2ZXJfaW5wdXQpOgogICAgICAgICBzdGFydF90aW1lID0gdGltZS50aW1l KCkKICAgICAgICAgaWYgbm90IHNlbGYuX3NlcnZlcl9wcm9jZXNzOgotICAgICAgICAgICAgc2Vs Zi5fc3RhcnQoZHJpdmVyX2lucHV0LnNob3VsZF9ydW5fcGl4ZWxfdGVzdCwgW10pCisgICAgICAg ICAgICBzZWxmLl9zdGFydChkcml2ZXJfaW5wdXQuc2hvdWxkX3J1bl9waXhlbF90ZXN0LCBkcml2 ZXJfaW5wdXQuYXJncykKICAgICAgICAgc2VsZi5lcnJvcl9mcm9tX3Rlc3QgPSBzdHIoKQogICAg ICAgICBzZWxmLmVycl9zZWVuX2VvZiA9IEZhbHNlCiAKQEAgLTU2NSw5ICs1NjUsMTUgQEAgY2xh c3MgV2ViS2l0RHJpdmVyKERyaXZlcik6CiAgICAgICAgICAgICBjcmFzaF9sb2cgPSBzZWxmLl9w b3J0Ll9nZXRfY3Jhc2hfbG9nKHNlbGYuX2NyYXNoZWRfcHJvY2Vzc19uYW1lLCBzZWxmLl9jcmFz aGVkX3BpZCwgdGV4dCwgc2VsZi5lcnJvcl9mcm9tX3Rlc3QsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ld2VyX3RoYW49c3RhcnRfdGltZSkKIAor ICAgICAgICB0aW1lb3V0ID0gc2VsZi5fc2VydmVyX3Byb2Nlc3MudGltZWRfb3V0CisgICAgICAg IGlmIHRpbWVvdXQ6CisgICAgICAgICAgICAjIERSVCBkb2Vzbid0IGhhdmUgYSBidWlsdCBpbiB0 aW1lciB0byBhYm9ydCB0aGUgdGVzdCwgc28gd2UgbWlnaHQgYXMgd2VsbAorICAgICAgICAgICAg IyBraWxsIHRoZSBwcm9jZXNzIGRpcmVjdGx5IGFuZCBub3Qgd2FpdCBmb3IgaXQgdG8gc2h1dCBk b3duIGNsZWFubHkgKHNpbmNlIGl0IG1heSBub3QpLgorICAgICAgICAgICAgc2VsZi5fc2VydmVy X3Byb2Nlc3Mua2lsbCgpCisKICAgICAgICAgcmV0dXJuIERyaXZlck91dHB1dCh0ZXh0LCBpbWFn ZSwgYWN0dWFsX2ltYWdlX2hhc2gsIGF1ZGlvLAogICAgICAgICAgICAgY3Jhc2g9c2VsZi5oYXNf Y3Jhc2hlZCgpLCB0ZXN0X3RpbWU9dGltZS50aW1lKCkgLSBzdGFydF90aW1lLAotICAgICAgICAg ICAgdGltZW91dD1zZWxmLl9zZXJ2ZXJfcHJvY2Vzcy50aW1lZF9vdXQsIGVycm9yPXNlbGYuZXJy b3JfZnJvbV90ZXN0LAorICAgICAgICAgICAgdGltZW91dD10aW1lb3V0LCBlcnJvcj1zZWxmLmVy cm9yX2Zyb21fdGVzdCwKICAgICAgICAgICAgIGNyYXNoZWRfcHJvY2Vzc19uYW1lPXNlbGYuX2Ny YXNoZWRfcHJvY2Vzc19uYW1lLAogICAgICAgICAgICAgY3Jhc2hlZF9waWQ9c2VsZi5fY3Jhc2hl ZF9waWQsIGNyYXNoX2xvZz1jcmFzaF9sb2cpCiAK