58207 2011-04-10 11:56:48 -0700 Web Inspector: add support for optional output parameters. 2011-04-11 05:31:19 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 382920 0 pfeldman 2011-04-10 11:56:48 -0700 Output parameters such as "redirectResponse" are optional, but do not allow specifying them as such. 382921 1 88956 pfeldman 2011-04-10 12:05:00 -0700 Created attachment 88956 Patch 382926 2 88956 loislo 2011-04-10 13:16:01 -0700 Comment on attachment 88956 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88956&action=review > Source/WebCore/inspector/CodeGeneratorInspector.pm:380 > + foreach my $parameter (@argsFiltered) { > + my $optional = $parameter->extendedAttributes->{"optional"} ? "if (" . $parameter->name . ") " : ""; > + push(@function, " " . $optional . "paramsObject->set" . typeTraits($parameter->type, "JSONType") . "(\"" . $parameter->name . "\", " . $parameter->name . ");"); The generated code doesn't match WebKit style guide. > Source/WebCore/inspector/CodeGeneratorInspector.pm:487 > + my $optional = $parameter->extendedAttributes->{"optional"} ? "if (out_" . $parameter->name . ") " : ""; > + push(@function, " " . $optional . "result->set" . typeTraits($parameter->type, "JSONType") . "(\"" . $parameter->name . "\", out_" . $parameter->name . ");"); The code doesn't work well for Array and Object types I'm not sure about strings. The out arguments for array and object types have default values which are not equal to false. generated code doesn't match WebKit style guide. 383074 3 88980 pfeldman 2011-04-11 02:51:46 -0700 Created attachment 88980 Patch 383097 4 88980 loislo 2011-04-11 04:28:07 -0700 Comment on attachment 88980 Patch lgtm 383115 5 88980 pfeldman 2011-04-11 05:31:09 -0700 Comment on attachment 88980 Patch Clearing flags on attachment: 88980 Committed r83435: <http://trac.webkit.org/changeset/83435> 383116 6 pfeldman 2011-04-11 05:31:19 -0700 All reviewed patches have been landed. Closing bug. 88956 2011-04-10 12:05:00 -0700 2011-04-11 02:51:40 -0700 Patch bug-58207-20110410230456.patch text/plain 8828 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODMzNzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhOGYwZDYzNWNmMGE4YTNl ZDNlNTUyYjk5NWNjMTM1ZGQ5MTJjMTM5Li4wOWM0OTRmYWU1OWEwYTFiZTg0YWVmNjlkYTBmYjlj ZGJhNGQwNmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHN1cHBvcnQgZm9y IG9wdGlvbmFsIG91dHB1dCBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgyMDcKKworICAgICAgICBPdXRwdXQgcGFyYW1ldGVycyBz dWNoIGFzICJyZWRpcmVjdFJlc3BvbnNlIiBhcmUgb3B0aW9uYWwsIGJ1dAorICAgICAgICBkbyBu b3QgYWxsb3cgc3BlY2lmeWluZyB0aGVtIGFzIHN1Y2guCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5wbToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAg ICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVzb3VyY2UpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLl91cGRhdGVSZXNvdXJjZVdpdGhSZXNwb25z ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2dlbmVyYXRlLWluc3BlY3Rvci1pZGw6CisKIDIwMTEt MDQtMDkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbSBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtCmluZGV4IDkwMjkzNTg1MTUwNTZhZjEyOWE4 ZDVkYTcwODI5NmMyNGNmMzMyMjcuLjRhZTk1MDdhYzA2NDBmOWI0MzY4MzJmZmYxYjQ4NTI3MzM3 MjRiZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9y SW5zcGVjdG9yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9y SW5zcGVjdG9yLnBtCkBAIC0zNzUsOCArMzc1LDEwIEBAIHN1YiBnZW5lcmF0ZUZyb250ZW5kRnVu Y3Rpb24KICAgICBwdXNoKEBmdW5jdGlvbiwgIiAgICAke2Z1bmN0aW9uTmFtZX1NZXNzYWdlLT5z ZXRTdHJpbmcoXCJtZXRob2RcIiwgXCIkZG9tYWluLiRmdW5jdGlvbk5hbWVcIik7Iik7CiAgICAg aWYgKHNjYWxhcihAYXJnc0ZpbHRlcmVkKSkgewogICAgICAgICBwdXNoKEBmdW5jdGlvbiwgIiAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBwYXJhbXNPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6 OmNyZWF0ZSgpOyIpOwotICAgICAgICBteSBAcHVzaEFyZ3VtZW50cyA9IG1hcCgiICAgIHBhcmFt c09iamVjdC0+c2V0IiAuIHR5cGVUcmFpdHMoJF8tPnR5cGUsICJKU09OVHlwZSIpIC4gIihcIiIg LiAkXy0+bmFtZSAuICJcIiwgIiAuICRfLT5uYW1lIC4gIik7IiwgQGFyZ3NGaWx0ZXJlZCk7Ci0g ICAgICAgIHB1c2goQGZ1bmN0aW9uLCBAcHVzaEFyZ3VtZW50cyk7CisgICAgICAgIGZvcmVhY2gg bXkgJHBhcmFtZXRlciAoQGFyZ3NGaWx0ZXJlZCkgeworICAgICAgICAgICAgbXkgJG9wdGlvbmFs ID0gJHBhcmFtZXRlci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Im9wdGlvbmFsIn0gPyAiaWYgKCIg LiAkcGFyYW1ldGVyLT5uYW1lIC4gIikgIiA6ICIiOworICAgICAgICAgICAgcHVzaChAZnVuY3Rp b24sICIgICAgIiAuICRvcHRpb25hbCAuICAicGFyYW1zT2JqZWN0LT5zZXQiIC4gdHlwZVRyYWl0 cygkcGFyYW1ldGVyLT50eXBlLCAiSlNPTlR5cGUiKSAuICIoXCIiIC4gJHBhcmFtZXRlci0+bmFt ZSAuICJcIiwgIiAuICRwYXJhbWV0ZXItPm5hbWUgLiAiKTsiKTsKKyAgICAgICAgfQogICAgICAg ICBwdXNoKEBmdW5jdGlvbiwgIiAgICAke2Z1bmN0aW9uTmFtZX1NZXNzYWdlLT5zZXRPYmplY3Qo XCJwYXJhbXNcIiwgcGFyYW1zT2JqZWN0KTsiKTsKICAgICB9CiAgICAgcHVzaChAZnVuY3Rpb24s ICIgICAgbV9pbnNwZWN0b3JGcm9udGVuZENoYW5uZWwtPnNlbmRNZXNzYWdlVG9Gcm9udGVuZCgk e2Z1bmN0aW9uTmFtZX1NZXNzYWdlLT50b0pTT05TdHJpbmcoKSk7Iik7CkBAIC00ODAsNyArNDgy LDEwIEBAIHN1YiBnZW5lcmF0ZUJhY2tlbmRGdW5jdGlvbgogICAgIHB1c2goQGZ1bmN0aW9uLCAi Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVz cG9uc2VNZXNzYWdlID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsiKTsKICAgICBwdXNoKEBm dW5jdGlvbiwgIiAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXN1bHQgPSBJbnNwZWN0b3JP YmplY3Q6OmNyZWF0ZSgpOyIpOwotICAgIHB1c2goQGZ1bmN0aW9uLCBtYXAoIiAgICAgICAgcmVz dWx0LT5zZXQiIC4gdHlwZVRyYWl0cygkXy0+dHlwZSwgIkpTT05UeXBlIikgLiAiKFwiIiAuICRf LT5uYW1lIC4gIlwiLCBvdXRfIiAuICRfLT5uYW1lIC4gIik7IiwgQG91dEFyZ3MpKTsKKyAgICBm b3JlYWNoIG15ICRwYXJhbWV0ZXIgKEBvdXRBcmdzKSB7CisgICAgICAgIG15ICRvcHRpb25hbCA9 ICRwYXJhbWV0ZXItPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJvcHRpb25hbCJ9ID8gImlmIChvdXRf IiAuICRwYXJhbWV0ZXItPm5hbWUgLiAiKSAiIDogIiI7CisgICAgICAgIHB1c2goQGZ1bmN0aW9u LCAiICAgICIgLiAkb3B0aW9uYWwgLiAgInJlc3VsdC0+c2V0IiAuIHR5cGVUcmFpdHMoJHBhcmFt ZXRlci0+dHlwZSwgIkpTT05UeXBlIikgLiAiKFwiIiAuICRwYXJhbWV0ZXItPm5hbWUgLiAiXCIs IG91dF8iIC4gJHBhcmFtZXRlci0+bmFtZSAuICIpOyIpOworICAgIH0KICAgICBwdXNoKEBmdW5j dGlvbiwgIiAgICByZXNwb25zZU1lc3NhZ2UtPnNldE9iamVjdChcInJlc3VsdFwiLCByZXN1bHQp OyIpOwogICAgIHB1c2goQGZ1bmN0aW9uLCAiIik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAg cmVzcG9uc2VNZXNzYWdlLT5zZXROdW1iZXIoXCJpZFwiLCBjYWxsSWQpOyIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IGNkOTFiNmQ4MmRkMDdhMzk0YmQ4Zjc0 Yzg2NmZlNmRhY2QxOWVhYjAuLjU2ZDExM2MxM2E2ZDFmNDE4ZDRlZTY2NjA1OGZkMGJjYmUzNTgz ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTM4Niw3ICsz ODYsNyBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImxvYWRlcklkIiwgInR5cGUi OiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkxvYWRlciBpZGVudGlmaWVyLiIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkb2N1bWVudFVSTCIsICJ0eXBlIjogInN0cmluZyIs ICJkZXNjcmlwdGlvbiI6ICJVUkwgb2YgdGhlIGRvY3VtZW50IHRoaXMgcmVzb3VyY2UgaXMgbG9h ZGVkIGZvci4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVxdWVzdCIsICIk cmVmIjogIlJlc291cmNlUmVxdWVzdCIsICJkZXNjcmlwdGlvbiI6ICJSZXF1ZXN0IGRhdGEuIiB9 LAotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlZGlyZWN0UmVzcG9uc2UiLCAiJHJl ZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiwgImRlc2NyaXB0aW9uIjogIlJlZGlyZWN0IHJlc3BvbnNl IGRhdGEuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlZGlyZWN0UmVzcG9u c2UiLCAib3B0aW9uYWwiOiB0cnVlLCAiJHJlZiI6ICJSZXNvdXJjZVJlc3BvbnNlIiwgImRlc2Ny aXB0aW9uIjogIlJlZGlyZWN0IHJlc3BvbnNlIGRhdGEuIiB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInRpbWUiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiVGlt ZXN0YW1wLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjYWxsU3RhY2siLCAi dHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkRlYnVnZ2VyU3RhY2tGcmFtZSJ9 LCAiZGVzY3JpcHRpb24iOiAiSmF2YVNjcmlwdCBzdGFjayB0cmFjZSB1cG9uIGlzc3VpbmcgdGhp cyByZXF1ZXN0LiIgfQogICAgICAgICAgICAgICAgIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAppbmRleCBmMjczNzRmZTUwODY0 NWRkNDU5MzZjM2QxZjRlYTliNjIyZDMwMzFlLi42NjY0YTQ2YzRlNWRjZjNhZTM0YTRkOWQ3MTQx OWY2NmYzMzUzMGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclJlc291cmNlQWdlbnQuY3BwCkBAIC0yMTUsMTAgKzIxNSwxMCBAQCBzdGF0aWMgUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXF1ZXN0KGNvbnN0 IFJlc291cmNlUgogCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2Jq ZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkK IHsKLSAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZXNwb25zZU9iamVjdCA9IEluc3BlY3Rv ck9iamVjdDo6Y3JlYXRlKCk7CiAgICAgaWYgKHJlc3BvbnNlLmlzTnVsbCgpKQotICAgICAgICBy ZXR1cm4gcmVzcG9uc2VPYmplY3Q7CisgICAgICAgIHJldHVybiAwOwogCisgICAgUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gcmVzcG9uc2VPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgp OwogICAgIHJlc3BvbnNlT2JqZWN0LT5zZXROdW1iZXIoInN0YXR1cyIsIHJlc3BvbnNlLnJlc291 cmNlTG9hZEluZm8oKSA/IHJlc3BvbnNlLnJlc291cmNlTG9hZEluZm8oKS0+aHR0cFN0YXR1c0Nv ZGUgOiByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpKTsKICAgICByZXNwb25zZU9iamVjdC0+c2V0 U3RyaW5nKCJzdGF0dXNUZXh0IiwgcmVzcG9uc2UucmVzb3VyY2VMb2FkSW5mbygpID8gcmVzcG9u c2UucmVzb3VyY2VMb2FkSW5mbygpLT5odHRwU3RhdHVzVGV4dCA6IHJlc3BvbnNlLmh0dHBTdGF0 dXNUZXh0KCkpOwogICAgIHJlc3BvbnNlT2JqZWN0LT5zZXRPYmplY3QoImhlYWRlcnMiLCBidWls ZE9iamVjdEZvckhlYWRlcnMocmVzcG9uc2UucmVzb3VyY2VMb2FkSW5mbygpID8gcmVzcG9uc2Uu cmVzb3VyY2VMb2FkSW5mbygpLT5yZXNwb25zZUhlYWRlcnMgOiByZXNwb25zZS5odHRwSGVhZGVy RmllbGRzKCkpKTsKQEAgLTI3MCw3ICsyNzAsOSBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVzb3VyY2UoY29uc3QgQ2FjaGVkUmVzbwog ICAgIHJlc291cmNlT2JqZWN0LT5zZXRTdHJpbmcoInVybCIsIGNhY2hlZFJlc291cmNlLnVybCgp KTsKICAgICByZXNvdXJjZU9iamVjdC0+c2V0U3RyaW5nKCJ0eXBlIiwgY2FjaGVkUmVzb3VyY2VU eXBlU3RyaW5nKGNhY2hlZFJlc291cmNlKSk7CiAgICAgcmVzb3VyY2VPYmplY3QtPnNldE51bWJl cigiYm9keVNpemUiLCBjYWNoZWRSZXNvdXJjZS5lbmNvZGVkU2l6ZSgpKTsKLSAgICByZXNvdXJj ZU9iamVjdC0+c2V0T2JqZWN0KCJyZXNwb25zZSIsIGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNw b25zZShjYWNoZWRSZXNvdXJjZS5yZXNwb25zZSgpKSk7CisgICAgUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gcmVzb3VyY2VSZXNwb25zZSA9IGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShj YWNoZWRSZXNvdXJjZS5yZXNwb25zZSgpKTsKKyAgICBpZiAocmVzb3VyY2VSZXNwb25zZSkKKyAg ICAgICAgcmVzb3VyY2VPYmplY3QtPnNldE9iamVjdCgicmVzcG9uc2UiLCByZXNvdXJjZVJlc3Bv bnNlKTsKICAgICByZXR1cm4gcmVzb3VyY2VPYmplY3Q7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4IDk4YWEw NjBiYjQ5MTNjZWE5ZDAxODUzNDJhYjBkZTA3ZGQ3YjFkYzcuLjkxODVjYTYxZjM0MjYzNWRkMzc3 ZTc5MmUzYmUxOGQwYjkwZTIyMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtODUsNyArODUsNyBAQCBXZWJJbnNw ZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlID0gewogCiAgICAgX3VwZGF0ZVJlc291 cmNlV2l0aFJlc3BvbnNlOiBmdW5jdGlvbihyZXNvdXJjZSwgcmVzcG9uc2UpCiAgICAgewotICAg ICAgICBpZiAoISgic3RhdHVzIiBpbiByZXNwb25zZSkpCisgICAgICAgIGlmICghcmVzcG9uc2Up CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgcmVzb3VyY2UubWltZVR5cGUgPSByZXNw b25zZS5taW1lVHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9nZW5l cmF0ZS1pbnNwZWN0b3ItaWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2dlbmVyYXRlLWlu c3BlY3Rvci1pZGwKaW5kZXggOTZkM2FjNWJiZDgwNzM1MWQ5MmYzMWVjZDA1Nzg0YTMxYzE4NTRl OC4uMjE4NzFiNWE5NDhhNzBlZDFmYmFmZGQ0NjZiZmMxNjMzZGNkZjljNyAxMDA3NTUKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2dlbmVyYXRlLWluc3BlY3Rvci1pZGwKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2dlbmVyYXRlLWluc3BlY3Rvci1pZGwKQEAgLTEyMywxNCAr MTIzLDIyIEBAIGZvciBkb21haW4gaW4ganNvbl9hcGk6CiAgICAgICAgICAgICAgICAgICAgIHBh cmFtcy5hcHBlbmQoImluJXMgJXMgJXMiICUgKG9wdGlvbmFsLCBwYXJhbV90eXBlKGluX3BhcmFt KSwgaW5fcGFyYW1bIm5hbWUiXSkpCiAgICAgICAgICAgICBpZiAoInJldHVybnMiIGluIGNvbW1h bmQpOgogICAgICAgICAgICAgICAgIGZvciBvdXRfcGFyYW0gaW4gY29tbWFuZFsicmV0dXJucyJd OgotICAgICAgICAgICAgICAgICAgICBwYXJhbXMuYXBwZW5kKCJvdXQgJXMgJXMiICUgKHBhcmFt X3R5cGUob3V0X3BhcmFtKSwgb3V0X3BhcmFtWyJuYW1lIl0pKQorICAgICAgICAgICAgICAgICAg ICBpZiAoIm9wdGlvbmFsIiBpbiBvdXRfcGFyYW0pOgorICAgICAgICAgICAgICAgICAgICAgICAg b3B0aW9uYWwgPSAiIFtvcHRpb25hbF0iCisgICAgICAgICAgICAgICAgICAgIGVsc2U6CisgICAg ICAgICAgICAgICAgICAgICAgICBvcHRpb25hbCA9ICIiCisgICAgICAgICAgICAgICAgICAgIHBh cmFtcy5hcHBlbmQoIm91dCVzICVzICVzIiAlIChvcHRpb25hbCwgcGFyYW1fdHlwZShvdXRfcGFy YW0pLCBvdXRfcGFyYW1bIm5hbWUiXSkpCiAgICAgICAgICAgICBvdXRwdXRfZmlsZS53cml0ZSgi XG4gICAgICAgIHZvaWQgJXMoJXMpOyIgJSAoY29tbWFuZFsibmFtZSJdLCAiLCAiLmpvaW4ocGFy YW1zKSkpCiAgICAgaWYgImV2ZW50cyIgaW4gZG9tYWluOgogICAgICAgICBmb3IgZXZlbnQgaW4g ZG9tYWluWyJldmVudHMiXToKICAgICAgICAgICAgIHBhcmFtcyA9IFtdCiAgICAgICAgICAgICBp ZiAoInBhcmFtZXRlcnMiIGluIGV2ZW50KToKICAgICAgICAgICAgICAgICBmb3IgaW5fcGFyYW0g aW4gZXZlbnRbInBhcmFtZXRlcnMiXToKLSAgICAgICAgICAgICAgICAgICAgcGFyYW1zLmFwcGVu ZCgib3V0ICVzICVzIiAlIChwYXJhbV90eXBlKGluX3BhcmFtKSwgaW5fcGFyYW1bIm5hbWUiXSkp CisgICAgICAgICAgICAgICAgICAgIGlmICgib3B0aW9uYWwiIGluIGluX3BhcmFtKToKKyAgICAg ICAgICAgICAgICAgICAgICAgIG9wdGlvbmFsID0gIiBbb3B0aW9uYWxdIgorICAgICAgICAgICAg ICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9uYWwgPSAiIgorICAg ICAgICAgICAgICAgICAgICBwYXJhbXMuYXBwZW5kKCJvdXQlcyAlcyAlcyIgJSAob3B0aW9uYWws IHBhcmFtX3R5cGUoaW5fcGFyYW0pLCBpbl9wYXJhbVsibmFtZSJdKSkKICAgICAgICAgICAgIG91 dHB1dF9maWxlLndyaXRlKCJcbiAgICAgICAgW2V2ZW50XSB2b2lkICVzKCVzKTsiICUgKGV2ZW50 WyJuYW1lIl0sICIsICIuam9pbihwYXJhbXMpKSkKICAgICBvdXRwdXRfZmlsZS53cml0ZSgiXG4g ICAgfTsiKQogICAgIGlmIGRvbWFpblsiZG9tYWluIl0gaW4gbWFjcm9fdHJhaXRzOgo= 88980 2011-04-11 02:51:46 -0700 2011-04-11 05:31:09 -0700 Patch bug-58207-20110411135143.patch text/plain 8363 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODMzNzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhOGYwZDYzNWNmMGE4YTNl ZDNlNTUyYjk5NWNjMTM1ZGQ5MTJjMTM5Li4wOWM0OTRmYWU1OWEwYTFiZTg0YWVmNjlkYTBmYjlj ZGJhNGQwNmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHN1cHBvcnQgZm9y IG9wdGlvbmFsIG91dHB1dCBwYXJhbWV0ZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgyMDcKKworICAgICAgICBPdXRwdXQgcGFyYW1ldGVycyBz dWNoIGFzICJyZWRpcmVjdFJlc3BvbnNlIiBhcmUgb3B0aW9uYWwsIGJ1dAorICAgICAgICBkbyBu b3QgYWxsb3cgc3BlY2lmeWluZyB0aGVtIGFzIHN1Y2guCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5wbToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAg ICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yQ2FjaGVkUmVzb3VyY2UpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLl91cGRhdGVSZXNvdXJjZVdpdGhSZXNwb25z ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2dlbmVyYXRlLWluc3BlY3Rvci1pZGw6CisKIDIwMTEt MDQtMDkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbSBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtCmluZGV4IDkwMjkzNTg1MTUwNTZhZjEyOWE4 ZDVkYTcwODI5NmMyNGNmMzMyMjcuLjg4NTJmYWZkZTgzYmJkODk5MzBhMjBmNzE2YThjODZhZmU5 Y2RkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9y SW5zcGVjdG9yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9y SW5zcGVjdG9yLnBtCkBAIC0zNzUsOCArMzc1LDExIEBAIHN1YiBnZW5lcmF0ZUZyb250ZW5kRnVu Y3Rpb24KICAgICBwdXNoKEBmdW5jdGlvbiwgIiAgICAke2Z1bmN0aW9uTmFtZX1NZXNzYWdlLT5z ZXRTdHJpbmcoXCJtZXRob2RcIiwgXCIkZG9tYWluLiRmdW5jdGlvbk5hbWVcIik7Iik7CiAgICAg aWYgKHNjYWxhcihAYXJnc0ZpbHRlcmVkKSkgewogICAgICAgICBwdXNoKEBmdW5jdGlvbiwgIiAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBwYXJhbXNPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6 OmNyZWF0ZSgpOyIpOwotICAgICAgICBteSBAcHVzaEFyZ3VtZW50cyA9IG1hcCgiICAgIHBhcmFt c09iamVjdC0+c2V0IiAuIHR5cGVUcmFpdHMoJF8tPnR5cGUsICJKU09OVHlwZSIpIC4gIihcIiIg LiAkXy0+bmFtZSAuICJcIiwgIiAuICRfLT5uYW1lIC4gIik7IiwgQGFyZ3NGaWx0ZXJlZCk7Ci0g ICAgICAgIHB1c2goQGZ1bmN0aW9uLCBAcHVzaEFyZ3VtZW50cyk7CisKKyAgICAgICAgZm9yZWFj aCBteSAkcGFyYW1ldGVyIChAYXJnc0ZpbHRlcmVkKSB7CisgICAgICAgICAgICBteSAkb3B0aW9u YWwgPSAkcGFyYW1ldGVyLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsib3B0aW9uYWwifSA/ICJpZiAo IiAuICRwYXJhbWV0ZXItPm5hbWUgLiAiKVxuICAgICAgICAiIDogIiI7CisgICAgICAgICAgICBw dXNoKEBmdW5jdGlvbiwgIiAgICAiIC4gJG9wdGlvbmFsIC4gInBhcmFtc09iamVjdC0+c2V0IiAu IHR5cGVUcmFpdHMoJHBhcmFtZXRlci0+dHlwZSwgIkpTT05UeXBlIikgLiAiKFwiIiAuICRwYXJh bWV0ZXItPm5hbWUgLiAiXCIsICIgLiAkcGFyYW1ldGVyLT5uYW1lIC4gIik7Iik7CisgICAgICAg IH0KICAgICAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgJHtmdW5jdGlvbk5hbWV9TWVzc2FnZS0+ c2V0T2JqZWN0KFwicGFyYW1zXCIsIHBhcmFtc09iamVjdCk7Iik7CiAgICAgfQogICAgIHB1c2go QGZ1bmN0aW9uLCAiICAgIG1faW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsLT5zZW5kTWVzc2FnZVRv RnJvbnRlbmQoJHtmdW5jdGlvbk5hbWV9TWVzc2FnZS0+dG9KU09OU3RyaW5nKCkpOyIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IGNkOTFiNmQ4MmRkMDdhMzk0 YmQ4Zjc0Yzg2NmZlNmRhY2QxOWVhYjAuLjhkYzRiYThlYzFlMjE3MTBhNzAzM2ZlZmNkMmY4ZTAw ZjIyOWZmOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu anNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTM4 NiwxNCArMzg2LDE0IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9hZGVySWQi LCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTG9hZGVyIGlkZW50aWZpZXIuIiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvY3VtZW50VVJMIiwgInR5cGUiOiAi c3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlVSTCBvZiB0aGUgZG9jdW1lbnQgdGhpcyByZXNvdXJj ZSBpcyBsb2FkZWQgZm9yLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXF1 ZXN0IiwgIiRyZWYiOiAiUmVzb3VyY2VSZXF1ZXN0IiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3Qg ZGF0YS4iIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVkaXJlY3RSZXNwb25z ZSIsICIkcmVmIjogIlJlc291cmNlUmVzcG9uc2UiLCAiZGVzY3JpcHRpb24iOiAiUmVkaXJlY3Qg cmVzcG9uc2UgZGF0YS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicmVkaXJl Y3RSZXNwb25zZSIsICJvcHRpb25hbCI6IHRydWUsICIkcmVmIjogIlJlc291cmNlUmVzcG9uc2Ui LCAiZGVzY3JpcHRpb24iOiAiUmVkaXJlY3QgcmVzcG9uc2UgZGF0YS4iIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAidGltZSIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlv biI6ICJUaW1lc3RhbXAuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNhbGxT dGFjayIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiIgOiAiRGVidWdnZXJTdGFj a0ZyYW1lIn0sICJkZXNjcmlwdGlvbiI6ICJKYXZhU2NyaXB0IHN0YWNrIHRyYWNlIHVwb24gaXNz dWluZyB0aGlzIHJlcXVlc3QuIiB9CiAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJyZXNvdXJjZU1hcmtlZEFz Q2FjaGVkIiwKLSAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZWQgd2hlbiByZXF1 ZXN0IGlzIGtub3duIHRvIGJlIHNlcnZlZCBmcm9tIG1lbW9yeSBjYWNoZS4iLAorICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlZCB3aGVuIHJlcXVlc3QgaXMga25vd24gdG8gYmUg c2VydmVkIGZyb20gZGlzayBjYWNoZS4iLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjog WwogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkZW50aWZpZXIiLCAidHlwZSI6ICJp bnRlZ2VyIiwgImRlc2NyaXB0aW9uIjogIlJlcXVlc3QgaWRlbnRpZmllci4iIH0KICAgICAgICAg ICAgICAgICBdCkBAIC0xMjg0LDcgKzEyODQsNyBAQAogICAgICAgICAgICAgICAgIF0sCiAgICAg ICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi YnJlYWtwb2ludElkIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIklkIG9mIHRo ZSBjcmVhdGVkIGJyZWFrcG9pbnQgZm9yIGZ1cnRoZXIgbWFuaXB1bGF0aW9ucy4iIH0sCi0gICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibG9jYXRpb25zIiwgInR5cGUiOiAiYXJyYXkiLCAi aXRlbXMiOiB7ICIkcmVmIiA6ICJMb2NhdGlvbiJ9LCAiZGVzY3JpcHRpb24iOiAiTGlzdCBvZiB0 aGUgbG9jYXRpb25zIHRoaXMgYnJlYWtwb2ludCByZXNvbHZlZCBpbnRvLiIgfQorICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImxvY2F0aW9ucyIsICJvcHRpb25hbCI6IHRydWUsICJ0eXBl IjogImFycmF5IiwgIml0ZW1zIjogeyAiJHJlZiIgOiAiTG9jYXRpb24ifSwgImRlc2NyaXB0aW9u IjogIkxpc3Qgb2YgdGhlIGxvY2F0aW9ucyB0aGlzIGJyZWFrcG9pbnQgcmVzb2x2ZWQgaW50by4i IH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJT ZXRzIEphdmFTY3JpcHQgYnJlYWtwb2ludCBhdCBhIGdpdmVuIGxvY2F0aW9uIHNwZWNpZmllZCBi eSBVUkwuIFRoaXMgYnJlYWtwb2ludCB3aWxsIHN1cnZpdmUgcGFnZSByZWxvYWQuIgogICAgICAg ICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JS ZXNvdXJjZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNv dXJjZUFnZW50LmNwcAppbmRleCBmMjczNzRmZTUwODY0NWRkNDU5MzZjM2QxZjRlYTliNjIyZDMw MzFlLi42NjY0YTQ2YzRlNWRjZjNhZTM0YTRkOWQ3MTQxOWY2NmYzMzUzMGZlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBA IC0yMTUsMTAgKzIxNSwxMCBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1 aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFJlc291cmNlUgogCiBzdGF0aWMgUGFz c1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKLSAgICBSZWZQdHI8SW5zcGVjdG9y T2JqZWN0PiByZXNwb25zZU9iamVjdCA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CiAgICAg aWYgKHJlc3BvbnNlLmlzTnVsbCgpKQotICAgICAgICByZXR1cm4gcmVzcG9uc2VPYmplY3Q7Cisg ICAgICAgIHJldHVybiAwOwogCisgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVzcG9uc2VP YmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgIHJlc3BvbnNlT2JqZWN0LT5z ZXROdW1iZXIoInN0YXR1cyIsIHJlc3BvbnNlLnJlc291cmNlTG9hZEluZm8oKSA/IHJlc3BvbnNl LnJlc291cmNlTG9hZEluZm8oKS0+aHR0cFN0YXR1c0NvZGUgOiByZXNwb25zZS5odHRwU3RhdHVz Q29kZSgpKTsKICAgICByZXNwb25zZU9iamVjdC0+c2V0U3RyaW5nKCJzdGF0dXNUZXh0IiwgcmVz cG9uc2UucmVzb3VyY2VMb2FkSW5mbygpID8gcmVzcG9uc2UucmVzb3VyY2VMb2FkSW5mbygpLT5o dHRwU3RhdHVzVGV4dCA6IHJlc3BvbnNlLmh0dHBTdGF0dXNUZXh0KCkpOwogICAgIHJlc3BvbnNl T2JqZWN0LT5zZXRPYmplY3QoImhlYWRlcnMiLCBidWlsZE9iamVjdEZvckhlYWRlcnMocmVzcG9u c2UucmVzb3VyY2VMb2FkSW5mbygpID8gcmVzcG9uc2UucmVzb3VyY2VMb2FkSW5mbygpLT5yZXNw b25zZUhlYWRlcnMgOiByZXNwb25zZS5odHRwSGVhZGVyRmllbGRzKCkpKTsKQEAgLTI3MCw3ICsy NzAsOSBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9y Q2FjaGVkUmVzb3VyY2UoY29uc3QgQ2FjaGVkUmVzbwogICAgIHJlc291cmNlT2JqZWN0LT5zZXRT dHJpbmcoInVybCIsIGNhY2hlZFJlc291cmNlLnVybCgpKTsKICAgICByZXNvdXJjZU9iamVjdC0+ c2V0U3RyaW5nKCJ0eXBlIiwgY2FjaGVkUmVzb3VyY2VUeXBlU3RyaW5nKGNhY2hlZFJlc291cmNl KSk7CiAgICAgcmVzb3VyY2VPYmplY3QtPnNldE51bWJlcigiYm9keVNpemUiLCBjYWNoZWRSZXNv dXJjZS5lbmNvZGVkU2l6ZSgpKTsKLSAgICByZXNvdXJjZU9iamVjdC0+c2V0T2JqZWN0KCJyZXNw b25zZSIsIGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShjYWNoZWRSZXNvdXJjZS5yZXNw b25zZSgpKSk7CisgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVzb3VyY2VSZXNwb25zZSA9 IGJ1aWxkT2JqZWN0Rm9yUmVzb3VyY2VSZXNwb25zZShjYWNoZWRSZXNvdXJjZS5yZXNwb25zZSgp KTsKKyAgICBpZiAocmVzb3VyY2VSZXNwb25zZSkKKyAgICAgICAgcmVzb3VyY2VPYmplY3QtPnNl dE9iamVjdCgicmVzcG9uc2UiLCByZXNvdXJjZVJlc3BvbnNlKTsKICAgICByZXR1cm4gcmVzb3Vy Y2VPYmplY3Q7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4IDk4YWEwNjBiYjQ5MTNjZWE5ZDAxODUzNDJhYjBk ZTA3ZGQ3YjFkYzcuLjkxODVjYTYxZjM0MjYzNWRkMzc3ZTc5MmUzYmUxOGQwYjkwZTIyMDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFn ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFu YWdlci5qcwpAQCAtODUsNyArODUsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIu cHJvdG90eXBlID0gewogCiAgICAgX3VwZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNlOiBmdW5jdGlv bihyZXNvdXJjZSwgcmVzcG9uc2UpCiAgICAgewotICAgICAgICBpZiAoISgic3RhdHVzIiBpbiBy ZXNwb25zZSkpCisgICAgICAgIGlmICghcmVzcG9uc2UpCiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgcmVzb3VyY2UubWltZVR5cGUgPSByZXNwb25zZS5taW1lVHlwZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9nZW5lcmF0ZS1pbnNwZWN0b3ItaWRsIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2dlbmVyYXRlLWluc3BlY3Rvci1pZGwKaW5kZXggOTZkM2Fj NWJiZDgwNzM1MWQ5MmYzMWVjZDA1Nzg0YTMxYzE4NTRlOC4uMzhkZDBkYmQ5NTJlNTg4OWVkNDY1 ZTgyMWIyNzA0Y2I1ZGViNDljMSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2dlbmVyYXRlLWluc3BlY3Rvci1pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2dl bmVyYXRlLWluc3BlY3Rvci1pZGwKQEAgLTEzMCw3ICsxMzAsMTEgQEAgZm9yIGRvbWFpbiBpbiBq c29uX2FwaToKICAgICAgICAgICAgIHBhcmFtcyA9IFtdCiAgICAgICAgICAgICBpZiAoInBhcmFt ZXRlcnMiIGluIGV2ZW50KToKICAgICAgICAgICAgICAgICBmb3IgaW5fcGFyYW0gaW4gZXZlbnRb InBhcmFtZXRlcnMiXToKLSAgICAgICAgICAgICAgICAgICAgcGFyYW1zLmFwcGVuZCgib3V0ICVz ICVzIiAlIChwYXJhbV90eXBlKGluX3BhcmFtKSwgaW5fcGFyYW1bIm5hbWUiXSkpCisgICAgICAg ICAgICAgICAgICAgIGlmICgib3B0aW9uYWwiIGluIGluX3BhcmFtKToKKyAgICAgICAgICAgICAg ICAgICAgICAgIG9wdGlvbmFsID0gIiBbb3B0aW9uYWxdIgorICAgICAgICAgICAgICAgICAgICBl bHNlOgorICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9uYWwgPSAiIgorICAgICAgICAgICAg ICAgICAgICBwYXJhbXMuYXBwZW5kKCJvdXQlcyAlcyAlcyIgJSAob3B0aW9uYWwsIHBhcmFtX3R5 cGUoaW5fcGFyYW0pLCBpbl9wYXJhbVsibmFtZSJdKSkKICAgICAgICAgICAgIG91dHB1dF9maWxl LndyaXRlKCJcbiAgICAgICAgW2V2ZW50XSB2b2lkICVzKCVzKTsiICUgKGV2ZW50WyJuYW1lIl0s ICIsICIuam9pbihwYXJhbXMpKSkKICAgICBvdXRwdXRfZmlsZS53cml0ZSgiXG4gICAgfTsiKQog ICAgIGlmIGRvbWFpblsiZG9tYWluIl0gaW4gbWFjcm9fdHJhaXRzOgo=