58324 2011-04-12 08:28:32 -0700 Web Inspector: remove scriptWorldType from the protocol. 2011-04-12 10:07:50 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov buildbot bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit-ews yurys oldest_to_newest 384010 0 pfeldman 2011-04-12 08:28:32 -0700 Patch to follow. 384031 1 89208 pfeldman 2011-04-12 08:50:49 -0700 Created attachment 89208 Patch 384042 2 webkit-ews 2011-04-12 09:02:51 -0700 Attachment 89208 did not build on qt: Build output: http://queues.webkit.org/results/8391424 384050 3 89212 pfeldman 2011-04-12 09:14:55 -0700 Created attachment 89212 [PATCH] that compiles. 384066 4 buildbot 2011-04-12 09:32:56 -0700 Attachment 89208 did not build on win: Build output: http://queues.webkit.org/results/8395096 384083 5 89212 yurys 2011-04-12 10:01:17 -0700 Comment on attachment 89212 [PATCH] that compiles. View in context: https://bugs.webkit.org/attachment.cgi?id=89212&action=review > Source/WebCore/bindings/js/ScriptDebugServer.cpp:247 > + return true; return (currentWorld(exec) != mainThreadNormalWorld()); ? > Source/WebCore/bindings/v8/DebuggerScript.js:80 > + isContentScript: script.context_data && script.context_data.indexOf("injected") == 0 Please cast the expression to boolean explicitly to avoid surprises when it's an undefined and is casted ToBoolean() in ScriptDebugServer.cpp. 384087 6 pfeldman 2011-04-12 10:07:50 -0700 Committed r83601: <http://trac.webkit.org/changeset/83601> 89208 2011-04-12 08:50:49 -0700 2011-04-12 09:14:49 -0700 Patch bug-58324-20110412195044.patch text/plain 14792 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODM1ODQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNjNhODFkYzc1OWFkYzZk ZDQxZTk4MzE5ZmZjNDI2MGY1NmNlMmU1Li5kNWQ5Mzk4NTc0ODQzM2U5NTY4NjAzZjVjZjU2YTg3 YmFlNjRhOTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMTEtMDQtMTIgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBzY3JpcHRXb3Js ZFR5cGUgZnJvbSB0aGUgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01ODMyNAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oOgorICAgICAgICAoV2Vi Q29yZTo6U2NyaXB0RGVidWdMaXN0ZW5lcjo6flNjcmlwdERlYnVnTGlzdGVuZXIpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5fcGFyc2VkU2NyaXB0U291cmNlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlLnNjcmlwdFBh cnNlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRmlsZSk6CisKKzIwMTEtMDQtMTIgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IFl1cnkgU2VtaWtoYXRza3kuCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogY29va2llcyB2aWV3 IGlzIGVtcHR5IGV2ZW4gZm9yIHNpdGVzIHdpdGggY29va2llcy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCAyZGQxZWMyNzVlYTMy ZGIzNjk1M2I0Y2QwY2EwNTJmOWU2YzQzNDk2Li40MzlhYmQyOTk3MWI5OTVjMWVmMzRmYWRlMWUy ODgwMDg2ZDlkMzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 RGVidWdTZXJ2ZXIuY3BwCkBAIC0yMTQsNyArMjE0LDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZl cjo6ZGlzcGF0Y2hEaWRDb250aW51ZShTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lcikKICAg ICBsaXN0ZW5lci0+ZGlkQ29udGludWUoKTsKIH0KIAotdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6 ZGlzcGF0Y2hEaWRQYXJzZVNvdXJjZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3Vy Y2VQcm92aWRlciogc291cmNlUHJvdmlkZXIsIFNjcmlwdFdvcmxkVHlwZSB3b3JsZFR5cGUpCit2 b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKGNvbnN0IExpc3Rl bmVyU2V0JiBsaXN0ZW5lcnMsIFNvdXJjZVByb3ZpZGVyKiBzb3VyY2VQcm92aWRlciwgYm9vbCBp c0NvbnRlbnRTY3JpcHQpCiB7CiAgICAgU3RyaW5nIHNvdXJjZUlEID0gdXN0cmluZ1RvU3RyaW5n KEpTQzo6VVN0cmluZzo6bnVtYmVyKHNvdXJjZVByb3ZpZGVyLT5hc0lEKCkpKTsKICAgICBTdHJp bmcgdXJsID0gdXN0cmluZ1RvU3RyaW5nKHNvdXJjZVByb3ZpZGVyLT51cmwoKSk7CkBAIC0yMjUs NyArMjI1LDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3UKICAgICBWZWN0b3I8U2NyaXB0RGVi dWdMaXN0ZW5lcio+IGNvcHk7CiAgICAgY29weVRvVmVjdG9yKGxpc3RlbmVycywgY29weSk7CiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3B5LnNpemUoKTsgKytpKQotICAgICAgICBjb3B5 W2ldLT5kaWRQYXJzZVNvdXJjZShzb3VyY2VJRCwgdXJsLCBkYXRhLCBsaW5lT2Zmc2V0LCBjb2x1 bW5PZmZzZXQsIHdvcmxkVHlwZSk7CisgICAgICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNlKHNv dXJjZUlELCB1cmwsIGRhdGEsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgaXNDb250ZW50U2Ny aXB0KTsKIH0KIAogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hGYWlsZWRUb1BhcnNl U291cmNlKGNvbnN0IExpc3RlbmVyU2V0JiBsaXN0ZW5lcnMsIFNvdXJjZVByb3ZpZGVyKiBzb3Vy Y2VQcm92aWRlciwgaW50IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpCkBA IC0yNDAsMTEgKzI0MCwxMSBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaEZhaWxl ZFRvUGFyc2VTb3VyY2UoY29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycwogICAgICAgICBjb3B5 W2ldLT5mYWlsZWRUb1BhcnNlU291cmNlKHVybCwgZGF0YSwgZmlyc3RMaW5lLCBlcnJvckxpbmUs IGVycm9yTWVzc2FnZSk7CiB9CiAKLXN0YXRpYyBTY3JpcHRXb3JsZFR5cGUgY3VycmVudFdvcmxk VHlwZShFeGVjU3RhdGUqIGV4ZWMpCitzdGF0aWMgYm9vbCBpc0NvbnRlbnRTY3JpcHQoRXhlY1N0 YXRlKiBleGVjKQogewogICAgIGlmIChjdXJyZW50V29ybGQoZXhlYykgPT0gbWFpblRocmVhZE5v cm1hbFdvcmxkKCkpCi0gICAgICAgIHJldHVybiBNQUlOX1dPUkxEOwotICAgIHJldHVybiBFWFRF TlNJT05TX1dPUkxEOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9 CiAKIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmRldGFjaChKU0dsb2JhbE9iamVjdCogZ2xvYmFs T2JqZWN0KQpAQCAtMjc1LDEwICsyNzUsOCBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpzb3Vy Y2VQYXJzZWQoRXhlY1N0YXRlKiBleGVjLCBTb3VyY2VQcm92aWRlciogc291cmNlUHJvdgogICAg IGJvb2wgaXNFcnJvciA9IGVycm9yTGluZSAhPSAtMTsKICAgICBpZiAoaXNFcnJvcikKICAgICAg ICAgZGlzcGF0Y2hGYWlsZWRUb1BhcnNlU291cmNlKCpsaXN0ZW5lcnMsIHNvdXJjZVByb3ZpZGVy LCBlcnJvckxpbmUsIHVzdHJpbmdUb1N0cmluZyhlcnJvck1lc3NhZ2UpKTsKLSAgICBlbHNlIHsK LSAgICAgICAgU2NyaXB0V29ybGRUeXBlIHdvcmxkVHlwZSA9IGN1cnJlbnRXb3JsZFR5cGUoZXhl Yyk7Ci0gICAgICAgIGRpc3BhdGNoRGlkUGFyc2VTb3VyY2UoKmxpc3RlbmVycywgc291cmNlUHJv dmlkZXIsIHdvcmxkVHlwZSk7Ci0gICAgfQorICAgIGVsc2UKKyAgICAgICAgZGlzcGF0Y2hEaWRQ YXJzZVNvdXJjZSgqbGlzdGVuZXJzLCBzb3VyY2VQcm92aWRlciwgaXNDb250ZW50U2NyaXB0KGV4 ZWMpKTsKIAogICAgIG1fY2FsbGluZ0xpc3RlbmVycyA9IGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5qcwppbmRleCBlNTYwZWExNDNkMTgyZjA1 OTVmOGNmMmJhOWZiOTg0YTdjYTk5YzZjLi43MjBkODNhNGJkNWRkNTFiMDUwYmFhZDc5ZjA2Yjky MzkwNGJlMzk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dl clNjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlw dC5qcwpAQCAtMzgsMTEgKzM4LDYgQEAgRGVidWdnZXJTY3JpcHQuUGF1c2VPbkV4Y2VwdGlvbnNT dGF0ZSA9IHsKICAgICBQYXVzZU9uVW5jYXVnaHRFeGNlcHRpb25zOiAyCiB9OwogCi1EZWJ1Z2dl clNjcmlwdC5TY3JpcHRXb3JsZFR5cGUgPSB7Ci0gICAgTWFpbldvcmxkIDogMCwKLSAgICBFeHRl bnNpb25zV29ybGQgOiAxCi19OwotCiBEZWJ1Z2dlclNjcmlwdC5fcGF1c2VPbkV4Y2VwdGlvbnNT dGF0ZSA9IERlYnVnZ2VyU2NyaXB0LlBhdXNlT25FeGNlcHRpb25zU3RhdGUuRG9udFBhdXNlT25F eGNlcHRpb25zOwogRGVidWcuY2xlYXJCcmVha09uRXhjZXB0aW9uKCk7CiBEZWJ1Zy5jbGVhckJy ZWFrT25VbmNhdWdodEV4Y2VwdGlvbigpOwpAQCAtNzYsMTYgKzcxLDEzIEBAIERlYnVnZ2VyU2Ny aXB0LmdldFNjcmlwdHMgPSBmdW5jdGlvbihjb250ZXh0RGF0YSkKIAogRGVidWdnZXJTY3JpcHQu X2Zvcm1hdFNjcmlwdCA9IGZ1bmN0aW9uKHNjcmlwdCkKIHsKLSAgICB2YXIgc2NyaXB0V29ybGRU eXBlID0gRGVidWdnZXJTY3JpcHQuU2NyaXB0V29ybGRUeXBlLk1haW5Xb3JsZDsKLSAgICBpZiAo c2NyaXB0LmNvbnRleHRfZGF0YSAmJiBzY3JpcHQuY29udGV4dF9kYXRhLmluZGV4T2YoImluamVj dGVkIikgPT0gMCkKLSAgICAgICAgc2NyaXB0V29ybGRUeXBlID0gRGVidWdnZXJTY3JpcHQuU2Ny aXB0V29ybGRUeXBlLkV4dGVuc2lvbnNXb3JsZDsKICAgICByZXR1cm4gewogICAgICAgICBpZDog c2NyaXB0LmlkLAogICAgICAgICBuYW1lOiBzY3JpcHQubmFtZU9yU291cmNlVVJMKCksCiAgICAg ICAgIHNvdXJjZTogc2NyaXB0LnNvdXJjZSwKICAgICAgICAgbGluZU9mZnNldDogc2NyaXB0Lmxp bmVfb2Zmc2V0LAogICAgICAgICBjb2x1bW5PZmZzZXQ6IHNjcmlwdC5jb2x1bW5fb2Zmc2V0LAot ICAgICAgICBzY3JpcHRXb3JsZFR5cGU6IHNjcmlwdFdvcmxkVHlwZQorICAgICAgICBpc0NvbnRl bnRTY3JpcHQ6IHNjcmlwdC5jb250ZXh0X2RhdGEgJiYgc2NyaXB0LmNvbnRleHRfZGF0YS5pbmRl eE9mKCJpbmplY3RlZCIpID09IDAKICAgICB9OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKaW5kZXggZWU2M2FmODNhYTA4NzRiYTVm YzNkZTM2MzQ0MDJmZjJhY2VjNDgwZS4uYTBlMTRmMzJjMGUzNDIzYjZlZmY3ODBiOTk4ZTBjMDM1 NmRlMTAwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVi dWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVn U2VydmVyLmNwcApAQCAtMzUxLDcgKzM1MSw3IEBAIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmRp c3BhdGNoRGlkUGFyc2VTb3VyY2UoU2NyaXB0RGVidWdMaXN0ZW5lciogbGlzdGVuZXIsIHY4CiAg ICAgICAgIHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhvYmplY3QtPkdl dCh2ODo6U3RyaW5nOjpOZXcoInNvdXJjZSIpKSksCiAgICAgICAgIG9iamVjdC0+R2V0KHY4OjpT dHJpbmc6Ok5ldygibGluZU9mZnNldCIpKS0+VG9JbnRlZ2VyKCktPlZhbHVlKCksCiAgICAgICAg IG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiY29sdW1uT2Zmc2V0IikpLT5Ub0ludGVnZXIo KS0+VmFsdWUoKSwKLSAgICAgICAgc3RhdGljX2Nhc3Q8U2NyaXB0V29ybGRUeXBlPihvYmplY3Qt PkdldCh2ODo6U3RyaW5nOjpOZXcoInNjcmlwdFdvcmxkVHlwZSIpKS0+SW50MzJWYWx1ZSgpKSk7 CisgICAgICAgIG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6Ok5ldygiaXNDb250ZW50U2NyaXB0Iikp LT5Ub0Jvb2xlYW4oKS0+VmFsdWUoKSk7CiB9CiAKIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmVu c3VyZURlYnVnZ2VyU2NyaXB0Q29tcGlsZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCmluZGV4IDFhZTY2Y2NjMGMxNzU3MjBkNmIzMzI0NDcwMjIyOTNlN2YyYTBkM2Yu LjIxYzQwNGJlYjNkYzRkZTc5NmM5ZDE4MWU3MjVhZTkwMDQzYzE4YWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTE0NjEsNyArMTQ2MSw3IEBACiAgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAibGluZU9mZnNldCIsICJ0eXBlIjogImludGVnZXIiLCAi ZGVzY3JpcHRpb24iOiAiTGluZSBvZmZzZXQgb2YgdGhlIHNjcmlwdCB3aXRoaW4gdGhlIHJlc291 cmNlIHdpdGggZ2l2ZW4gVVJMIChmb3Igc2NyaXB0IHRhZ3MpLiIgfSwKICAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJjb2x1bW5PZmZzZXQiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2Ny aXB0aW9uIjogIkNvbHVtbiBvZmZzZXQgb2YgdGhlIHNjcmlwdCB3aXRoaW4gdGhlIHJlc291cmNl IHdpdGggZ2l2ZW4gVVJMLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsZW5n dGgiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIkxlbmd0aCBvZiB0aGUgc2Ny aXB0IiB9LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNjcmlwdFdvcmxkVHlwZSIs ICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2NyaXB0IHR5cGUuIC8vIEZJWE1F LiIgfQorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlzQ29udGVudFNjcmlwdCIsICJ0 eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiRGV0ZXJt aW5lcyB3aGV0aGVyIHRoaXMgc2NyaXB0IGlzIGEgdXNlciBleHRlbnNpb24gc2NyaXB0LiIgfQog ICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVk IHdoZW4gdmlydHVhbCBtYWNoaW5lIHBhcnNlcyBzY3JpcHQuIFRoaXMgZXZlbiBpcyBhbHNvIGZp cmVkIGZvciBhbGwga25vd24gc2NyaXB0cyB1cG9uIGVuYWJsaW5nIGRlYnVnZ2VyLiIKICAgICAg ICAgICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVi dWdnZXJBZ2VudC5jcHAKaW5kZXggYzgyODNhMTUyNDliZTg2MTZkMWNjOGExOTBmYWE5NzY3NDc0 MDcyYy4uYWJlOTVjZTBiZjI2ZDY4MDMyODg3MDRjZTRjMmJiZWQ2Y2RjY2I1NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApA QCAtMzc0LDEwICszNzQsMTAgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gSW5zcGVjdG9y RGVidWdnZXJBZ2VudDo6Y3VycmVudENhbGxGcmFtZXMoKQogCiAvLyBKYXZhU2NyaXB0RGVidWdM aXN0ZW5lciBmdW5jdGlvbnMKIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJz ZVNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg U3RyaW5nJiBkYXRhLCBpbnQgbGluZU9mZnNldCwgaW50IGNvbHVtbk9mZnNldCwgU2NyaXB0V29y bGRUeXBlIHdvcmxkVHlwZSkKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VT b3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0 cmluZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQsIGJvb2wgaXNDb250 ZW50U2NyaXB0KQogewogICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNvbnRlbnQgdG8gdGhlIGZy b250IGVuZCB1bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgbV9mcm9udGVuZC0+c2NyaXB0 UGFyc2VkKHNvdXJjZUlELCB1cmwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgZGF0YS5sZW5n dGgoKSwgd29ybGRUeXBlKTsKKyAgICBtX2Zyb250ZW5kLT5zY3JpcHRQYXJzZWQoc291cmNlSUQs IHVybCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBkYXRhLmxlbmd0aCgpLCBpc0NvbnRlbnRT Y3JpcHQpOwogCiAgICAgbV9zY3JpcHRzLnNldChzb3VyY2VJRCwgU2NyaXB0KHVybCwgZGF0YSwg bGluZU9mZnNldCwgY29sdW1uT2Zmc2V0KSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IDdhZTAzMDNmOGZmZjI2ZjBhZWQw YmNmZTBkMWM4ZTYwYTAyYjI5NDIuLjRlZmY4NWJiZDVmM2MzY2NkMGJhNzkyZGI3YzNmZjkwZDJh OGFiNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1 Z2dlckFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuaApAQCAtMTE5LDcgKzExOSw3IEBAIHByaXZhdGU6CiAKICAgICBQYXNzUmVmUHRy PEluc3BlY3RvckFycmF5PiBjdXJyZW50Q2FsbEZyYW1lcygpOwogCi0gICAgdmlydHVhbCB2b2lk IGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJs LCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0LCBpbnQgY29sdW1uT2Zmc2V0LCBT Y3JpcHRXb3JsZFR5cGUpOworICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBT dHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBp bnQgbGluZU9mZnNldCwgaW50IGNvbHVtbk9mZnNldCwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpOwog ICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBj b25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0 cmluZyYgZXJyb3JNZXNzYWdlKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2UoU2NyaXB0U3Rh dGUqKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ29udGludWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCmluZGV4IGEyOGNhYmJmMmNmMDM3OTVm ZjM3ZjMzYTBhOGNkOWYzNTBjMTM4YjMuLjRhOTNhNGNhNjliNjU3YWZmOTMzNzg4MjUwZDI3NmIy Mjk0OTBjYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1 Z0xpc3RlbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlz dGVuZXIuaApAQCAtMzcsMTYgKzM3LDExIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotZW51 bSBTY3JpcHRXb3JsZFR5cGUgewotTUFJTl9XT1JMRCA9IDAsCi1FWFRFTlNJT05TX1dPUkxECi19 OwotCiBjbGFzcyBTY3JpcHREZWJ1Z0xpc3RlbmVyIHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5T Y3JpcHREZWJ1Z0xpc3RlbmVyKCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3Vy Y2UoY29uc3QgU3RyaW5nJiAgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJp bmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0LCBpbnQgY29sdW1uT2Zmc2V0LCBTY3JpcHRXb3JsZFR5 cGUpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiAg c291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5l T2Zmc2V0LCBpbnQgY29sdW1uT2Zmc2V0LCBib29sIGlzQ29udGVudFNjcmlwdCkgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25z dCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmlu ZyYgZXJyb3JNZXNzYWdlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZFBhdXNlKFNjcmlwdFN0 YXRlKikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb250aW51ZSgpID0gMDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRl eCBhYzRiYmFmZDBhNjM4YzIwMzM5MDBlYmIyODUyN2MyNDBjYTAyMDI1Li5hMzNkNjliNTBhYzAw ZTY0ODE2YzQ4YTI0ZGY1NDVkMDJmMTQ4N2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCkBAIC0xNzksOSArMTc5LDkgQEAg V2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVudHMu RGVidWdnZXJSZXN1bWVkKTsKICAgICB9LAogCi0gICAgX3BhcnNlZFNjcmlwdFNvdXJjZTogZnVu Y3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5n dGgsIHNjcmlwdFdvcmxkVHlwZSkKKyAgICBfcGFyc2VkU2NyaXB0U291cmNlOiBmdW5jdGlvbihz b3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgaXND b250ZW50U2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHNjcmlwdCA9IG5ldyBXZWJJbnNwZWN0 b3IuU2NyaXB0KHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwg bGVuZ3RoLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgc2NyaXB0V29ybGRUeXBlKTsKKyAgICAgICAg dmFyIHNjcmlwdCA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0KHNvdXJjZUlELCBzb3VyY2VVUkws IGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgbGVuZ3RoLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwg aXNDb250ZW50U2NyaXB0KTsKICAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0gPSBzY3Jp cHQ7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlck1vZGVsLkV2ZW50cy5QYXJzZWRTY3JpcHRTb3VyY2UsIHNjcmlwdCk7CiAgICAgfSwK QEAgLTIyNyw5ICsyMjcsOSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJEaXNwYXRjaGVyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fZGVidWdnZXJXYXNEaXNhYmxl ZCgpOwogICAgIH0sCiAKLSAgICBzY3JpcHRQYXJzZWQ6IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3Vy Y2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgbGVuZ3RoLCBzY3JpcHRXb3JsZFR5cGUp CisgICAgc2NyaXB0UGFyc2VkOiBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zm c2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgaXNDb250ZW50U2NyaXB0KQogICAgIHsKLSAgICAg ICAgdGhpcy5fZGVidWdnZXJNb2RlbC5fcGFyc2VkU2NyaXB0U291cmNlKHNvdXJjZUlELCBzb3Vy Y2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgbGVuZ3RoLCBzY3JpcHRXb3JsZFR5cGUp OworICAgICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9wYXJzZWRTY3JpcHRTb3VyY2Uoc291cmNl SUQsIHNvdXJjZVVSTCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5ndGgsIGlzQ29udGVu dFNjcmlwdCk7CiAgICAgfSwKIAogICAgIHNjcmlwdEZhaWxlZFRvUGFyc2U6IGZ1bmN0aW9uKHNv dXJjZVVSTCwgc291cmNlLCBzdGFydGluZ0xpbmUsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwppbmRleCBiMWY0 Y2YzYmQ5MWFlZTFiMTllOGE0NThiYThlMjg1N2M0NzlkMWFhLi45ZTc1ZDgzY2Q5M2VkODBhY2Rm NzQ3ZGEzMWMyM2JiYmE5NTk0MjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdC5qcwpAQCAtMjMsNyArMjMsNyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci1XZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgbGlu ZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5ndGgsIGVycm9yTGluZSwgZXJyb3JNZXNzYWdlLCB3 b3JsZFR5cGUpCitXZWJJbnNwZWN0b3IuU2NyaXB0ID0gZnVuY3Rpb24oc291cmNlSUQsIHNvdXJj ZVVSTCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5ndGgsIGVycm9yTGluZSwgZXJyb3JN ZXNzYWdlLCBpc0NvbnRlbnRTY3JpcHQpCiB7CiAgICAgdGhpcy5zb3VyY2VJRCA9IHNvdXJjZUlE OwogICAgIHRoaXMuc291cmNlVVJMID0gc291cmNlVVJMOwpAQCAtMzIsMTIgKzMyLDcgQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdCA9IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZz ZXQsIGNvbHVtbk9mZnNldCwgbGUKICAgICB0aGlzLmxlbmd0aCA9IGxlbmd0aDsKICAgICB0aGlz LmVycm9yTGluZSA9IGVycm9yTGluZTsKICAgICB0aGlzLmVycm9yTWVzc2FnZSA9IGVycm9yTWVz c2FnZTsKLSAgICB0aGlzLndvcmxkVHlwZSA9IHdvcmxkVHlwZTsKLX0KLQotV2ViSW5zcGVjdG9y LlNjcmlwdC5Xb3JsZFR5cGUgPSB7Ci0gICAgTUFJTl9XT1JMRDogMCwKLSAgICBFWFRFTlNJT05T X1dPUkxEOiAxCisgICAgdGhpcy5pc0NvbnRlbnRTY3JpcHQgPSBpc0NvbnRlbnRTY3JpcHQ7CiB9 CiAKIFdlYkluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA1M2U1OWNhN2Nj YTM3MDBlODE1YzUyODYxYTFhN2I0NmEyNDQwNGM0Li40ZGU1Mjk1MDA4MWQxYjAyOTgzMzY2NDhm YjZkODFkYTdhZjg2ZmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMjgwLDcgKzI4MCw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2VsZWN0ID0gdGhpcy5fZmls ZXNTZWxlY3RFbGVtZW50OwogICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgib3B0aW9uIik7CiAgICAgICAgIG9wdGlvbi50ZXh0ID0gc291cmNlRmlsZS51cmwgPyBX ZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JVUkwoc291cmNlRmlsZS51cmwpIDogV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsKLSAgICAgICAgaWYgKHNvdXJjZUZpbGUuaXNFeHRl bnNpb25TY3JpcHQpCisgICAgICAgIGlmIChzb3VyY2VGaWxlLmlzQ29udGVudFNjcmlwdCkKICAg ICAgICAgICAgIG9wdGlvbi5hZGRTdHlsZUNsYXNzKCJleHRlbnNpb24tc2NyaXB0Iik7CiAgICAg ICAgIGZ1bmN0aW9uIG9wdGlvbkNvbXBhcmUoYSwgYikKICAgICAgICAgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCmluZGV4IDcwNWZiZGE5 YzJhNTJmOGFlMDVjMGU4ODU5NTIxNTkxZWRiODY0ZjQuLmFjNTk0YmI1ODZiZjNlMGQ4ZTYxNjhj NjhkOTZlMDQ0MzE3MzMxNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRmlsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZpbGUuanMKQEAgLTM4LDcgKzM4LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZpbGUgPSBmdW5jdGlvbihpZCwgc2NyaXB0LCBjb250ZW50Q2hhbmdlZERlbGVnYXRlKQogCiAg ICAgdGhpcy5pZCA9IGlkOwogICAgIHRoaXMudXJsID0gc2NyaXB0LnNvdXJjZVVSTDsKLSAgICB0 aGlzLmlzRXh0ZW5zaW9uU2NyaXB0ID0gc2NyaXB0LndvcmxkVHlwZSA9PT0gV2ViSW5zcGVjdG9y LlNjcmlwdC5Xb3JsZFR5cGUuRVhURU5TSU9OU19XT1JMRDsKKyAgICB0aGlzLmlzQ29udGVudFNj cmlwdCA9IHNjcmlwdC5pc0NvbnRlbnRTY3JpcHQ7CiAgICAgdGhpcy5tZXNzYWdlcyA9IFtdOwog ICAgIHRoaXMuYnJlYWtwb2ludHMgPSB7fTsKIAo= 89212 2011-04-12 09:14:55 -0700 2011-04-12 10:01:17 -0700 [PATCH] that compiles. bug-58324-20110412201453.patch text/plain 15805 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODM1ODQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNjNhODFkYzc1OWFkYzZk ZDQxZTk4MzE5ZmZjNDI2MGY1NmNlMmU1Li5kNWQ5Mzk4NTc0ODQzM2U5NTY4NjAzZjVjZjU2YTg3 YmFlNjRhOTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMTEtMDQtMTIgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBzY3JpcHRXb3Js ZFR5cGUgZnJvbSB0aGUgcHJvdG9jb2wuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01ODMyNAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oOgorICAgICAgICAoV2Vi Q29yZTo6U2NyaXB0RGVidWdMaXN0ZW5lcjo6flNjcmlwdERlYnVnTGlzdGVuZXIpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5fcGFyc2VkU2NyaXB0U291cmNlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlLnNjcmlwdFBh cnNlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRmlsZSk6CisKKzIwMTEtMDQtMTIgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IFl1cnkgU2VtaWtoYXRza3kuCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogY29va2llcyB2aWV3 IGlzIGVtcHR5IGV2ZW4gZm9yIHNpdGVzIHdpdGggY29va2llcy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCAyZGQxZWMyNzVlYTMy ZGIzNjk1M2I0Y2QwY2EwNTJmOWU2YzQzNDk2Li40MzlhYmQyOTk3MWI5OTVjMWVmMzRmYWRlMWUy ODgwMDg2ZDlkMzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 RGVidWdTZXJ2ZXIuY3BwCkBAIC0yMTQsNyArMjE0LDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZl cjo6ZGlzcGF0Y2hEaWRDb250aW51ZShTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lcikKICAg ICBsaXN0ZW5lci0+ZGlkQ29udGludWUoKTsKIH0KIAotdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6 ZGlzcGF0Y2hEaWRQYXJzZVNvdXJjZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3Vy Y2VQcm92aWRlciogc291cmNlUHJvdmlkZXIsIFNjcmlwdFdvcmxkVHlwZSB3b3JsZFR5cGUpCit2 b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaERpZFBhcnNlU291cmNlKGNvbnN0IExpc3Rl bmVyU2V0JiBsaXN0ZW5lcnMsIFNvdXJjZVByb3ZpZGVyKiBzb3VyY2VQcm92aWRlciwgYm9vbCBp c0NvbnRlbnRTY3JpcHQpCiB7CiAgICAgU3RyaW5nIHNvdXJjZUlEID0gdXN0cmluZ1RvU3RyaW5n KEpTQzo6VVN0cmluZzo6bnVtYmVyKHNvdXJjZVByb3ZpZGVyLT5hc0lEKCkpKTsKICAgICBTdHJp bmcgdXJsID0gdXN0cmluZ1RvU3RyaW5nKHNvdXJjZVByb3ZpZGVyLT51cmwoKSk7CkBAIC0yMjUs NyArMjI1LDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBTb3UKICAgICBWZWN0b3I8U2NyaXB0RGVi dWdMaXN0ZW5lcio+IGNvcHk7CiAgICAgY29weVRvVmVjdG9yKGxpc3RlbmVycywgY29weSk7CiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3B5LnNpemUoKTsgKytpKQotICAgICAgICBjb3B5 W2ldLT5kaWRQYXJzZVNvdXJjZShzb3VyY2VJRCwgdXJsLCBkYXRhLCBsaW5lT2Zmc2V0LCBjb2x1 bW5PZmZzZXQsIHdvcmxkVHlwZSk7CisgICAgICAgIGNvcHlbaV0tPmRpZFBhcnNlU291cmNlKHNv dXJjZUlELCB1cmwsIGRhdGEsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgaXNDb250ZW50U2Ny aXB0KTsKIH0KIAogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hGYWlsZWRUb1BhcnNl U291cmNlKGNvbnN0IExpc3RlbmVyU2V0JiBsaXN0ZW5lcnMsIFNvdXJjZVByb3ZpZGVyKiBzb3Vy Y2VQcm92aWRlciwgaW50IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpCkBA IC0yNDAsMTEgKzI0MCwxMSBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpkaXNwYXRjaEZhaWxl ZFRvUGFyc2VTb3VyY2UoY29uc3QgTGlzdGVuZXJTZXQmIGxpc3RlbmVycwogICAgICAgICBjb3B5 W2ldLT5mYWlsZWRUb1BhcnNlU291cmNlKHVybCwgZGF0YSwgZmlyc3RMaW5lLCBlcnJvckxpbmUs IGVycm9yTWVzc2FnZSk7CiB9CiAKLXN0YXRpYyBTY3JpcHRXb3JsZFR5cGUgY3VycmVudFdvcmxk VHlwZShFeGVjU3RhdGUqIGV4ZWMpCitzdGF0aWMgYm9vbCBpc0NvbnRlbnRTY3JpcHQoRXhlY1N0 YXRlKiBleGVjKQogewogICAgIGlmIChjdXJyZW50V29ybGQoZXhlYykgPT0gbWFpblRocmVhZE5v cm1hbFdvcmxkKCkpCi0gICAgICAgIHJldHVybiBNQUlOX1dPUkxEOwotICAgIHJldHVybiBFWFRF TlNJT05TX1dPUkxEOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9 CiAKIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OmRldGFjaChKU0dsb2JhbE9iamVjdCogZ2xvYmFs T2JqZWN0KQpAQCAtMjc1LDEwICsyNzUsOCBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpzb3Vy Y2VQYXJzZWQoRXhlY1N0YXRlKiBleGVjLCBTb3VyY2VQcm92aWRlciogc291cmNlUHJvdgogICAg IGJvb2wgaXNFcnJvciA9IGVycm9yTGluZSAhPSAtMTsKICAgICBpZiAoaXNFcnJvcikKICAgICAg ICAgZGlzcGF0Y2hGYWlsZWRUb1BhcnNlU291cmNlKCpsaXN0ZW5lcnMsIHNvdXJjZVByb3ZpZGVy LCBlcnJvckxpbmUsIHVzdHJpbmdUb1N0cmluZyhlcnJvck1lc3NhZ2UpKTsKLSAgICBlbHNlIHsK LSAgICAgICAgU2NyaXB0V29ybGRUeXBlIHdvcmxkVHlwZSA9IGN1cnJlbnRXb3JsZFR5cGUoZXhl Yyk7Ci0gICAgICAgIGRpc3BhdGNoRGlkUGFyc2VTb3VyY2UoKmxpc3RlbmVycywgc291cmNlUHJv dmlkZXIsIHdvcmxkVHlwZSk7Ci0gICAgfQorICAgIGVsc2UKKyAgICAgICAgZGlzcGF0Y2hEaWRQ YXJzZVNvdXJjZSgqbGlzdGVuZXJzLCBzb3VyY2VQcm92aWRlciwgaXNDb250ZW50U2NyaXB0KGV4 ZWMpKTsKIAogICAgIG1fY2FsbGluZ0xpc3RlbmVycyA9IGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmgKaW5kZXggMTc5MzE3Mjc3YjY5 YjY1MzBkYWVkM2M0MzllYTdkNDNhYTE5ZDA3ZC4uZjZhYzlhMWNjZDQ1NTA4YzA5ZTk3NmVhNzY3 MDg0ODU4MGE3YjNhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0RGVidWdTZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRE ZWJ1Z1NlcnZlci5oCkBAIC0xMDIsNyArMTAyLDcgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgZGlz cGF0Y2hGdW5jdGlvblRvTGlzdGVuZXJzKGNvbnN0IExpc3RlbmVyU2V0JiBsaXN0ZW5lcnMsIEph dmFTY3JpcHRFeGVjdXRpb25DYWxsYmFjayBjYWxsYmFjayk7CiAgICAgdm9pZCBkaXNwYXRjaERp ZFBhdXNlKFNjcmlwdERlYnVnTGlzdGVuZXIqKTsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29udGlu dWUoU2NyaXB0RGVidWdMaXN0ZW5lciopOwotICAgIHZvaWQgZGlzcGF0Y2hEaWRQYXJzZVNvdXJj ZShjb25zdCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBKU0M6OlNvdXJjZVByb3ZpZGVyKiwgZW51 bSBTY3JpcHRXb3JsZFR5cGUpOworICAgIHZvaWQgZGlzcGF0Y2hEaWRQYXJzZVNvdXJjZShjb25z dCBMaXN0ZW5lclNldCYgbGlzdGVuZXJzLCBKU0M6OlNvdXJjZVByb3ZpZGVyKiwgYm9vbCBpc0Nv bnRlbnRTY3JpcHQpOwogICAgIHZvaWQgZGlzcGF0Y2hGYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0 IExpc3RlbmVyU2V0JiBsaXN0ZW5lcnMsIEpTQzo6U291cmNlUHJvdmlkZXIqLCBpbnQgZXJyb3JM aW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CiAKICAgICB2b2lkIGNyZWF0ZUNhbGxG cmFtZUFuZFBhdXNlSWZOZWVkZWQoY29uc3QgSlNDOjpEZWJ1Z2dlckNhbGxGcmFtZSYsIGludHB0 cl90IHNvdXJjZUlELCBpbnQgbGluZU51bWJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L0RlYnVnZ2VyU2NyaXB0LmpzCmluZGV4IGU1NjBlYTE0M2QxODJmMDU5NWY4Y2YyYmE5ZmI5 ODRhN2NhOTljNmMuLjcyMGQ4M2E0YmQ1ZGQ1MWIwNTBiYWFkNzlmMDZiOTIzOTA0YmUzOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RlYnVnZ2VyU2NyaXB0LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RlYnVnZ2VyU2NyaXB0LmpzCkBAIC0zOCwx MSArMzgsNiBAQCBEZWJ1Z2dlclNjcmlwdC5QYXVzZU9uRXhjZXB0aW9uc1N0YXRlID0gewogICAg IFBhdXNlT25VbmNhdWdodEV4Y2VwdGlvbnM6IDIKIH07CiAKLURlYnVnZ2VyU2NyaXB0LlNjcmlw dFdvcmxkVHlwZSA9IHsKLSAgICBNYWluV29ybGQgOiAwLAotICAgIEV4dGVuc2lvbnNXb3JsZCA6 IDEKLX07Ci0KIERlYnVnZ2VyU2NyaXB0Ll9wYXVzZU9uRXhjZXB0aW9uc1N0YXRlID0gRGVidWdn ZXJTY3JpcHQuUGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZS5Eb250UGF1c2VPbkV4Y2VwdGlvbnM7CiBE ZWJ1Zy5jbGVhckJyZWFrT25FeGNlcHRpb24oKTsKIERlYnVnLmNsZWFyQnJlYWtPblVuY2F1Z2h0 RXhjZXB0aW9uKCk7CkBAIC03NiwxNiArNzEsMTMgQEAgRGVidWdnZXJTY3JpcHQuZ2V0U2NyaXB0 cyA9IGZ1bmN0aW9uKGNvbnRleHREYXRhKQogCiBEZWJ1Z2dlclNjcmlwdC5fZm9ybWF0U2NyaXB0 ID0gZnVuY3Rpb24oc2NyaXB0KQogewotICAgIHZhciBzY3JpcHRXb3JsZFR5cGUgPSBEZWJ1Z2dl clNjcmlwdC5TY3JpcHRXb3JsZFR5cGUuTWFpbldvcmxkOwotICAgIGlmIChzY3JpcHQuY29udGV4 dF9kYXRhICYmIHNjcmlwdC5jb250ZXh0X2RhdGEuaW5kZXhPZigiaW5qZWN0ZWQiKSA9PSAwKQot ICAgICAgICBzY3JpcHRXb3JsZFR5cGUgPSBEZWJ1Z2dlclNjcmlwdC5TY3JpcHRXb3JsZFR5cGUu RXh0ZW5zaW9uc1dvcmxkOwogICAgIHJldHVybiB7CiAgICAgICAgIGlkOiBzY3JpcHQuaWQsCiAg ICAgICAgIG5hbWU6IHNjcmlwdC5uYW1lT3JTb3VyY2VVUkwoKSwKICAgICAgICAgc291cmNlOiBz Y3JpcHQuc291cmNlLAogICAgICAgICBsaW5lT2Zmc2V0OiBzY3JpcHQubGluZV9vZmZzZXQsCiAg ICAgICAgIGNvbHVtbk9mZnNldDogc2NyaXB0LmNvbHVtbl9vZmZzZXQsCi0gICAgICAgIHNjcmlw dFdvcmxkVHlwZTogc2NyaXB0V29ybGRUeXBlCisgICAgICAgIGlzQ29udGVudFNjcmlwdDogc2Ny aXB0LmNvbnRleHRfZGF0YSAmJiBzY3JpcHQuY29udGV4dF9kYXRhLmluZGV4T2YoImluamVjdGVk IikgPT0gMAogICAgIH07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdERlYnVnU2VydmVyLmNwcAppbmRleCBlZTYzYWY4M2FhMDg3NGJhNWZjM2RlMzYzNDQwMmZm MmFjZWM0ODBlLi5hMGUxNGYzMmMwZTM0MjNiNmVmZjc4MGI5OThlMGMwMzU2ZGUxMDA4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBA IC0zNTEsNyArMzUxLDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZGlzcGF0Y2hEaWRQYXJz ZVNvdXJjZShTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lciwgdjgKICAgICAgICAgdG9XZWJD b3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG9iamVjdC0+R2V0KHY4OjpTdHJpbmc6 Ok5ldygic291cmNlIikpKSwKICAgICAgICAgb2JqZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJs aW5lT2Zmc2V0IikpLT5Ub0ludGVnZXIoKS0+VmFsdWUoKSwKICAgICAgICAgb2JqZWN0LT5HZXQo djg6OlN0cmluZzo6TmV3KCJjb2x1bW5PZmZzZXQiKSktPlRvSW50ZWdlcigpLT5WYWx1ZSgpLAot ICAgICAgICBzdGF0aWNfY2FzdDxTY3JpcHRXb3JsZFR5cGU+KG9iamVjdC0+R2V0KHY4OjpTdHJp bmc6Ok5ldygic2NyaXB0V29ybGRUeXBlIikpLT5JbnQzMlZhbHVlKCkpKTsKKyAgICAgICAgb2Jq ZWN0LT5HZXQodjg6OlN0cmluZzo6TmV3KCJpc0NvbnRlbnRTY3JpcHQiKSktPlRvQm9vbGVhbigp LT5WYWx1ZSgpKTsKIH0KIAogdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZW5zdXJlRGVidWdnZXJT Y3JpcHRDb21waWxlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5k ZXggMWFlNjZjY2MwYzE3NTcyMGQ2YjMzMjQ0NzAyMjI5M2U3ZjJhMGQzZi4uMjFjNDA0YmViM2Rj NGRlNzk2YzlkMTgxZTcyNWFlOTAwNDNjMThhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuanNvbgpAQCAtMTQ2MSw3ICsxNDYxLDcgQEAKICAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJsaW5lT2Zmc2V0IiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6 ICJMaW5lIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0aGUgcmVzb3VyY2Ugd2l0aCBnaXZl biBVUkwgKGZvciBzY3JpcHQgdGFncykuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImNvbHVtbk9mZnNldCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiQ29s dW1uIG9mZnNldCBvZiB0aGUgc2NyaXB0IHdpdGhpbiB0aGUgcmVzb3VyY2Ugd2l0aCBnaXZlbiBV UkwuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxlbmd0aCIsICJ0eXBlIjog ImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiTGVuZ3RoIG9mIHRoZSBzY3JpcHQiIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2NyaXB0V29ybGRUeXBlIiwgInR5cGUiOiAiaW50 ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJTY3JpcHQgdHlwZS4gLy8gRklYTUUuIiB9CisgICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiaXNDb250ZW50U2NyaXB0IiwgInR5cGUiOiAiYm9vbGVh biIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJEZXRlcm1pbmVzIHdoZXRoZXIg dGhpcyBzY3JpcHQgaXMgYSB1c2VyIGV4dGVuc2lvbiBzY3JpcHQuIiB9CiAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiB2aXJ0dWFs IG1hY2hpbmUgcGFyc2VzIHNjcmlwdC4gVGhpcyBldmVuIGlzIGFsc28gZmlyZWQgZm9yIGFsbCBr bm93biBzY3JpcHRzIHVwb24gZW5hYmxpbmcgZGVidWdnZXIuIgogICAgICAgICAgICAgfSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNw cAppbmRleCBjODI4M2ExNTI0OWJlODYxNmQxY2M4YTE5MGZhYTk3Njc0NzQwNzJjLi5hYmU5NWNl MGJmMjZkNjgwMzI4ODcwNGNlNGMyYmJlZDZjZGNjYjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC0zNzQsMTAgKzM3 NCwxMCBAQCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjpjdXJyZW50Q2FsbEZyYW1lcygpCiAKIC8vIEphdmFTY3JpcHREZWJ1Z0xpc3RlbmVyIGZ1bmN0 aW9ucwogCi12b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0 IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEs IGludCBsaW5lT2Zmc2V0LCBpbnQgY29sdW1uT2Zmc2V0LCBTY3JpcHRXb3JsZFR5cGUgd29ybGRU eXBlKQordm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZShjb25zdCBT dHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBp bnQgbGluZU9mZnNldCwgaW50IGNvbHVtbk9mZnNldCwgYm9vbCBpc0NvbnRlbnRTY3JpcHQpCiB7 CiAgICAgLy8gRG9uJ3Qgc2VuZCBzY3JpcHQgY29udGVudCB0byB0aGUgZnJvbnQgZW5kIHVudGls IGl0J3MgcmVhbGx5IG5lZWRlZC4KLSAgICBtX2Zyb250ZW5kLT5zY3JpcHRQYXJzZWQoc291cmNl SUQsIHVybCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBkYXRhLmxlbmd0aCgpLCB3b3JsZFR5 cGUpOworICAgIG1fZnJvbnRlbmQtPnNjcmlwdFBhcnNlZChzb3VyY2VJRCwgdXJsLCBsaW5lT2Zm c2V0LCBjb2x1bW5PZmZzZXQsIGRhdGEubGVuZ3RoKCksIGlzQ29udGVudFNjcmlwdCk7CiAKICAg ICBtX3NjcmlwdHMuc2V0KHNvdXJjZUlELCBTY3JpcHQodXJsLCBkYXRhLCBsaW5lT2Zmc2V0LCBj b2x1bW5PZmZzZXQpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggN2FlMDMwM2Y4ZmZmMjZmMGFlZDBiY2ZlMGQxYzhlNjBh MDJiMjk0Mi4uNGVmZjg1YmJkNWYzYzNjY2QwYmE3OTJkYjdjM2ZmOTBkMmE4YWI1NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCkBA IC0xMTksNyArMTE5LDcgQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJy YXk+IGN1cnJlbnRDYWxsRnJhbWVzKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUGFyc2VTb3Vy Y2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmlu ZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQsIFNjcmlwdFdvcmxkVHlw ZSk7CisgICAgdmlydHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc291cmNl SUQsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBsaW5lT2Zmc2V0 LCBpbnQgY29sdW1uT2Zmc2V0LCBib29sIGlzQ29udGVudFNjcmlwdCk7CiAgICAgdmlydHVhbCB2 b2lkIGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYg ZGF0YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJvck1l c3NhZ2UpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRQYXVzZShTY3JpcHRTdGF0ZSopOwogICAgIHZp cnR1YWwgdm9pZCBkaWRDb250aW51ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9T Y3JpcHREZWJ1Z0xpc3RlbmVyLmgKaW5kZXggYTI4Y2FiYmYyY2YwMzc5NWZmMzdmMzNhMGE4Y2Q5 ZjM1MGMxMzhiMy4uNGE5M2E0Y2E2OWI2NTdhZmY5MzM3ODgyNTBkMjc2YjIyOTQ5MGNiMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvU2NyaXB0RGVidWdMaXN0ZW5lci5oCkBAIC0z NywxNiArMzcsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1lbnVtIFNjcmlwdFdvcmxk VHlwZSB7Ci1NQUlOX1dPUkxEID0gMCwKLUVYVEVOU0lPTlNfV09STEQKLX07Ci0KIGNsYXNzIFNj cmlwdERlYnVnTGlzdGVuZXIgewogcHVibGljOgogICAgIHZpcnR1YWwgflNjcmlwdERlYnVnTGlz dGVuZXIoKSB7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJp bmcmICBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50 IGxpbmVPZmZzZXQsIGludCBjb2x1bW5PZmZzZXQsIFNjcmlwdFdvcmxkVHlwZSkgPSAwOworICAg IHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmICBzb3VyY2VJRCwgY29u c3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0YSwgaW50IGxpbmVPZmZzZXQsIGludCBj b2x1bW5PZmZzZXQsIGJvb2wgaXNDb250ZW50U2NyaXB0KSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IGZhaWxlZFRvUGFyc2VTb3VyY2UoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZGF0 YSwgaW50IGZpcnN0TGluZSwgaW50IGVycm9yTGluZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3Nh Z2UpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUGF1c2UoU2NyaXB0U3RhdGUqKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIGRpZENvbnRpbnVlKCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCmluZGV4IGFjNGJiYWZkMGE2 MzhjMjAzMzkwMGViYjI4NTI3YzI0MGNhMDIwMjUuLmEzM2Q2OWI1MGFjMDBlNjQ4MTZjNDhhMjRk ZjU0NWQwMmYxNDg3ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyTW9kZWwuanMKQEAgLTE3OSw5ICsxNzksOSBAQCBXZWJJbnNwZWN0b3Iu RGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlclJlc3Vt ZWQpOwogICAgIH0sCiAKLSAgICBfcGFyc2VkU2NyaXB0U291cmNlOiBmdW5jdGlvbihzb3VyY2VJ RCwgc291cmNlVVJMLCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgc2NyaXB0V29y bGRUeXBlKQorICAgIF9wYXJzZWRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3Vy Y2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9mZnNldCwgbGVuZ3RoLCBpc0NvbnRlbnRTY3JpcHQp CiAgICAgewotICAgICAgICB2YXIgc2NyaXB0ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoc291 cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9mZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5ndGgsIHVuZGVm aW5lZCwgdW5kZWZpbmVkLCBzY3JpcHRXb3JsZFR5cGUpOworICAgICAgICB2YXIgc2NyaXB0ID0g bmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoc291cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9mZnNldCwg Y29sdW1uT2Zmc2V0LCBsZW5ndGgsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBpc0NvbnRlbnRTY3Jp cHQpOwogICAgICAgICB0aGlzLl9zY3JpcHRzW3NvdXJjZUlEXSA9IHNjcmlwdDsKICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu RXZlbnRzLlBhcnNlZFNjcmlwdFNvdXJjZSwgc2NyaXB0KTsKICAgICB9LApAQCAtMjI3LDkgKzIy Nyw5IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl9kZWJ1Z2dlck1vZGVsLl9kZWJ1Z2dlcldhc0Rpc2FibGVkKCk7CiAgICAgfSwK IAotICAgIHNjcmlwdFBhcnNlZDogZnVuY3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9m ZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5ndGgsIHNjcmlwdFdvcmxkVHlwZSkKKyAgICBzY3JpcHRQ YXJzZWQ6IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmVPZmZzZXQsIGNvbHVtbk9m ZnNldCwgbGVuZ3RoLCBpc0NvbnRlbnRTY3JpcHQpCiAgICAgewotICAgICAgICB0aGlzLl9kZWJ1 Z2dlck1vZGVsLl9wYXJzZWRTY3JpcHRTb3VyY2Uoc291cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9m ZnNldCwgY29sdW1uT2Zmc2V0LCBsZW5ndGgsIHNjcmlwdFdvcmxkVHlwZSk7CisgICAgICAgIHRo aXMuX2RlYnVnZ2VyTW9kZWwuX3BhcnNlZFNjcmlwdFNvdXJjZShzb3VyY2VJRCwgc291cmNlVVJM LCBsaW5lT2Zmc2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgaXNDb250ZW50U2NyaXB0KTsKICAg ICB9LAogCiAgICAgc2NyaXB0RmFpbGVkVG9QYXJzZTogZnVuY3Rpb24oc291cmNlVVJMLCBzb3Vy Y2UsIHN0YXJ0aW5nTGluZSwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCmluZGV4IGIxZjRjZjNiZDkxYWVlMWIx OWU4YTQ1OGJhOGUyODU3YzQ3OWQxYWEuLjllNzVkODNjZDkzZWQ4MGFjZGY3NDdkYTMxYzIzYmJi YTk1OTQyM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 LmpzCkBAIC0yMyw3ICsyMyw3IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rv ci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zmc2V0LCBjb2x1 bW5PZmZzZXQsIGxlbmd0aCwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UsIHdvcmxkVHlwZSkKK1dl Ykluc3BlY3Rvci5TY3JpcHQgPSBmdW5jdGlvbihzb3VyY2VJRCwgc291cmNlVVJMLCBsaW5lT2Zm c2V0LCBjb2x1bW5PZmZzZXQsIGxlbmd0aCwgZXJyb3JMaW5lLCBlcnJvck1lc3NhZ2UsIGlzQ29u dGVudFNjcmlwdCkKIHsKICAgICB0aGlzLnNvdXJjZUlEID0gc291cmNlSUQ7CiAgICAgdGhpcy5z b3VyY2VVUkwgPSBzb3VyY2VVUkw7CkBAIC0zMiwxMiArMzIsNyBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0ID0gZnVuY3Rpb24oc291cmNlSUQsIHNvdXJjZVVSTCwgbGluZU9mZnNldCwgY29sdW1uT2Zm c2V0LCBsZQogICAgIHRoaXMubGVuZ3RoID0gbGVuZ3RoOwogICAgIHRoaXMuZXJyb3JMaW5lID0g ZXJyb3JMaW5lOwogICAgIHRoaXMuZXJyb3JNZXNzYWdlID0gZXJyb3JNZXNzYWdlOwotICAgIHRo aXMud29ybGRUeXBlID0gd29ybGRUeXBlOwotfQotCi1XZWJJbnNwZWN0b3IuU2NyaXB0Lldvcmxk VHlwZSA9IHsKLSAgICBNQUlOX1dPUkxEOiAwLAotICAgIEVYVEVOU0lPTlNfV09STEQ6IDEKKyAg ICB0aGlzLmlzQ29udGVudFNjcmlwdCA9IGlzQ29udGVudFNjcmlwdDsKIH0KIAogV2ViSW5zcGVj dG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDUzZTU5Y2E3Y2NhMzcwMGU4MTVjNTI4 NjFhMWE3YjQ2YTI0NDA0YzQuLjRkZTUyOTUwMDgxZDFiMDI5ODMzNjY0OGZiNmQ4MWRhN2FmODZm YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCkBAIC0yODAsNyArMjgwLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBzZWxlY3QgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1l bnQ7CiAgICAgICAgIHZhciBvcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24i KTsKICAgICAgICAgb3B0aW9uLnRleHQgPSBzb3VyY2VGaWxlLnVybCA/IFdlYkluc3BlY3Rvci5k aXNwbGF5TmFtZUZvclVSTChzb3VyY2VGaWxlLnVybCkgOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco Iihwcm9ncmFtKSIpOwotICAgICAgICBpZiAoc291cmNlRmlsZS5pc0V4dGVuc2lvblNjcmlwdCkK KyAgICAgICAgaWYgKHNvdXJjZUZpbGUuaXNDb250ZW50U2NyaXB0KQogICAgICAgICAgICAgb3B0 aW9uLmFkZFN0eWxlQ2xhc3MoImV4dGVuc2lvbi1zY3JpcHQiKTsKICAgICAgICAgZnVuY3Rpb24g b3B0aW9uQ29tcGFyZShhLCBiKQogICAgICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKaW5kZXggNzA1ZmJkYTljMmE1MmY4YWUwNWMw ZTg4NTk1MjE1OTFlZGI4NjRmNC4uYWM1OTRiYjU4NmJmM2UwZDhlNjE2OGM2OGQ5NmUwNDQzMTcz MzE1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3Vy Y2VGaWxlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RmlsZS5qcwpAQCAtMzgsNyArMzgsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRmlsZSA9IGZ1bmN0 aW9uKGlkLCBzY3JpcHQsIGNvbnRlbnRDaGFuZ2VkRGVsZWdhdGUpCiAKICAgICB0aGlzLmlkID0g aWQ7CiAgICAgdGhpcy51cmwgPSBzY3JpcHQuc291cmNlVVJMOwotICAgIHRoaXMuaXNFeHRlbnNp b25TY3JpcHQgPSBzY3JpcHQud29ybGRUeXBlID09PSBXZWJJbnNwZWN0b3IuU2NyaXB0Lldvcmxk VHlwZS5FWFRFTlNJT05TX1dPUkxEOworICAgIHRoaXMuaXNDb250ZW50U2NyaXB0ID0gc2NyaXB0 LmlzQ29udGVudFNjcmlwdDsKICAgICB0aGlzLm1lc3NhZ2VzID0gW107CiAgICAgdGhpcy5icmVh a3BvaW50cyA9IHt9OwogCg==