89242 2012-06-15 13:02:04 -0700 [File API] FileReader should work in sandbox iframe 2022-10-25 15:14:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli abarth ahmad.saleem792 oldest_to_newest 650441 0 jianli 2012-06-15 13:02:04 -0700 Now FileReader works in file URL document. We should also make it work in sandbox iframe. 650457 1 147887 jianli 2012-06-15 13:32:02 -0700 Created attachment 147887 Patch 650470 2 147887 abarth 2012-06-15 13:51:47 -0700 Comment on attachment 147887 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147887&action=review > Source/WebCore/page/SecurityOrigin.cpp:307 > + RefPtr<SecurityOrigin> targetOrigin = SecurityOrigin::create(url); Should we really declare RefPtr<SecurityOrigin> here? 650481 3 abarth 2012-06-15 14:01:55 -0700 Won't that shadow the outer declaration? 650484 4 jianli 2012-06-15 14:03:10 -0700 (In reply to comment #3) > Won't that shadow the outer declaration? My bad. Should remove this. 650485 5 147894 jianli 2012-06-15 14:03:54 -0700 Created attachment 147894 Patch 650486 6 147887 abarth 2012-06-15 14:05:45 -0700 Comment on attachment 147887 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147887&action=review > Source/WebCore/page/SecurityOrigin.cpp:302 > + RefPtr<SecurityOrigin> targetOrigin = getCachedOrigin(url); I would actually write this function slightly different. Here's what I would do: if (m_universalAccess) return true; if (getCachedOrigin(url) == this) return true; ... then leave the rest of the function the same. 650488 7 abarth 2012-06-15 14:06:46 -0700 That's the smallest change to this function that has the desired effect. 650496 8 147897 jianli 2012-06-15 14:15:45 -0700 Created attachment 147897 Patch Thanks for suggestion. 650514 9 147897 abarth 2012-06-15 14:33:21 -0700 Comment on attachment 147897 Patch Thanks! 1908264 10 ahmad.saleem792 2022-10-25 15:14:10 -0700 Landed and didn't backed out - https://github.com/WebKit/WebKit/commit/b9a27eaf7dd51ffc2fd80742bc435d179d80f17e Marking this as "RESOLVED FIXED". 147887 2012-06-15 13:32:02 -0700 2012-06-15 14:05:45 -0700 Patch 89242.diff text/plain 6808 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYWM0YzFjLi4zZmM2ZGY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYt MTUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtGaWxlIEFQSV0g RmlsZVJlYWRlciBzaG91bGQgd29yayBpbiBzYW5kYm94IGlmcmFtZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyNDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZmlsZXMvZmlsZS1yZWFkZXIt ZmlsZS11cmwuaHRtbDoKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gt aWZyYW1lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9maWxlcy9maWxlLXJl YWRlci1zYW5kYm94LWlmcmFtZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZpbGVzL3Jl c291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWw6IFJlbmFtZWQgZnJvbSBMYXlvdXRUZXN0cy9m YXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbC4KKwog MjAxMi0wNi0xNSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIENsZWFudXAgZW1wdHkgYW5vbnltb3VzIGJsb2NrIGNvbnRpbnVhdGlvbi4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItZmlsZS11cmwuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItZmlsZS11cmwuaHRtbAppbmRleCA2NjYw NThjLi42ZTdlZTlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVh ZGVyLWZpbGUtdXJsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRl ci1maWxlLXVybC5odG1sCkBAIC0xMCw3ICsxMCw3IEBAIGlmICh3aW5kb3cubGF5b3V0VGVzdENv bnRyb2xsZXIpIHsKIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+Ci08aWZyYW1lIHNyYz0icmVz b3VyY2VzL2ZpbGUtcmVhZGVyLWZpbGUtdXJsLWlmcmFtZS5odG1sIj48L2lmcmFtZT4KKzxpZnJh bWUgc3JjPSJyZXNvdXJjZXMvZmlsZS1yZWFkZXItcmVhbC5odG1sIj48L2lmcmFtZT4KIDxkaXYg aWQ9InJlc3VsdHMiPjwvZGl2PgogVGVzdCB0aGF0IEZpbGVSZWFkZXIgd29ya3MgdW5kZXIgdGhl IGZpbGUgVVJMIHdpdGggZmlsZSBwYXRoIHNlcGFyYXRpb24gZW5mb3JjZWQuCiA8L2JvZHk+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gtaWZy YW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItc2Fu ZGJveC1pZnJhbWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjMxZDAyOGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2Zp bGUtcmVhZGVyLXNhbmRib3gtaWZyYW1lLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKK0NP TlNPTEUgTUVTU0FHRTogbGluZSA5OiBSZWNlaXZlZCBkYXRhOiAwMTIzNDU2Nzg5CisKK1Rlc3Qg dGhhdCBGaWxlUmVhZGVyIHdvcmtzIHVuZGVyIHRoZSBzYW5kYm94ZWQgaWZyYW1lLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1zYW5kYm94LWlmcmFtZS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1zYW5kYm94LWlmcmFtZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEwZWJkMmQKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gtaWZy YW1lLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoZmFsc2UpOworICAgIGxheW91dFRl c3RDb250cm9sbGVyLnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhmYWxzZSk7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9s bGVyLndhaXRVbnRpbERvbmUoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8aWZy YW1lIHNyYz0icmVzb3VyY2VzL2ZpbGUtcmVhZGVyLXJlYWwuaHRtbCIgc2FuZGJveD0iYWxsb3ct c2NyaXB0cyI+PC9pZnJhbWU+Cis8ZGl2IGlkPSJyZXN1bHRzIj48L2Rpdj4KK1Rlc3QgdGhhdCBG aWxlUmVhZGVyIHdvcmtzIHVuZGVyIHRoZSBzYW5kYm94ZWQgaWZyYW1lLgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9yZXNvdXJjZXMvZmlsZS1y ZWFkZXItZmlsZS11cmwtaWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291 cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggNTFmY2M2OS4uMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVz L3Jlc291cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbAorKysgL2Rldi9udWxs CkBAIC0xLDI1ICswLDAgQEAKLTxodG1sPgotPGhlYWQ+Ci08c2NyaXB0PgotZnVuY3Rpb24gcnVu VGVzdCgpCi17Ci0gICAgdmFyIGJsb2IgPSBuZXcgQmxvYihbIjAxMjM0NTY3ODkiXSk7Ci0gICAg dmFyIHJlYWRlciA9IG5ldyBGaWxlUmVhZGVyKCk7Ci0gICAgcmVhZGVyLm9ubG9hZCA9IGZ1bmN0 aW9uKGV2ZW50KSB7Ci0gICAgICAgIGNvbnNvbGUubG9nKCJSZWNlaXZlZCBkYXRhOiAiICsgZXZl bnQudGFyZ2V0LnJlc3VsdCk7Ci0gICAgfQotICAgIHJlYWRlci5vbmxvYWRlbmQgPSBmdW5jdGlv bigpIHsKLSAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKLSAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKLSAgICB9Ci0gICAgcmVhZGVy Lm9uZXJyb3IgPSBmdW5jdGlvbihldmVudCkgewotICAgICAgICBjb25zb2xlLmxvZygiUmVjZWl2 ZWQgZXJyb3IgZXZlbnQ6ICIgKyBldmVudC50YXJnZXQuZXJyb3IuY29kZSk7Ci0gICAgfTsKLSAg ICByZWFkZXIucmVhZEFzVGV4dChibG9iKTsKLX0KLQotPC9zY3JpcHQ+Ci08L2hlYWQ+Ci08Ym9k eSBvbmxvYWQ9InJ1blRlc3QoKSI+Ci08L2JvZHk+Ci08L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTFmY2M2OQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvcmVzb3VyY2VzL2ZpbGUtcmVhZGVyLXJlYWwuaHRtbApA QCAtMCwwICsxLDI1IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2Z1bmN0aW9uIHJ1blRl c3QoKQoreworICAgIHZhciBibG9iID0gbmV3IEJsb2IoWyIwMTIzNDU2Nzg5Il0pOworICAgIHZh ciByZWFkZXIgPSBuZXcgRmlsZVJlYWRlcigpOworICAgIHJlYWRlci5vbmxvYWQgPSBmdW5jdGlv bihldmVudCkgeworICAgICAgICBjb25zb2xlLmxvZygiUmVjZWl2ZWQgZGF0YTogIiArIGV2ZW50 LnRhcmdldC5yZXN1bHQpOworICAgIH0KKyAgICByZWFkZXIub25sb2FkZW5kID0gZnVuY3Rpb24o KSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgfQorICAgIHJlYWRlci5v bmVycm9yID0gZnVuY3Rpb24oZXZlbnQpIHsKKyAgICAgICAgY29uc29sZS5sb2coIlJlY2VpdmVk IGVycm9yIGV2ZW50OiAiICsgZXZlbnQudGFyZ2V0LmVycm9yLmNvZGUpOworICAgIH07CisgICAg cmVhZGVyLnJlYWRBc1RleHQoYmxvYik7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkg b25sb2FkPSJydW5UZXN0KCkiPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDAzOGM1 YTMuLmIxYjMxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNi0xNSAgSmlh biBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0ZpbGUgQVBJXSBGaWxlUmVh ZGVyIHNob3VsZCB3b3JrIGluIHNhbmRib3ggaWZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZmlsZXMvZmlsZS1yZWFkZXItc2Fu ZGJveC1pZnJhbWUuaHRtbAorCisgICAgICAgICogZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lz dHJ5LmNwcDogU2hvdWxkIHJlbW92ZSBmcm9tIG1hcCBmb3IgYWxsIHRocmVhZHMuCisgICAgICAg IChXZWJDb3JlOjpUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyQmxvYlVSTCk6Cisg ICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbjo6Y2FuUmVxdWVzdCk6IENoZWNrIGFuZCB1c2UgY2FjaGVkIG9yaWdpbiBmb3Ig YmxvYiBVUkwgZmlyc3QuCisKIDIwMTItMDYtMTUgIFNpbHZpYSBQZmVpZmZlciAgPHNpbHZpYXBm QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgdm9sdW1lIHRodW1iIGZvciB2aWRlb3Mg d2l0aG91dCBhdWRpbyB0cmFjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkv VGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1RocmVh ZGFibGVCbG9iUmVnaXN0cnkuY3BwCmluZGV4IDViNmU0ZGMuLjhhNDEyODUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcApAQCAtMTIz LDEwICsxMjMsMTIgQEAgc3RhdGljIHZvaWQgdW5yZWdpc3RlckJsb2JVUkxUYXNrKHZvaWQqIGNv bnRleHQpCiAKIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6dW5yZWdpc3RlckJsb2JVUkwo Y29uc3QgS1VSTCYgdXJsKQogewotICAgIGlmIChpc01haW5UaHJlYWQoKSkgeworICAgIGlmIChC bG9iVVJMOjpnZXRPcmlnaW4odXJsKSA9PSAibnVsbCIpCiAgICAgICAgIG9yaWdpbk1hcCgpLT5y ZW1vdmUodXJsLnN0cmluZygpKTsKKworICAgIGlmIChpc01haW5UaHJlYWQoKSkKICAgICAgICAg YmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsKLSAgICB9IGVsc2UgeworICAg IGVsc2UgewogICAgICAgICBPd25QdHI8QmxvYlJlZ2lzdHJ5Q29udGV4dD4gY29udGV4dCA9IGFk b3B0UHRyKG5ldyBCbG9iUmVnaXN0cnlDb250ZXh0KHVybCkpOwogICAgICAgICBjYWxsT25NYWlu VGhyZWFkKCZ1bnJlZ2lzdGVyQmxvYlVSTFRhc2ssIGNvbnRleHQubGVha1B0cigpKTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IDhjNzMzOTMuLjUwMmM0 YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC0yOTksMTMgKzI5 OSwxNiBAQCBib29sIFNlY3VyaXR5T3JpZ2luOjpjYW5SZXF1ZXN0KGNvbnN0IEtVUkwmIHVybCkg Y29uc3QKICAgICBpZiAobV91bml2ZXJzYWxBY2Nlc3MpCiAgICAgICAgIHJldHVybiB0cnVlOwog Ci0gICAgaWYgKGlzVW5pcXVlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+IHRhcmdldE9yaWdpbiA9IGdldENhY2hlZE9yaWdpbih1cmwpOworICAg IGlmICghdGFyZ2V0T3JpZ2luKSB7CisgICAgICAgIGlmIChpc1VuaXF1ZSgpKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiB0YXJnZXRPcmln aW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVybCk7CisgICAgICAgIFJlZlB0cjxTZWN1cml0 eU9yaWdpbj4gdGFyZ2V0T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh1cmwpOwogCi0g ICAgaWYgKHRhcmdldE9yaWdpbi0+aXNVbmlxdWUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICBpZiAodGFyZ2V0T3JpZ2luLT5pc1VuaXF1ZSgpKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0KIAogICAgIC8vIFdlIGNhbGwgaXNTYW1lU2NoZW1lSG9zdFBvcnQgaGVy ZSBpbnN0ZWFkIG9mIGNhbkFjY2VzcyBiZWNhdXNlIHdlIHdhbnQKICAgICAvLyB0byBpZ25vcmUg ZG9jdW1lbnQuZG9tYWluIGVmZmVjdHMuCg== 147894 2012-06-15 14:03:54 -0700 2012-06-15 14:15:45 -0700 Patch 89242.diff text/plain 6785 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYWM0YzFjLi4zZmM2ZGY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYt MTUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtGaWxlIEFQSV0g RmlsZVJlYWRlciBzaG91bGQgd29yayBpbiBzYW5kYm94IGlmcmFtZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyNDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZmlsZXMvZmlsZS1yZWFkZXIt ZmlsZS11cmwuaHRtbDoKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gt aWZyYW1lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9maWxlcy9maWxlLXJl YWRlci1zYW5kYm94LWlmcmFtZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZpbGVzL3Jl c291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWw6IFJlbmFtZWQgZnJvbSBMYXlvdXRUZXN0cy9m YXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbC4KKwog MjAxMi0wNi0xNSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIENsZWFudXAgZW1wdHkgYW5vbnltb3VzIGJsb2NrIGNvbnRpbnVhdGlvbi4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItZmlsZS11cmwuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItZmlsZS11cmwuaHRtbAppbmRleCA2NjYw NThjLi42ZTdlZTlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVh ZGVyLWZpbGUtdXJsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRl ci1maWxlLXVybC5odG1sCkBAIC0xMCw3ICsxMCw3IEBAIGlmICh3aW5kb3cubGF5b3V0VGVzdENv bnRyb2xsZXIpIHsKIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+Ci08aWZyYW1lIHNyYz0icmVz b3VyY2VzL2ZpbGUtcmVhZGVyLWZpbGUtdXJsLWlmcmFtZS5odG1sIj48L2lmcmFtZT4KKzxpZnJh bWUgc3JjPSJyZXNvdXJjZXMvZmlsZS1yZWFkZXItcmVhbC5odG1sIj48L2lmcmFtZT4KIDxkaXYg aWQ9InJlc3VsdHMiPjwvZGl2PgogVGVzdCB0aGF0IEZpbGVSZWFkZXIgd29ya3MgdW5kZXIgdGhl IGZpbGUgVVJMIHdpdGggZmlsZSBwYXRoIHNlcGFyYXRpb24gZW5mb3JjZWQuCiA8L2JvZHk+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gtaWZy YW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItc2Fu ZGJveC1pZnJhbWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjMxZDAyOGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2Zp bGUtcmVhZGVyLXNhbmRib3gtaWZyYW1lLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKK0NP TlNPTEUgTUVTU0FHRTogbGluZSA5OiBSZWNlaXZlZCBkYXRhOiAwMTIzNDU2Nzg5CisKK1Rlc3Qg dGhhdCBGaWxlUmVhZGVyIHdvcmtzIHVuZGVyIHRoZSBzYW5kYm94ZWQgaWZyYW1lLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1zYW5kYm94LWlmcmFtZS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1zYW5kYm94LWlmcmFtZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEwZWJkMmQKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gtaWZy YW1lLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoZmFsc2UpOworICAgIGxheW91dFRl c3RDb250cm9sbGVyLnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhmYWxzZSk7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9s bGVyLndhaXRVbnRpbERvbmUoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8aWZy YW1lIHNyYz0icmVzb3VyY2VzL2ZpbGUtcmVhZGVyLXJlYWwuaHRtbCIgc2FuZGJveD0iYWxsb3ct c2NyaXB0cyI+PC9pZnJhbWU+Cis8ZGl2IGlkPSJyZXN1bHRzIj48L2Rpdj4KK1Rlc3QgdGhhdCBG aWxlUmVhZGVyIHdvcmtzIHVuZGVyIHRoZSBzYW5kYm94ZWQgaWZyYW1lLgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9yZXNvdXJjZXMvZmlsZS1y ZWFkZXItZmlsZS11cmwtaWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291 cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggNTFmY2M2OS4uMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVz L3Jlc291cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbAorKysgL2Rldi9udWxs CkBAIC0xLDI1ICswLDAgQEAKLTxodG1sPgotPGhlYWQ+Ci08c2NyaXB0PgotZnVuY3Rpb24gcnVu VGVzdCgpCi17Ci0gICAgdmFyIGJsb2IgPSBuZXcgQmxvYihbIjAxMjM0NTY3ODkiXSk7Ci0gICAg dmFyIHJlYWRlciA9IG5ldyBGaWxlUmVhZGVyKCk7Ci0gICAgcmVhZGVyLm9ubG9hZCA9IGZ1bmN0 aW9uKGV2ZW50KSB7Ci0gICAgICAgIGNvbnNvbGUubG9nKCJSZWNlaXZlZCBkYXRhOiAiICsgZXZl bnQudGFyZ2V0LnJlc3VsdCk7Ci0gICAgfQotICAgIHJlYWRlci5vbmxvYWRlbmQgPSBmdW5jdGlv bigpIHsKLSAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKLSAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKLSAgICB9Ci0gICAgcmVhZGVy Lm9uZXJyb3IgPSBmdW5jdGlvbihldmVudCkgewotICAgICAgICBjb25zb2xlLmxvZygiUmVjZWl2 ZWQgZXJyb3IgZXZlbnQ6ICIgKyBldmVudC50YXJnZXQuZXJyb3IuY29kZSk7Ci0gICAgfTsKLSAg ICByZWFkZXIucmVhZEFzVGV4dChibG9iKTsKLX0KLQotPC9zY3JpcHQ+Ci08L2hlYWQ+Ci08Ym9k eSBvbmxvYWQ9InJ1blRlc3QoKSI+Ci08L2JvZHk+Ci08L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTFmY2M2OQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvcmVzb3VyY2VzL2ZpbGUtcmVhZGVyLXJlYWwuaHRtbApA QCAtMCwwICsxLDI1IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2Z1bmN0aW9uIHJ1blRl c3QoKQoreworICAgIHZhciBibG9iID0gbmV3IEJsb2IoWyIwMTIzNDU2Nzg5Il0pOworICAgIHZh ciByZWFkZXIgPSBuZXcgRmlsZVJlYWRlcigpOworICAgIHJlYWRlci5vbmxvYWQgPSBmdW5jdGlv bihldmVudCkgeworICAgICAgICBjb25zb2xlLmxvZygiUmVjZWl2ZWQgZGF0YTogIiArIGV2ZW50 LnRhcmdldC5yZXN1bHQpOworICAgIH0KKyAgICByZWFkZXIub25sb2FkZW5kID0gZnVuY3Rpb24o KSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgfQorICAgIHJlYWRlci5v bmVycm9yID0gZnVuY3Rpb24oZXZlbnQpIHsKKyAgICAgICAgY29uc29sZS5sb2coIlJlY2VpdmVk IGVycm9yIGV2ZW50OiAiICsgZXZlbnQudGFyZ2V0LmVycm9yLmNvZGUpOworICAgIH07CisgICAg cmVhZGVyLnJlYWRBc1RleHQoYmxvYik7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkg b25sb2FkPSJydW5UZXN0KCkiPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDAzOGM1 YTMuLmIxYjMxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNi0xNSAgSmlh biBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0ZpbGUgQVBJXSBGaWxlUmVh ZGVyIHNob3VsZCB3b3JrIGluIHNhbmRib3ggaWZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZmlsZXMvZmlsZS1yZWFkZXItc2Fu ZGJveC1pZnJhbWUuaHRtbAorCisgICAgICAgICogZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lz dHJ5LmNwcDogU2hvdWxkIHJlbW92ZSBmcm9tIG1hcCBmb3IgYWxsIHRocmVhZHMuCisgICAgICAg IChXZWJDb3JlOjpUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyQmxvYlVSTCk6Cisg ICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbjo6Y2FuUmVxdWVzdCk6IENoZWNrIGFuZCB1c2UgY2FjaGVkIG9yaWdpbiBmb3Ig YmxvYiBVUkwgZmlyc3QuCisKIDIwMTItMDYtMTUgIFNpbHZpYSBQZmVpZmZlciAgPHNpbHZpYXBm QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgdm9sdW1lIHRodW1iIGZvciB2aWRlb3Mg d2l0aG91dCBhdWRpbyB0cmFjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkv VGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1RocmVh ZGFibGVCbG9iUmVnaXN0cnkuY3BwCmluZGV4IDViNmU0ZGMuLjhhNDEyODUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcApAQCAtMTIz LDEwICsxMjMsMTIgQEAgc3RhdGljIHZvaWQgdW5yZWdpc3RlckJsb2JVUkxUYXNrKHZvaWQqIGNv bnRleHQpCiAKIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6dW5yZWdpc3RlckJsb2JVUkwo Y29uc3QgS1VSTCYgdXJsKQogewotICAgIGlmIChpc01haW5UaHJlYWQoKSkgeworICAgIGlmIChC bG9iVVJMOjpnZXRPcmlnaW4odXJsKSA9PSAibnVsbCIpCiAgICAgICAgIG9yaWdpbk1hcCgpLT5y ZW1vdmUodXJsLnN0cmluZygpKTsKKworICAgIGlmIChpc01haW5UaHJlYWQoKSkKICAgICAgICAg YmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsKLSAgICB9IGVsc2UgeworICAg IGVsc2UgewogICAgICAgICBPd25QdHI8QmxvYlJlZ2lzdHJ5Q29udGV4dD4gY29udGV4dCA9IGFk b3B0UHRyKG5ldyBCbG9iUmVnaXN0cnlDb250ZXh0KHVybCkpOwogICAgICAgICBjYWxsT25NYWlu VGhyZWFkKCZ1bnJlZ2lzdGVyQmxvYlVSTFRhc2ssIGNvbnRleHQubGVha1B0cigpKTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IDhjNzMzOTMuLmVkNTc3 MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC0yOTksMTMgKzI5 OSwxNiBAQCBib29sIFNlY3VyaXR5T3JpZ2luOjpjYW5SZXF1ZXN0KGNvbnN0IEtVUkwmIHVybCkg Y29uc3QKICAgICBpZiAobV91bml2ZXJzYWxBY2Nlc3MpCiAgICAgICAgIHJldHVybiB0cnVlOwog Ci0gICAgaWYgKGlzVW5pcXVlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+IHRhcmdldE9yaWdpbiA9IGdldENhY2hlZE9yaWdpbih1cmwpOworICAg IGlmICghdGFyZ2V0T3JpZ2luKSB7CisgICAgICAgIGlmIChpc1VuaXF1ZSgpKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiB0YXJnZXRPcmln aW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVybCk7CisgICAgICAgIHRhcmdldE9yaWdpbiA9 IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUodXJsKTsKIAotICAgIGlmICh0YXJnZXRPcmlnaW4tPmlz VW5pcXVlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKHRhcmdldE9yaWdp bi0+aXNVbmlxdWUoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICAv LyBXZSBjYWxsIGlzU2FtZVNjaGVtZUhvc3RQb3J0IGhlcmUgaW5zdGVhZCBvZiBjYW5BY2Nlc3Mg YmVjYXVzZSB3ZSB3YW50CiAgICAgLy8gdG8gaWdub3JlIGRvY3VtZW50LmRvbWFpbiBlZmZlY3Rz Lgo= 147897 2012-06-15 14:15:45 -0700 2012-06-15 14:33:21 -0700 Patch 89242.diff text/plain 6321 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYWM0YzFjLi4zZmM2ZGY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDYt MTUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtGaWxlIEFQSV0g RmlsZVJlYWRlciBzaG91bGQgd29yayBpbiBzYW5kYm94IGlmcmFtZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyNDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZmlsZXMvZmlsZS1yZWFkZXIt ZmlsZS11cmwuaHRtbDoKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gt aWZyYW1lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9maWxlcy9maWxlLXJl YWRlci1zYW5kYm94LWlmcmFtZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZpbGVzL3Jl c291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWw6IFJlbmFtZWQgZnJvbSBMYXlvdXRUZXN0cy9m YXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbC4KKwog MjAxMi0wNi0xNSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIENsZWFudXAgZW1wdHkgYW5vbnltb3VzIGJsb2NrIGNvbnRpbnVhdGlvbi4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItZmlsZS11cmwuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItZmlsZS11cmwuaHRtbAppbmRleCA2NjYw NThjLi42ZTdlZTlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVh ZGVyLWZpbGUtdXJsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRl ci1maWxlLXVybC5odG1sCkBAIC0xMCw3ICsxMCw3IEBAIGlmICh3aW5kb3cubGF5b3V0VGVzdENv bnRyb2xsZXIpIHsKIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+Ci08aWZyYW1lIHNyYz0icmVz b3VyY2VzL2ZpbGUtcmVhZGVyLWZpbGUtdXJsLWlmcmFtZS5odG1sIj48L2lmcmFtZT4KKzxpZnJh bWUgc3JjPSJyZXNvdXJjZXMvZmlsZS1yZWFkZXItcmVhbC5odG1sIj48L2lmcmFtZT4KIDxkaXYg aWQ9InJlc3VsdHMiPjwvZGl2PgogVGVzdCB0aGF0IEZpbGVSZWFkZXIgd29ya3MgdW5kZXIgdGhl IGZpbGUgVVJMIHdpdGggZmlsZSBwYXRoIHNlcGFyYXRpb24gZW5mb3JjZWQuCiA8L2JvZHk+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gtaWZy YW1lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmlsZS1yZWFkZXItc2Fu ZGJveC1pZnJhbWUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjMxZDAyOGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2Zp bGUtcmVhZGVyLXNhbmRib3gtaWZyYW1lLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKK0NP TlNPTEUgTUVTU0FHRTogbGluZSA5OiBSZWNlaXZlZCBkYXRhOiAwMTIzNDU2Nzg5CisKK1Rlc3Qg dGhhdCBGaWxlUmVhZGVyIHdvcmtzIHVuZGVyIHRoZSBzYW5kYm94ZWQgaWZyYW1lLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1zYW5kYm94LWlmcmFtZS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1zYW5kYm94LWlmcmFtZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEwZWJkMmQKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLXNhbmRib3gtaWZy YW1lLmh0bWwKQEAgLTAsMCArMSwxNyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoZmFsc2UpOworICAgIGxheW91dFRl c3RDb250cm9sbGVyLnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhmYWxzZSk7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9s bGVyLndhaXRVbnRpbERvbmUoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8aWZy YW1lIHNyYz0icmVzb3VyY2VzL2ZpbGUtcmVhZGVyLXJlYWwuaHRtbCIgc2FuZGJveD0iYWxsb3ct c2NyaXB0cyI+PC9pZnJhbWU+Cis8ZGl2IGlkPSJyZXN1bHRzIj48L2Rpdj4KK1Rlc3QgdGhhdCBG aWxlUmVhZGVyIHdvcmtzIHVuZGVyIHRoZSBzYW5kYm94ZWQgaWZyYW1lLgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9yZXNvdXJjZXMvZmlsZS1y ZWFkZXItZmlsZS11cmwtaWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291 cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggNTFmY2M2OS4uMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVz L3Jlc291cmNlcy9maWxlLXJlYWRlci1maWxlLXVybC1pZnJhbWUuaHRtbAorKysgL2Rldi9udWxs CkBAIC0xLDI1ICswLDAgQEAKLTxodG1sPgotPGhlYWQ+Ci08c2NyaXB0PgotZnVuY3Rpb24gcnVu VGVzdCgpCi17Ci0gICAgdmFyIGJsb2IgPSBuZXcgQmxvYihbIjAxMjM0NTY3ODkiXSk7Ci0gICAg dmFyIHJlYWRlciA9IG5ldyBGaWxlUmVhZGVyKCk7Ci0gICAgcmVhZGVyLm9ubG9hZCA9IGZ1bmN0 aW9uKGV2ZW50KSB7Ci0gICAgICAgIGNvbnNvbGUubG9nKCJSZWNlaXZlZCBkYXRhOiAiICsgZXZl bnQudGFyZ2V0LnJlc3VsdCk7Ci0gICAgfQotICAgIHJlYWRlci5vbmxvYWRlbmQgPSBmdW5jdGlv bigpIHsKLSAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKLSAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKLSAgICB9Ci0gICAgcmVhZGVy Lm9uZXJyb3IgPSBmdW5jdGlvbihldmVudCkgewotICAgICAgICBjb25zb2xlLmxvZygiUmVjZWl2 ZWQgZXJyb3IgZXZlbnQ6ICIgKyBldmVudC50YXJnZXQuZXJyb3IuY29kZSk7Ci0gICAgfTsKLSAg ICByZWFkZXIucmVhZEFzVGV4dChibG9iKTsKLX0KLQotPC9zY3JpcHQ+Ci08L2hlYWQ+Ci08Ym9k eSBvbmxvYWQ9InJ1blRlc3QoKSI+Ci08L2JvZHk+Ci08L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2ZpbGVzL3Jlc291cmNlcy9maWxlLXJlYWRlci1yZWFsLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTFmY2M2OQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvcmVzb3VyY2VzL2ZpbGUtcmVhZGVyLXJlYWwuaHRtbApA QCAtMCwwICsxLDI1IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2Z1bmN0aW9uIHJ1blRl c3QoKQoreworICAgIHZhciBibG9iID0gbmV3IEJsb2IoWyIwMTIzNDU2Nzg5Il0pOworICAgIHZh ciByZWFkZXIgPSBuZXcgRmlsZVJlYWRlcigpOworICAgIHJlYWRlci5vbmxvYWQgPSBmdW5jdGlv bihldmVudCkgeworICAgICAgICBjb25zb2xlLmxvZygiUmVjZWl2ZWQgZGF0YTogIiArIGV2ZW50 LnRhcmdldC5yZXN1bHQpOworICAgIH0KKyAgICByZWFkZXIub25sb2FkZW5kID0gZnVuY3Rpb24o KSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgfQorICAgIHJlYWRlci5v bmVycm9yID0gZnVuY3Rpb24oZXZlbnQpIHsKKyAgICAgICAgY29uc29sZS5sb2coIlJlY2VpdmVk IGVycm9yIGV2ZW50OiAiICsgZXZlbnQudGFyZ2V0LmVycm9yLmNvZGUpOworICAgIH07CisgICAg cmVhZGVyLnJlYWRBc1RleHQoYmxvYik7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkg b25sb2FkPSJydW5UZXN0KCkiPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDAzOGM1 YTMuLmIxYjMxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNi0xNSAgSmlh biBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0ZpbGUgQVBJXSBGaWxlUmVh ZGVyIHNob3VsZCB3b3JrIGluIHNhbmRib3ggaWZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZmlsZXMvZmlsZS1yZWFkZXItc2Fu ZGJveC1pZnJhbWUuaHRtbAorCisgICAgICAgICogZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lz dHJ5LmNwcDogU2hvdWxkIHJlbW92ZSBmcm9tIG1hcCBmb3IgYWxsIHRocmVhZHMuCisgICAgICAg IChXZWJDb3JlOjpUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyQmxvYlVSTCk6Cisg ICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbjo6Y2FuUmVxdWVzdCk6IENoZWNrIGFuZCB1c2UgY2FjaGVkIG9yaWdpbiBmb3Ig YmxvYiBVUkwgZmlyc3QuCisKIDIwMTItMDYtMTUgIFNpbHZpYSBQZmVpZmZlciAgPHNpbHZpYXBm QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgdm9sdW1lIHRodW1iIGZvciB2aWRlb3Mg d2l0aG91dCBhdWRpbyB0cmFjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkv VGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL1RocmVh ZGFibGVCbG9iUmVnaXN0cnkuY3BwCmluZGV4IDViNmU0ZGMuLjhhNDEyODUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvVGhyZWFkYWJsZUJsb2JSZWdpc3RyeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9UaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5LmNwcApAQCAtMTIz LDEwICsxMjMsMTIgQEAgc3RhdGljIHZvaWQgdW5yZWdpc3RlckJsb2JVUkxUYXNrKHZvaWQqIGNv bnRleHQpCiAKIHZvaWQgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6dW5yZWdpc3RlckJsb2JVUkwo Y29uc3QgS1VSTCYgdXJsKQogewotICAgIGlmIChpc01haW5UaHJlYWQoKSkgeworICAgIGlmIChC bG9iVVJMOjpnZXRPcmlnaW4odXJsKSA9PSAibnVsbCIpCiAgICAgICAgIG9yaWdpbk1hcCgpLT5y ZW1vdmUodXJsLnN0cmluZygpKTsKKworICAgIGlmIChpc01haW5UaHJlYWQoKSkKICAgICAgICAg YmxvYlJlZ2lzdHJ5KCkudW5yZWdpc3RlckJsb2JVUkwodXJsKTsKLSAgICB9IGVsc2UgeworICAg IGVsc2UgewogICAgICAgICBPd25QdHI8QmxvYlJlZ2lzdHJ5Q29udGV4dD4gY29udGV4dCA9IGFk b3B0UHRyKG5ldyBCbG9iUmVnaXN0cnlDb250ZXh0KHVybCkpOwogICAgICAgICBjYWxsT25NYWlu VGhyZWFkKCZ1bnJlZ2lzdGVyQmxvYlVSTFRhc2ssIGNvbnRleHQubGVha1B0cigpKTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IDhjNzMzOTMuLmJjOTVj NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC0yOTksNiArMjk5 LDkgQEAgYm9vbCBTZWN1cml0eU9yaWdpbjo6Y2FuUmVxdWVzdChjb25zdCBLVVJMJiB1cmwpIGNv bnN0CiAgICAgaWYgKG1fdW5pdmVyc2FsQWNjZXNzKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAor ICAgIGlmIChnZXRDYWNoZWRPcmlnaW4odXJsKSA9PSB0aGlzKQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKwogICAgIGlmIChpc1VuaXF1ZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK