72998 2011-11-22 18:19:38 -0800 WebIDL: Add support for static for JSC and V8 2011-11-29 16:40:41 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.w3.org/TR/WebIDL/#idl-static-operations P2 Normal --- 73342 71968 73365 1 arv arv abarth code.vineet dominicc japhet kaustubh.ra ojan sam webkit.review.bot oldest_to_newest 507895 0 arv 2011-11-22 18:19:38 -0800 http://www.w3.org/TR/WebIDL/#idl-static-operations We need to add support for static to be able to correctly implement the URL object. Our implementation of the URL object is flawed. window.webkitURL returns an instance of DOMURL when it should return a URL constructor. http://www.w3.org/TR/FileAPI/#URL-object 510051 1 arv 2011-11-28 12:02:24 -0800 It turns out that CodeGeneratorV8.pm already supports this using [ClassMethod] I plan to change the code generator to use "static" instead but a as a first step I am going to make CodeGeneratorJS support [ClassMethod] too. 511116 2 117047 arv 2011-11-29 14:38:26 -0800 Created attachment 117047 Patch 511124 3 117048 arv 2011-11-29 14:48:01 -0800 Created attachment 117048 Patch 511212 4 arv 2011-11-29 16:40:41 -0800 webkit-patch land failed Commited as http://trac.webkit.org/changeset/101433 117047 2011-11-29 14:38:26 -0800 2011-11-29 15:19:39 -0800 Patch bug-72998-20111129143825.patch text/plain 19653 arv U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJjZGExZTlkZmZkOGNi ZDU1OTA4MDA4NWE5ODg0NDAxNTU1ZDViMi4uOTRjZGJkMzc3NWZkNGE1OGRjMDYxMDc3MjQxNzQ5 ZTYyMDRlYTUyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDExLTExLTI5ICBFcmlr IEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViSURMOiBBZGQgc3Vw cG9ydCBmb3Igc3RhdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03Mjk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlYklETCB1c2VzICJzdGF0aWMiIGZvciBjbGFzcyBtZXRob2RzLiBXZSB1c2VkIHRv IHVzZSAiW0NsYXNzTWV0aG9kXSIuIFRoaXMgY2hhbmdlIG1ha2VzIHVzIHVzZSB0aGUgV2ViSURM IHN5bnRheCBpbnN0ZWFkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czogQ292ZXJlZCBieSBleGlz dGluZyB0ZXN0cy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpT LnBtOgorICAgICAgICAoR2V0RnVuY3Rpb25OYW1lKTogVXNlIGlzU3RhdGljIGluc3RlYWQuCisg ICAgICAgIChHZW5lcmF0ZU92ZXJsb2FkZWRGdW5jdGlvbik6IERpdHRvLgorICAgICAgICAoR2Vu ZXJhdGVJbXBsZW1lbnRhdGlvbik6IERpdHRvLgorICAgICAgICAoR2VuZXJhdGVQYXJhbWV0ZXJz Q2hlY2spOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb25GdW5jdGlvbkNh bGwpOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRlQ29uc3RydWN0b3JEZWZpbml0aW9uKTogRGl0 dG8uCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAg ICAgIChHZW5lcmF0ZUZ1bmN0aW9uQ2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRl SW1wbGVtZW50YXRpb24pOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRlRnVuY3Rpb25DYWxsU3Ry aW5nKTogRGl0dG8uCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG06Cisg ICAgICAgIChQYXJzZUludGVyZmFjZSk6IFNldCBpc1N0YXRpYyBhcyBuZWVkZWQuCisgICAgICAg ICogYmluZGluZ3Mvc2NyaXB0cy9JRExTdHJ1Y3R1cmUucG06IFVwZGF0ZSByZWd1bGFyIGV4cHJl c3Npb24gdG8gcGFyc2UgInN0YXRpYyIuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Rlc3RPYmouaWRsOiBVc2Ugc3RhdGljIGluc3RlYWQgb2YgW0NsYXNzTWV0aG9kXS4KKyAgICAg ICAgKiBzdG9yYWdlL0lEQktleVJhbmdlLmlkbDogRGl0dG8uCisKKzIwMTEtMTEtMjkgIEVyaWsg QXJ2aWRzc29uICA8YXJ2QGNocm9taXVtLm9yZz4KKwogICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig W0NsYXNzTWV0aG9kXSB0byBDb2RlR2VuZXJhdG9ySlMucG0KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMzQyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggMDY4OTllMzM1MTg1 NmE0ZGYxNmI0NmMxMjNhYzYzOTZhMzkwZTdlYS4uNGU0YWQxMmI4NzNmZDZhMzFmMDJlN2UwMWMz MDRlMzRjOTRhZWE2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTY1MSw4ICs2NTEsNyBAQCBteSAldXNlc1RvSlNOZXds eUNyZWF0ZWQgPSAoCiBzdWIgR2V0RnVuY3Rpb25OYW1lCiB7CiAgICAgbXkgKCRjbGFzc05hbWUs ICRmdW5jdGlvbikgPSBAXzsKLSAgICBteSAkaXNTdGF0aWMgPSAkZnVuY3Rpb24tPnNpZ25hdHVy ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn07Ci0gICAgbXkgJGtpbmQgPSAk aXNTdGF0aWMgPyAiQ29uc3RydWN0b3IiIDogIlByb3RvdHlwZSI7CisgICAgbXkgJGtpbmQgPSAk ZnVuY3Rpb24tPmlzU3RhdGljID8gIkNvbnN0cnVjdG9yIiA6ICJQcm90b3R5cGUiOwogICAgIHJl dHVybiAkY29kZUdlbmVyYXRvci0+V0tfbGNmaXJzdCgkY2xhc3NOYW1lKSAuICRraW5kIC4gIkZ1 bmN0aW9uIiAuICRjb2RlR2VuZXJhdG9yLT5XS191Y2ZpcnN0KCRmdW5jdGlvbi0+c2lnbmF0dXJl LT5uYW1lKTsKIH0KIApAQCAtMTI5NCw4ICsxMjkzLDcgQEAgc3ViIEdlbmVyYXRlT3ZlcmxvYWRl ZEZ1bmN0aW9uCiAgICAgIyBvdmVybG9hZCBpcyBhcHBsaWNhYmxlLCBwcmVjZWRlbmNlIGlzIGdp dmVuIGFjY29yZGluZyB0byB0aGUgb3JkZXIgb2YKICAgICAjIGRlY2xhcmF0aW9uIGluIHRoZSBJ REwuCiAKLSAgICBteSAkaXNTdGF0aWMgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn07Ci0gICAgbXkgJGtpbmQgPSAkaXNTdGF0aWMgPyAi Q29uc3RydWN0b3IiIDogIlByb3RvdHlwZSI7CisgICAgbXkgJGtpbmQgPSAkZnVuY3Rpb24tPmlz U3RhdGljID8gIkNvbnN0cnVjdG9yIiA6ICJQcm90b3R5cGUiOwogICAgIG15ICRmdW5jdGlvbk5h bWUgPSAianMke2ltcGxDbGFzc05hbWV9JHtraW5kfUZ1bmN0aW9uIiAuICRjb2RlR2VuZXJhdG9y LT5XS191Y2ZpcnN0KCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5uYW1lKTsKIAogICAgIHB1c2goQGlt cGxDb250ZW50LCAiRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCAke2Z1bmN0aW9uTmFtZX0o RXhlY1N0YXRlKiBleGVjKVxuIik7CkBAIC0xMzkwLDcgKzEzODgsNyBAQCBzdWIgR2VuZXJhdGVJ bXBsZW1lbnRhdGlvbgogICAgICAgICB9CiAKICAgICAgICAgZm9yZWFjaCBteSAkZnVuY3Rpb24g KEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7Ci0gICAgICAgICAgICBuZXh0IHVubGVzcyAoJGZ1 bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDbGFzc01ldGhvZCJ9KTsK KyAgICAgICAgICAgIG5leHQgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3RhdGljKTsKICAgICAgICAg ICAgIG5leHQgaWYgJGZ1bmN0aW9uLT57b3ZlcmxvYWRJbmRleH0gJiYgJGZ1bmN0aW9uLT57b3Zl cmxvYWRJbmRleH0gPiAxOwogICAgICAgICAgICAgbXkgJG5hbWUgPSAkZnVuY3Rpb24tPnNpZ25h dHVyZS0+bmFtZTsKICAgICAgICAgICAgIHB1c2goQGhhc2hLZXlzLCAkbmFtZSk7CkBAIC0xNDUx LDcgKzE0NDksNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgIH0KIAogICAgIGZv cmVhY2ggbXkgJGZ1bmN0aW9uIChAeyRkYXRhTm9kZS0+ZnVuY3Rpb25zfSkgewotICAgICAgICBu ZXh0IGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNz TWV0aG9kIn0pOworICAgICAgICBuZXh0IGlmICgkZnVuY3Rpb24tPmlzU3RhdGljKTsKICAgICAg ICAgbmV4dCBpZiAkZnVuY3Rpb24tPntvdmVybG9hZEluZGV4fSAmJiAkZnVuY3Rpb24tPntvdmVy bG9hZEluZGV4fSA+IDE7CiAgICAgICAgIG15ICRuYW1lID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUt Pm5hbWU7CiAgICAgICAgIHB1c2goQGhhc2hLZXlzLCAkbmFtZSk7CkBAIC0yMDQzLDggKzIwNDEs NiBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogCiAgICAgICAgICAgICAkaW1wbEluY2x1 ZGVzeyI8cnVudGltZS9FcnJvci5oPiJ9ID0gMTsKIAotICAgICAgICAgICAgbXkgJGlzU3RhdGlj ID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDbGFzc01ldGhv ZCJ9OwotCiAgICAgICAgICAgICBpZiAoJGludGVyZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIpIHsK ICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAkY2xhc3NOYW1lKiBjYXN0 ZWRUaGlzID0gdG9KU0RPTVdpbmRvdyhleGVjLT5ob3N0VGhpc1ZhbHVlKCkudG9UaGlzT2JqZWN0 KGV4ZWMpKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlm ICghY2FzdGVkVGhpcylcbiIpOwpAQCAtMjA1MywyNyArMjA0OSwyNyBAQCBzdWIgR2VuZXJhdGVJ bXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICRj bGFzc05hbWUqIGNhc3RlZFRoaXMgPSB0byR7Y2xhc3NOYW1lfShleGVjLT5ob3N0VGhpc1ZhbHVl KCkudG9UaGlzT2JqZWN0KGV4ZWMpKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCAiICAgIGlmICghY2FzdGVkVGhpcylcbiIpOwogICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTtcbiIp OwotICAgICAgICAgICAgfSBlbHNpZiAoISRpc1N0YXRpYykgeworICAgICAgICAgICAgfSBlbHNp ZiAoISRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICBKU1ZhbHVlIHRoaXNWYWx1ZSA9IGV4ZWMtPmhvc3RUaGlzVmFsdWUoKTtcbiIp OwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmICghdGhpc1ZhbHVl LmluaGVyaXRzKCYke2NsYXNzTmFtZX06OnNfaW5mbykpXG4iKTsKICAgICAgICAgICAgICAgICBw dXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7 XG4iKTsKICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAkY2xhc3NOYW1l KiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8JGNsYXNzTmFtZSo+KGFzT2JqZWN0KHRoaXNWYWx1 ZSkpO1xuIik7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJiR7Y2xhc3NOYW1l fTo6c19pbmZvKTtcbiIpIHVubGVzcyAoJGlzU3RhdGljKTsKKyAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCAiICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJiR7 Y2xhc3NOYW1lfTo6c19pbmZvKTtcbiIpIHVubGVzcyAoJGZ1bmN0aW9uLT5pc1N0YXRpYyk7CiAK ICAgICAgICAgICAgIGlmICgkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDaGVja0Rv bWFpblNlY3VyaXR5In0gYW5kCiAgICAgICAgICAgICAgICAgISRmdW5jdGlvbi0+c2lnbmF0dXJl LT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiRG9Ob3RDaGVja0RvbWFpblNlY3VyaXR5In0gYW5kCi0g ICAgICAgICAgICAgICAgISRpc1N0YXRpYykgeworICAgICAgICAgICAgICAgICEkZnVuY3Rpb24t PmlzU3RhdGljKSB7CiAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYg KCFjYXN0ZWRUaGlzLT5hbGxvd3NBY2Nlc3NGcm9tKGV4ZWMpKVxuIik7CiAgICAgICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNV bmRlZmluZWQoKSk7XG4iKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCRpc0N1 c3RvbSkgewotICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhpcy0+IiAuICRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFt ZSAuICIoZXhlYykpO1xuIikgdW5sZXNzICgkaXNTdGF0aWMpOworICAgICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhpcy0+ IiAuICRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFtZSAuICIoZXhlYykpO1xuIikgdW5sZXNzICgk ZnVuY3Rpb24tPmlzU3RhdGljKTsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGltcGxUeXBlKiBpbXAgPSBzdGF0aWNfY2FzdDwk aW1wbFR5cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIikgdW5sZXNzICgkaXNTdGF0aWMpOwot ICAgICAgICAgICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAhJGlzU3RhdGljKSB7Cisg ICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGltcGxUeXBlKiBpbXAgPSBz dGF0aWNfY2FzdDwkaW1wbFR5cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIikgdW5sZXNzICgk ZnVuY3Rpb24tPmlzU3RhdGljKTsKKyAgICAgICAgICAgICAgICBpZiAoJHN2Z1Byb3BlcnR5VHlw ZSBhbmQgISRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAgICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgaWYgKGltcC0+cm9sZSgpID09IEFuaW1WYWxSb2xlKSB7XG4iKTsK ICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIHNldERPTUV4 Y2VwdGlvbihleGVjLCBOT19NT0RJRklDQVRJT05fQUxMT1dFRF9FUlIpO1xuIik7CiAgICAgICAg ICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGpzVW5kZWZpbmVkKCkpO1xuIik7CkBAIC0yMDg4LDcgKzIwODQsNyBAQCBzdWIgR2Vu ZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICBFeGNlcHRpb25Db2RlIGVjID0gMDtcbiIpOwogICAgICAgICAgICAgICAgIH0KIAot ICAgICAgICAgICAgICAgIGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IlNWR0NoZWNrU2VjdXJpdHlEb2N1bWVudCJ9IGFuZCAhJGlzU3RhdGljKSB7CisgICAg ICAgICAgICAgICAgaWYgKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMt PnsiU1ZHQ2hlY2tTZWN1cml0eURvY3VtZW50In0gYW5kICEkZnVuY3Rpb24tPmlzU3RhdGljKSB7 CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmICghY2hlY2tO b2RlU2VjdXJpdHkoZXhlYywgaW1wLT5nZXRTVkdEb2N1bWVudCgiIC4gKEB7JGZ1bmN0aW9uLT5y YWlzZXNFeGNlcHRpb25zfSA/ICJlYyIgOiAiIikgLiIpKSlcbiIpOwogICAgICAgICAgICAgICAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShq c1VuZGVmaW5lZCgpKTtcbiIpOwogICAgICAgICAgICAgICAgICAgICAkaW1wbEluY2x1ZGVzeyJK U0RPTUJpbmRpbmcuaCJ9ID0gMTsKQEAgLTIzMzgsMTAgKzIzMzQsOSBAQCBzdWIgR2VuZXJhdGVQ YXJhbWV0ZXJzQ2hlY2sKICAgICBteSAkcGFyYW1JbmRleCA9IDA7CiAgICAgbXkgJGFyZ3NJbmRl eCA9IDA7CiAgICAgbXkgJGhhc09wdGlvbmFsQXJndW1lbnRzID0gMDsKLSAgICBteSAkaXNTdGF0 aWMgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0 aG9kIn07CiAKICAgICBteSAkZnVuY3Rpb25CYXNlID0gIiI7Ci0gICAgaWYgKCRpc1N0YXRpYykg eworICAgIGlmICgkZnVuY3Rpb24tPmlzU3RhdGljKSB7CiAgICAgICAgICRmdW5jdGlvbkJhc2Ug PSAiJHtpbXBsQ2xhc3NOYW1lfTo6IjsKICAgICB9IGVsc2lmICgkc3ZnUHJvcGVydHlPckxpc3RQ cm9wZXJ0eVR5cGUgYW5kICEkc3ZnTGlzdFByb3BlcnR5VHlwZSkgewogICAgICAgICAkZnVuY3Rp b25CYXNlID0gInBvZEltcC4iOwpAQCAtMjM1MCw3ICsyMzQ1LDcgQEAgc3ViIEdlbmVyYXRlUGFy YW1ldGVyc0NoZWNrCiAgICAgfQogICAgIG15ICRmdW5jdGlvblN0cmluZyA9ICIkZnVuY3Rpb25C YXNlJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lKCI7CiAKLSAgICBpZiAoJGZ1bmN0aW9uLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21Bcmd1bWVudEhhbmRsaW5nIn0g YW5kICEkaXNTdGF0aWMpIHsKKyAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyJDdXN0b21Bcmd1bWVudEhhbmRsaW5nIn0gYW5kICEkZnVuY3Rpb24tPmlz U3RhdGljKSB7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBSZWZQdHI8U2NyaXB0 QXJndW1lbnRzPiBzY3JpcHRBcmd1bWVudHMoY3JlYXRlU2NyaXB0QXJndW1lbnRzKGV4ZWMsICRu dW1QYXJhbWV0ZXJzKSk7XG4iKTsKICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIHNp emVfdCBtYXhTdGFja1NpemUgPSBpbXAtPnNob3VsZENhcHR1cmVGdWxsU3RhY2tUcmFjZSgpID8g U2NyaXB0Q2FsbFN0YWNrOjptYXhDYWxsU3RhY2tTaXplVG9DYXB0dXJlIDogMTtcbiIpOwogICAg ICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgUmVmUHRyPFNjcmlwdENhbGxTdGFjaz4gY2Fs bFN0YWNrKGNyZWF0ZVNjcmlwdENhbGxTdGFjayhleGVjLCBtYXhTdGFja1NpemUpKTtcbiIpOwpA QCAtMjY3OSwxMyArMjY3NCwxMSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZ1bmN0aW9u Q2FsbCgpCiAgICAgfQogICAgICRmdW5jdGlvblN0cmluZyAuPSAiKSI7CiAKLSAgICBteSAkaXNT dGF0aWMgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNz TWV0aG9kIn07Ci0KICAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPnR5cGUgZXEgInZvaWQi KSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAkaW5kZW50IC4gIiRmdW5jdGlvblN0cmlu ZztcbiIpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgJGluZGVudCAuICJzZXRET01FeGNl cHRpb24oZXhlYywgZWMpO1xuIikgaWYgQHskZnVuY3Rpb24tPnJhaXNlc0V4Y2VwdGlvbnN9Owog Ci0gICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAhJGlzU3RhdGljKSB7CisgICAgICAg IGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAhJGZ1bmN0aW9uLT5pc1N0YXRpYykgewogICAgICAg ICAgICAgaWYgKEB7JGZ1bmN0aW9uLT5yYWlzZXNFeGNlcHRpb25zfSkgewogICAgICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAkaW5kZW50IC4gImlmICghZWMpXG4iKTsgCiAgICAgICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICRpbmRlbnQgLiAiICAgIGltcC0+Y29tbWl0Q2hh bmdlKCk7XG4iKTsKQEAgLTMzNDEsNyArMzMzNCw3IEBAIHN1YiBHZW5lcmF0ZUNvbnN0cnVjdG9y RGVmaW5pdGlvbgogCiAgICAgbXkgJGhhc1N0YXRpY0Z1bmN0aW9ucyA9IDA7CiAgICAgZm9yZWFj aCBteSAkZnVuY3Rpb24gKEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7Ci0gICAgICAgIGlmICgk ZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn0p IHsKKyAgICAgICAgaWYgKCRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAgICAgICRoYXNT dGF0aWNGdW5jdGlvbnMgPSAxOwogICAgICAgICAgICAgbGFzdDsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0g Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRl eCA2YWZkODEwZGM0YzRmZGE2OGEyMDlmN2NmODQ0NzI2ZDY0Y2ZiZDU3Li41NjlkODZkOTIzNDlj NTkwZDRhYmY5YzE1NGQzZTA2OWZlY2I0MDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtMTMzNSw3ICsxMzM1LDcgQEAg RU5ECiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICRzdmdXcmFwcGVk TmF0aXZlVHlwZSYgaW1wSW5zdGFuY2UgPSB3cmFwcGVyLT5wcm9wZXJ0eVJlZmVyZW5jZSgpO1xu Iik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICRzdmdXcmFwcGVk TmF0aXZlVHlwZSogaW1wID0gJmltcEluc3RhbmNlO1xuIik7CiAgICAgICAgIH0KLSAgICB9IGVs c2lmICghJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDbGFzc01l dGhvZCJ9KSB7CisgICAgfSBlbHNpZiAoISRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAg cHVzaChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwogICAgICR7aW1wbENsYXNzTmFtZX0qIGlt cCA9IFY4JHtpbXBsQ2xhc3NOYW1lfTo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiBFTkQKQEAg LTIzMDcsNyArMjMwNyw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgIGlm ICgkYXR0ckV4dC0+eyJWOE9uSW5zdGFuY2UifSkgewogICAgICAgICAgICAgbmV4dDsKICAgICAg ICAgfQotICAgICAgICBpZiAoJGF0dHJFeHQtPnsiQ2xhc3NNZXRob2QifSkgeworICAgICAgICBp ZiAoJGZ1bmN0aW9uLT5pc1N0YXRpYykgewogICAgICAgICAgICAgbmV4dDsKICAgICAgICAgfQog ICAgICAgICBpZiAoJGF0dHJFeHQtPnsiRW5hYmxlZEF0UnVudGltZSJ9IHx8IFJlcXVpcmVzQ3Vz dG9tU2lnbmF0dXJlKCRmdW5jdGlvbikgfHwgJGF0dHJFeHQtPnsiVjhEb05vdENoZWNrU2lnbmF0 dXJlIn0pIHsKQEAgLTI1MjYsNyArMjUyNiw3IEBAIEVORAogICAgICAgICBpZiAoJGF0dHJFeHQt PnsiVjhPbkluc3RhbmNlIn0pIHsKICAgICAgICAgICAgICR0ZW1wbGF0ZSA9ICJpbnN0YW5jZSI7 CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCRhdHRyRXh0LT57IkNsYXNzTWV0aG9kIn0pIHsKKyAg ICAgICAgaWYgKCRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAgICAgICR0ZW1wbGF0ZSA9 ICJkZXNjIjsKICAgICAgICAgfQogCkBAIC0yNTU5LDM4ICsyNTU5LDM4IEBAIEVORAogICAgIC8v ICRjb21tZW50SW5mbwogICAgICR7Y29uZGl0aW9uYWx9JHRlbXBsYXRlLT5TZXRBY2Nlc3Nvcih2 ODo6U3RyaW5nOjpOZXcoIiRuYW1lIiksICR7aW50ZXJmYWNlTmFtZX1JbnRlcm5hbDo6JHtuYW1l fUF0dHJHZXR0ZXIsIDAsIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpLCB2ODo6QUxMX0NBTl9SRUFE LCBzdGF0aWNfY2FzdDx2ODo6UHJvcGVydHlBdHRyaWJ1dGU+KCRwcm9wZXJ0eV9hdHRyaWJ1dGVz KSk7CiBFTkQKLSAgICAgICAgICAkbnVtX2NhbGxiYWNrcysrOwotICAgICAgICAgIG5leHQ7Ci0g ICAgICB9CisgICAgICAgICAgICAkbnVtX2NhbGxiYWNrcysrOworICAgICAgICAgICAgbmV4dDsK KyAgICAgICAgfQogCi0gICAgICBteSAkc2lnbmF0dXJlID0gImRlZmF1bHRTaWduYXR1cmUiOwot ICAgICAgaWYgKCRhdHRyRXh0LT57IlY4RG9Ob3RDaGVja1NpZ25hdHVyZSJ9IHx8ICRhdHRyRXh0 LT57IkNsYXNzTWV0aG9kIn0pIHsKLSAgICAgICAgICAkc2lnbmF0dXJlID0gInY4OjpMb2NhbDx2 ODo6U2lnbmF0dXJlPigpIjsKLSAgICAgIH0KKyAgICAgICAgbXkgJHNpZ25hdHVyZSA9ICJkZWZh dWx0U2lnbmF0dXJlIjsKKyAgICAgICAgaWYgKCRhdHRyRXh0LT57IlY4RG9Ob3RDaGVja1NpZ25h dHVyZSJ9IHx8ICRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKKyAgICAgICAgICAgICRzaWduYXR1cmUg PSAidjg6OkxvY2FsPHY4OjpTaWduYXR1cmU+KCkiOworICAgICAgICB9CiAKLSAgICAgIGlmIChS ZXF1aXJlc0N1c3RvbVNpZ25hdHVyZSgkZnVuY3Rpb24pKSB7Ci0gICAgICAgICAgJHNpZ25hdHVy ZSA9ICIke25hbWV9U2lnbmF0dXJlIjsKLSAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIlxu ICAgIC8vIEN1c3RvbSBTaWduYXR1cmUgJyRuYW1lJ1xuIiwgQ3JlYXRlQ3VzdG9tU2lnbmF0dXJl KCRmdW5jdGlvbikpOwotICAgICAgfQorICAgICAgICBpZiAoUmVxdWlyZXNDdXN0b21TaWduYXR1 cmUoJGZ1bmN0aW9uKSkgeworICAgICAgICAgICAgJHNpZ25hdHVyZSA9ICIke25hbWV9U2lnbmF0 dXJlIjsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiXG4gICAgLy8gQ3VzdG9tIFNp Z25hdHVyZSAnJG5hbWUnXG4iLCBDcmVhdGVDdXN0b21TaWduYXR1cmUoJGZ1bmN0aW9uKSk7Cisg ICAgICAgIH0KIAotICAgICAgIyBOb3JtYWwgZnVuY3Rpb24gY2FsbCBpcyBhIHRlbXBsYXRlCi0g ICAgICBteSAkY2FsbGJhY2sgPSBHZXRGdW5jdGlvblRlbXBsYXRlQ2FsbGJhY2tOYW1lKCRmdW5j dGlvbiwgJGludGVyZmFjZU5hbWUpOworICAgICAgICAjIE5vcm1hbCBmdW5jdGlvbiBjYWxsIGlz IGEgdGVtcGxhdGUKKyAgICAgICAgbXkgJGNhbGxiYWNrID0gR2V0RnVuY3Rpb25UZW1wbGF0ZUNh bGxiYWNrTmFtZSgkZnVuY3Rpb24sICRpbnRlcmZhY2VOYW1lKTsKIAotICAgICAgaWYgKCRwcm9w ZXJ0eV9hdHRyaWJ1dGVzIGVxICJ2ODo6RG9udERlbGV0ZSIpIHsKLSAgICAgICAgICAkcHJvcGVy dHlfYXR0cmlidXRlcyA9ICIiOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAkcHJvcGVydHlf YXR0cmlidXRlcyA9ICIsIHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0dHJpYnV0ZT4oJHByb3Bl cnR5X2F0dHJpYnV0ZXMpIjsKLSAgICAgIH0KKyAgICAgICAgaWYgKCRwcm9wZXJ0eV9hdHRyaWJ1 dGVzIGVxICJ2ODo6RG9udERlbGV0ZSIpIHsKKyAgICAgICAgICAgICRwcm9wZXJ0eV9hdHRyaWJ1 dGVzID0gIiI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAkcHJvcGVydHlfYXR0cmli dXRlcyA9ICIsIHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0dHJpYnV0ZT4oJHByb3BlcnR5X2F0 dHJpYnV0ZXMpIjsKKyAgICAgICAgfQogCi0gICAgICBpZiAoJHRlbXBsYXRlIGVxICJwcm90byIg JiYgJGNvbmRpdGlvbmFsIGVxICIiICYmICRzaWduYXR1cmUgZXEgImRlZmF1bHRTaWduYXR1cmUi ICYmICRwcm9wZXJ0eV9hdHRyaWJ1dGVzIGVxICIiKSB7Ci0gICAgICAgICAgIyBTdGFuZGFyZCB0 eXBlIG9mIGNhbGxiYWNrLCBhbHJlYWR5IGNyZWF0ZWQgaW4gdGhlIGJhdGNoLCBzbyBza2lwIGl0 IGhlcmUuCi0gICAgICAgICAgbmV4dDsKLSAgICAgIH0KKyAgICAgICAgaWYgKCR0ZW1wbGF0ZSBl cSAicHJvdG8iICYmICRjb25kaXRpb25hbCBlcSAiIiAmJiAkc2lnbmF0dXJlIGVxICJkZWZhdWx0 U2lnbmF0dXJlIiAmJiAkcHJvcGVydHlfYXR0cmlidXRlcyBlcSAiIikgeworICAgICAgICAgICAg IyBTdGFuZGFyZCB0eXBlIG9mIGNhbGxiYWNrLCBhbHJlYWR5IGNyZWF0ZWQgaW4gdGhlIGJhdGNo LCBzbyBza2lwIGl0IGhlcmUuCisgICAgICAgICAgICBuZXh0OworICAgICAgICB9CiAKLSAgICAg IHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CisgICAgICAgIHB1c2goQGltcGxDb250ZW50LCA8 PEVORCk7CiAgICAgJHtjb25kaXRpb25hbH0kdGVtcGxhdGUtPlNldCh2ODo6U3RyaW5nOjpOZXco IiRuYW1lIiksIHY4OjpGdW5jdGlvblRlbXBsYXRlOjpOZXcoJGNhbGxiYWNrLCB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4oKSwgJHtzaWduYXR1cmV9KSRwcm9wZXJ0eV9hdHRyaWJ1dGVzKTsKIEVORAot ICAgICAgJG51bV9jYWxsYmFja3MrKzsKKyAgICAgICAgJG51bV9jYWxsYmFja3MrKzsKICAgICB9 CiAKICAgICBkaWUgIldyb25nIG51bWJlciBvZiBjYWxsYmFja3MgZ2VuZXJhdGVkIGZvciAkaW50 ZXJmYWNlTmFtZSAoJG51bV9jYWxsYmFja3MsIHNob3VsZCBiZSAkdG90YWxfZnVuY3Rpb25zKSIg aWYgJG51bV9jYWxsYmFja3MgIT0gJHRvdGFsX2Z1bmN0aW9uczsKQEAgLTMxMjIsNyArMzEyMiw3 IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uQ2FsbFN0cmluZygpCiAgICAgfQogCiAgICAgbXkgJGZ1 bmN0aW9uU3RyaW5nID0gImltcC0+JHtuYW1lfSgiOwotICAgIGlmICgkZnVuY3Rpb24tPnNpZ25h dHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn0pIHsKKyAgICBpZiAoJGZ1 bmN0aW9uLT5pc1N0YXRpYykgewogICAgICAgICAkZnVuY3Rpb25TdHJpbmcgPSAiJHtpbXBsQ2xh c3NOYW1lfTo6JHtuYW1lfSgiOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0lETFBhcnNlci5wbQppbmRleCA5MzViYTIyZjQyZGViNzg5MzQ4ZDE0OThhYTQzZGMy OWQzMjkwOWQ1Li4wNjMzMTc1Y2E5ZTE0NGQ3NTc3NjlkOWMxYmIwY2Q0YWVkY2ZhZjljIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQpAQCAtMzYwLDEw ICszNjAsMTEgQEAgc3ViIFBhcnNlSW50ZXJmYWNlCiAgICAgICAgICAgICB9IGVsc2lmICgoJGxp bmUgIX4gcy9eXHMqJC8vZykgYW5kICgkbGluZSAhfiAvXlxzKmNvbnN0LykpIHsKICAgICAgICAg ICAgICAgICAkbGluZSA9fiAvJElETFN0cnVjdHVyZTo6aW50ZXJmYWNlTWV0aG9kU2VsZWN0b3Iv IG9yIGRpZSAiUGFyc2luZyBlcnJvciFcblNvdXJjZTpcbiRsaW5lXG4pIjsKIAotICAgICAgICAg ICAgICAgIG15ICRtZXRob2RFeHRlbmRlZEF0dHJpYnV0ZXMgPSAoZGVmaW5lZCgkMSkgPyAkMSA6 ICIgIik7IGNob3AoJG1ldGhvZEV4dGVuZGVkQXR0cmlidXRlcyk7Ci0gICAgICAgICAgICAgICAg bXkgJG1ldGhvZFR5cGUgPSAoZGVmaW5lZCgkMikgPyAkMiA6IGRpZSgiUGFyc2luZyBlcnJvciFc blNvdXJjZTpcbiRsaW5lXG4pIikpOwotICAgICAgICAgICAgICAgIG15ICRtZXRob2ROYW1lID0g KGRlZmluZWQoJDMpID8gJDMgOiBkaWUoIlBhcnNpbmcgZXJyb3IhXG5Tb3VyY2U6XG4kbGluZVxu KSIpKTsKLSAgICAgICAgICAgICAgICBteSAkbWV0aG9kU2lnbmF0dXJlID0gKGRlZmluZWQoJDQp ID8gJDQgOiBkaWUoIlBhcnNpbmcgZXJyb3IhXG5Tb3VyY2U6XG4kbGluZVxuKSIpKTsKKyAgICAg ICAgICAgICAgICBteSAkaXNTdGF0aWMgPSBkZWZpbmVkKCQxKTsKKyAgICAgICAgICAgICAgICBt eSAkbWV0aG9kRXh0ZW5kZWRBdHRyaWJ1dGVzID0gKGRlZmluZWQoJDIpID8gJDIgOiAiICIpOyBj aG9wKCRtZXRob2RFeHRlbmRlZEF0dHJpYnV0ZXMpOworICAgICAgICAgICAgICAgIG15ICRtZXRo b2RUeXBlID0gKGRlZmluZWQoJDMpID8gJDMgOiBkaWUoIlBhcnNpbmcgZXJyb3IhXG5Tb3VyY2U6 XG4kbGluZVxuKSIpKTsKKyAgICAgICAgICAgICAgICBteSAkbWV0aG9kTmFtZSA9IChkZWZpbmVk KCQ0KSA/ICQ0IDogZGllKCJQYXJzaW5nIGVycm9yIVxuU291cmNlOlxuJGxpbmVcbikiKSk7Cisg ICAgICAgICAgICAgICAgbXkgJG1ldGhvZFNpZ25hdHVyZSA9IChkZWZpbmVkKCQ1KSA/ICQ1IDog ZGllKCJQYXJzaW5nIGVycm9yIVxuU291cmNlOlxuJGxpbmVcbikiKSk7CiAKICAgICAgICAgICAg ICAgICAoJycgPX4gL14vKTsgIyBSZXNldCB2YXJpYWJsZXMgbmVlZGVkIGZvciByZWdleHAgbWF0 Y2hpbmcKIApAQCAtMzcyLDYgKzM3Myw3IEBAIHN1YiBQYXJzZUludGVyZmFjZQogCiAgICAgICAg ICAgICAgICAgbXkgJG5ld0RhdGFOb2RlID0gbmV3IGRvbUZ1bmN0aW9uKCk7CiAKKyAgICAgICAg ICAgICAgICAkbmV3RGF0YU5vZGUtPmlzU3RhdGljKCRpc1N0YXRpYyk7CiAgICAgICAgICAgICAg ICAgJG5ld0RhdGFOb2RlLT5zaWduYXR1cmUobmV3IGRvbVNpZ25hdHVyZSgpKTsKICAgICAgICAg ICAgICAgICAkbmV3RGF0YU5vZGUtPnNpZ25hdHVyZS0+bmFtZSgkbWV0aG9kTmFtZSk7CiAgICAg ICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT5zaWduYXR1cmUtPnR5cGUoJG1ldGhvZFR5cGUpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExTdHJ1Y3R1cmUu cG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFN0cnVjdHVyZS5wbQppbmRl eCA4ODVhODhkYThjMTZjMTRhYTgzMWQ1NzE0ZWVjMjJhNDdkMWE0NmRiLi5hZGQwNDc0ZDA4MjIx MjA4NTVlMjI4Njc3NmY0NzNjOGQ2MmEyODU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0lETFN0cnVjdHVyZS5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0lETFN0cnVjdHVyZS5wbQpAQCAtNDUsNiArNDUsNyBAQCBzdHJ1Y3QoIGRv bUNsYXNzID0+IHsKIAogIyBVc2VkIHRvIHJlcHJlc2VudCBkb21DbGFzcyBjb250ZW50cyAobmFt ZSBvZiBtZXRob2QsIHNpZ25hdHVyZSkKIHN0cnVjdCggZG9tRnVuY3Rpb24gPT4geworICAgIGlz U3RhdGljID0+ICckJywKICAgICBzaWduYXR1cmUgPT4gJyQnLCAgICAjIFJldHVybiB0eXBlL09i amVjdCBuYW1lL2V4dGVuZGVkIGF0dHJpYnV0ZXMKICAgICBwYXJhbWV0ZXJzID0+ICdAJywgICAg IyBMaXN0IG9mICdkb21TaWduYXR1cmUnCiAgICAgcmFpc2VzRXhjZXB0aW9ucyA9PiAnQCcsICAj IFBvc3NpYmx5IHJhaXNlZCBleGNlcHRpb25zLgpAQCAtMTAzLDcgKzEwNCw3IEBAIG91ciAkc2V0 dGVyUmFpc2VzU2VsZWN0b3IgPSAnXGJzZXR0ZXJccytyYWlzZXNccypcKCgnIC4gJGlkbElkTnNM aXN0IC4gJyopXHMqXCknCiBvdXIgJHR5cGVOYW1lc3BhY2VTZWxlY3RvciA9ICcoKD86JyAuICRp ZGxJZCAuICcqOjopKilccyooJyAuICRpZGxEYXRhVHlwZSAuICcqKSc7CiAKIG91ciAkaW50ZXJm YWNlU2VsZWN0b3IgPSAnaW50ZXJmYWNlXHMqKCg/OicgLiAkZXh0ZW5kZWRBdHRyaWJ1dGVTeW50 YXggLiAnICk/KSgnIC4gJGlkbElkTnMgLiAnKilccyooPzo6KFxzKltee10qKSk/eyhbLWEtekEt WjAtOV8iPVxzKCksOzpcW1xdJlx8XSopJzsKLW91ciAkaW50ZXJmYWNlTWV0aG9kU2VsZWN0b3Ig PSAnXHMqKCg/OicgLiAkZXh0ZW5kZWRBdHRyaWJ1dGVTeW50YXggLiAnICk/KScgLiAkc3VwcG9y dGVkVHlwZXMgLiAnXHMqKCcgLiAkaWRsSWROcyAuICcqKVxzKlwoXHMqKFthLXpBLVowLTk6XHMs PVxbXF1dKiknOworb3VyICRpbnRlcmZhY2VNZXRob2RTZWxlY3RvciA9ICdccyooc3RhdGljXHMr KT8oKD86JyAuICRleHRlbmRlZEF0dHJpYnV0ZVN5bnRheCAuICcgKT8pJyAuICRzdXBwb3J0ZWRU eXBlcyAuICdccyooJyAuICRpZGxJZE5zIC4gJyopXHMqXChccyooW2EtekEtWjAtOTpccyw9XFtc XV0qKSc7CiBvdXIgJGludGVyZmFjZVBhcmFtZXRlclNlbGVjdG9yID0gJyhpbnxvdXQpXHMqKCg/ OicgLiAkZXh0ZW5kZWRBdHRyaWJ1dGVTeW50YXggLiAnICk/KScgLiAkc3VwcG9ydGVkVHlwZXMg LiAnXHMqKCcgLiAkaWRsSWROcyAuICcqKSc7CiAKIG91ciAkaW50ZXJmYWNlQXR0cmlidXRlU2Vs ZWN0b3IgPSAnXHMqKHJlYWRvbmx5IGF0dHJpYnV0ZXxhdHRyaWJ1dGUpXHMqKCcgLiAkZXh0ZW5k ZWRBdHRyaWJ1dGVTeW50YXggLiAnICk/JyAuICRzdXBwb3J0ZWRUeXBlcyAuICdccyooJyAuICRp ZGxUeXBlIC4gJyopJzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9UZXN0T2JqLmlkbCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9UZXN0T2JqLmlkbAppbmRleCA5YzM3NmEyMGFjOWM4ODMyMmEzOGVmNWRjNTBlZjc0YmI3YWJk ZjY5Li44MDNhZTI3MmZkZmZiMzI5NmJjYWU0YmE4MmRlMDA5M2JkZDdhZGJlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCkBAIC0xNjIs OCArMTYyLDggQEAgbW9kdWxlIHRlc3QgewogI2VuZGlmCiAKICAgICAgICAgLy8gQ2xhc3MgbWV0 aG9kcyB3aXRoaW4gSmF2YVNjcmlwdCAobGlrZSB3aGF0J3MgdXNlZCBmb3IgSURCS2V5UmFuZ2Up LgotICAgICAgICBbQ2xhc3NNZXRob2RdIHZvaWQgY2xhc3NNZXRob2QoKTsKLSAgICAgICAgW0Ns YXNzTWV0aG9kXSBsb25nIGNsYXNzTWV0aG9kV2l0aE9wdGlvbmFsKGluIFtPcHRpb25hbF0gbG9u ZyBhcmcpOworICAgICAgICBzdGF0aWMgdm9pZCBjbGFzc01ldGhvZCgpOworICAgICAgICBzdGF0 aWMgbG9uZyBjbGFzc01ldGhvZFdpdGhPcHRpb25hbChpbiBbT3B0aW9uYWxdIGxvbmcgYXJnKTsK IAogI2lmIGRlZmluZWQoVEVTVElOR19WOCkKICAgICAgICAgLy8gJ0VuYWJsZWRBdFJ1bnRpbWUn IG1ldGhvZHMgYW5kIGF0dHJpYnV0ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9y YWdlL0lEQktleVJhbmdlLmlkbCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2Uu aWRsCmluZGV4IGZjMGFmNmNkMGIxNGExNjk1YTMwMzIwZTZhODgyNmUwYTkxZDhmMjQuLjE2MWNi OWM0NzczM2ZiYWFhYmU0YTE4Zjk2ZDUzMTU3ZDY2NTEzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvSURCS2V5UmFuZ2UuaWRsCkBAIC0zMywxNCArMzMsMTMgQEAgbW9kdWxlIHN0b3JhZ2Ugewog ICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiBsb3dlck9wZW47CiAgICAgICAgIHJl YWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuIHVwcGVyT3BlbjsKIAotICAgICAgICAvLyBGSVhNRTog TWFrZSBDbGFzc01ldGhvZCB3b3JrIGZvciBKU0MgYXMgd2VsbC4KLSAgICAgICAgW0NsYXNzTWV0 aG9kXSBJREJLZXlSYW5nZSBvbmx5KGluIElEQktleSB2YWx1ZSkKKyAgICAgICAgc3RhdGljIElE QktleVJhbmdlIG9ubHkoaW4gSURCS2V5IHZhbHVlKQogICAgICAgICAgICAgcmFpc2VzIChJREJE YXRhYmFzZUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDbGFzc01ldGhvZF0gSURCS2V5UmFuZ2UgbG93 ZXJCb3VuZChpbiBJREJLZXkgYm91bmQsIGluIFtPcHRpb25hbF0gYm9vbGVhbiBvcGVuKQorICAg ICAgICBzdGF0aWMgSURCS2V5UmFuZ2UgbG93ZXJCb3VuZChpbiBJREJLZXkgYm91bmQsIGluIFtP cHRpb25hbF0gYm9vbGVhbiBvcGVuKQogICAgICAgICAgICAgcmFpc2VzIChJREJEYXRhYmFzZUV4 Y2VwdGlvbik7Ci0gICAgICAgIFtDbGFzc01ldGhvZF0gSURCS2V5UmFuZ2UgdXBwZXJCb3VuZChp biBJREJLZXkgYm91bmQsIGluIFtPcHRpb25hbF0gYm9vbGVhbiBvcGVuKQorICAgICAgICBzdGF0 aWMgSURCS2V5UmFuZ2UgdXBwZXJCb3VuZChpbiBJREJLZXkgYm91bmQsIGluIFtPcHRpb25hbF0g Ym9vbGVhbiBvcGVuKQogICAgICAgICAgICAgcmFpc2VzIChJREJEYXRhYmFzZUV4Y2VwdGlvbik7 Ci0gICAgICAgIFtDbGFzc01ldGhvZF0gSURCS2V5UmFuZ2UgYm91bmQoaW4gSURCS2V5IGxvd2Vy LCBpbiBJREJLZXkgdXBwZXIsIGluIFtPcHRpb25hbF0gYm9vbGVhbiBsb3dlck9wZW4sIGluIFtP cHRpb25hbF0gYm9vbGVhbiB1cHBlck9wZW4pCisgICAgICAgIHN0YXRpYyBJREJLZXlSYW5nZSBi b3VuZChpbiBJREJLZXkgbG93ZXIsIGluIElEQktleSB1cHBlciwgaW4gW09wdGlvbmFsXSBib29s ZWFuIGxvd2VyT3BlbiwgaW4gW09wdGlvbmFsXSBib29sZWFuIHVwcGVyT3BlbikKICAgICAgICAg ICAgIHJhaXNlcyAoSURCRGF0YWJhc2VFeGNlcHRpb24pOwogICAgIH07CiAK 117048 2011-11-29 14:48:01 -0800 2011-11-29 15:19:19 -0800 Patch bug-72998-20111129144759.patch text/plain 19668 arv U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJjZGExZTlkZmZkOGNi ZDU1OTA4MDA4NWE5ODg0NDAxNTU1ZDViMi4uZDJmMzg3NWRjZTFhN2RlNTNmMzYxM2NjYmM1YmQ2 YTE1NjQ1ZGViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDExLTExLTI5ICBFcmlr IEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViSURMOiBBZGQgc3Vw cG9ydCBmb3Igc3RhdGljIGZvciBKU0MgYW5kIFY4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mjk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYklETCB1c2VzICJzdGF0aWMiIGZvciBjbGFzcyBtZXRo b2RzLiBXZSB1c2VkIHRvIHVzZSAiW0NsYXNzTWV0aG9kXSIuIFRoaXMgY2hhbmdlIG1ha2VzIHVz IHVzZSB0aGUgV2ViSURMIHN5bnRheCBpbnN0ZWFkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czog Q292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2V0RnVuY3Rpb25OYW1lKTogVXNlIGlzU3Rh dGljIGluc3RlYWQuCisgICAgICAgIChHZW5lcmF0ZU92ZXJsb2FkZWRGdW5jdGlvbik6IERpdHRv LgorICAgICAgICAoR2VuZXJhdGVJbXBsZW1lbnRhdGlvbik6IERpdHRvLgorICAgICAgICAoR2Vu ZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRlSW1wbGVtZW50 YXRpb25GdW5jdGlvbkNhbGwpOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRlQ29uc3RydWN0b3JE ZWZpbml0aW9uKTogRGl0dG8uCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yVjgucG06CisgICAgICAgIChHZW5lcmF0ZUZ1bmN0aW9uQ2FsbGJhY2spOiBEaXR0by4KKyAg ICAgICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb24pOiBEaXR0by4KKyAgICAgICAgKEdlbmVyYXRl RnVuY3Rpb25DYWxsU3RyaW5nKTogRGl0dG8uCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9J RExQYXJzZXIucG06CisgICAgICAgIChQYXJzZUludGVyZmFjZSk6IFNldCBpc1N0YXRpYyBhcyBu ZWVkZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9JRExTdHJ1Y3R1cmUucG06IFVwZGF0 ZSByZWd1bGFyIGV4cHJlc3Npb24gdG8gcGFyc2UgInN0YXRpYyIuCisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsOiBVc2Ugc3RhdGljIGluc3RlYWQgb2YgW0NsYXNz TWV0aG9kXS4KKyAgICAgICAgKiBzdG9yYWdlL0lEQktleVJhbmdlLmlkbDogRGl0dG8uCisKKzIw MTEtMTEtMjkgIEVyaWsgQXJ2aWRzc29uICA8YXJ2QGNocm9taXVtLm9yZz4KKwogICAgICAgICBB ZGQgc3VwcG9ydCBmb3IgW0NsYXNzTWV0aG9kXSB0byBDb2RlR2VuZXJhdG9ySlMucG0KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMzQyCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5k ZXggMDY4OTllMzM1MTg1NmE0ZGYxNmI0NmMxMjNhYzYzOTZhMzkwZTdlYS4uNGU0YWQxMmI4NzNm ZDZhMzFmMDJlN2UwMWMzMDRlMzRjOTRhZWE2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTY1MSw4ICs2NTEsNyBAQCBt eSAldXNlc1RvSlNOZXdseUNyZWF0ZWQgPSAoCiBzdWIgR2V0RnVuY3Rpb25OYW1lCiB7CiAgICAg bXkgKCRjbGFzc05hbWUsICRmdW5jdGlvbikgPSBAXzsKLSAgICBteSAkaXNTdGF0aWMgPSAkZnVu Y3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn07Ci0g ICAgbXkgJGtpbmQgPSAkaXNTdGF0aWMgPyAiQ29uc3RydWN0b3IiIDogIlByb3RvdHlwZSI7Cisg ICAgbXkgJGtpbmQgPSAkZnVuY3Rpb24tPmlzU3RhdGljID8gIkNvbnN0cnVjdG9yIiA6ICJQcm90 b3R5cGUiOwogICAgIHJldHVybiAkY29kZUdlbmVyYXRvci0+V0tfbGNmaXJzdCgkY2xhc3NOYW1l KSAuICRraW5kIC4gIkZ1bmN0aW9uIiAuICRjb2RlR2VuZXJhdG9yLT5XS191Y2ZpcnN0KCRmdW5j dGlvbi0+c2lnbmF0dXJlLT5uYW1lKTsKIH0KIApAQCAtMTI5NCw4ICsxMjkzLDcgQEAgc3ViIEdl bmVyYXRlT3ZlcmxvYWRlZEZ1bmN0aW9uCiAgICAgIyBvdmVybG9hZCBpcyBhcHBsaWNhYmxlLCBw cmVjZWRlbmNlIGlzIGdpdmVuIGFjY29yZGluZyB0byB0aGUgb3JkZXIgb2YKICAgICAjIGRlY2xh cmF0aW9uIGluIHRoZSBJREwuCiAKLSAgICBteSAkaXNTdGF0aWMgPSAkZnVuY3Rpb24tPnNpZ25h dHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn07Ci0gICAgbXkgJGtpbmQg PSAkaXNTdGF0aWMgPyAiQ29uc3RydWN0b3IiIDogIlByb3RvdHlwZSI7CisgICAgbXkgJGtpbmQg PSAkZnVuY3Rpb24tPmlzU3RhdGljID8gIkNvbnN0cnVjdG9yIiA6ICJQcm90b3R5cGUiOwogICAg IG15ICRmdW5jdGlvbk5hbWUgPSAianMke2ltcGxDbGFzc05hbWV9JHtraW5kfUZ1bmN0aW9uIiAu ICRjb2RlR2VuZXJhdG9yLT5XS191Y2ZpcnN0KCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5uYW1lKTsK IAogICAgIHB1c2goQGltcGxDb250ZW50LCAiRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCAk e2Z1bmN0aW9uTmFtZX0oRXhlY1N0YXRlKiBleGVjKVxuIik7CkBAIC0xMzkwLDcgKzEzODgsNyBA QCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICB9CiAKICAgICAgICAgZm9yZWFj aCBteSAkZnVuY3Rpb24gKEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7Ci0gICAgICAgICAgICBu ZXh0IHVubGVzcyAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJD bGFzc01ldGhvZCJ9KTsKKyAgICAgICAgICAgIG5leHQgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3Rh dGljKTsKICAgICAgICAgICAgIG5leHQgaWYgJGZ1bmN0aW9uLT57b3ZlcmxvYWRJbmRleH0gJiYg JGZ1bmN0aW9uLT57b3ZlcmxvYWRJbmRleH0gPiAxOwogICAgICAgICAgICAgbXkgJG5hbWUgPSAk ZnVuY3Rpb24tPnNpZ25hdHVyZS0+bmFtZTsKICAgICAgICAgICAgIHB1c2goQGhhc2hLZXlzLCAk bmFtZSk7CkBAIC0xNDUxLDcgKzE0NDksNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgog ICAgIH0KIAogICAgIGZvcmVhY2ggbXkgJGZ1bmN0aW9uIChAeyRkYXRhTm9kZS0+ZnVuY3Rpb25z fSkgewotICAgICAgICBuZXh0IGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkNsYXNzTWV0aG9kIn0pOworICAgICAgICBuZXh0IGlmICgkZnVuY3Rpb24tPmlz U3RhdGljKTsKICAgICAgICAgbmV4dCBpZiAkZnVuY3Rpb24tPntvdmVybG9hZEluZGV4fSAmJiAk ZnVuY3Rpb24tPntvdmVybG9hZEluZGV4fSA+IDE7CiAgICAgICAgIG15ICRuYW1lID0gJGZ1bmN0 aW9uLT5zaWduYXR1cmUtPm5hbWU7CiAgICAgICAgIHB1c2goQGhhc2hLZXlzLCAkbmFtZSk7CkBA IC0yMDQzLDggKzIwNDEsNiBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogCiAgICAgICAg ICAgICAkaW1wbEluY2x1ZGVzeyI8cnVudGltZS9FcnJvci5oPiJ9ID0gMTsKIAotICAgICAgICAg ICAgbXkgJGlzU3RhdGljID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cy0+eyJDbGFzc01ldGhvZCJ9OwotCiAgICAgICAgICAgICBpZiAoJGludGVyZmFjZU5hbWUgZXEg IkRPTVdpbmRvdyIpIHsKICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAk Y2xhc3NOYW1lKiBjYXN0ZWRUaGlzID0gdG9KU0RPTVdpbmRvdyhleGVjLT5ob3N0VGhpc1ZhbHVl KCkudG9UaGlzT2JqZWN0KGV4ZWMpKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCAiICAgIGlmICghY2FzdGVkVGhpcylcbiIpOwpAQCAtMjA1MywyNyArMjA0OSwyNyBA QCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCAiICAgICRjbGFzc05hbWUqIGNhc3RlZFRoaXMgPSB0byR7Y2xhc3NOYW1lfShleGVj LT5ob3N0VGhpc1ZhbHVlKCkudG9UaGlzT2JqZWN0KGV4ZWMpKTtcbiIpOwogICAgICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmICghY2FzdGVkVGhpcylcbiIpOwogICAgICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVF cnJvcihleGVjKTtcbiIpOwotICAgICAgICAgICAgfSBlbHNpZiAoISRpc1N0YXRpYykgeworICAg ICAgICAgICAgfSBlbHNpZiAoISRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBKU1ZhbHVlIHRoaXNWYWx1ZSA9IGV4ZWMtPmhvc3RU aGlzVmFsdWUoKTtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAg IGlmICghdGhpc1ZhbHVlLmluaGVyaXRzKCYke2NsYXNzTmFtZX06OnNfaW5mbykpXG4iKTsKICAg ICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIHRocm93Vk1U eXBlRXJyb3IoZXhlYyk7XG4iKTsKICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwg IiAgICAkY2xhc3NOYW1lKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8JGNsYXNzTmFtZSo+KGFz T2JqZWN0KHRoaXNWYWx1ZSkpO1xuIik7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhp cywgJiR7Y2xhc3NOYW1lfTo6c19pbmZvKTtcbiIpIHVubGVzcyAoJGlzU3RhdGljKTsKKyAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMo Y2FzdGVkVGhpcywgJiR7Y2xhc3NOYW1lfTo6c19pbmZvKTtcbiIpIHVubGVzcyAoJGZ1bmN0aW9u LT5pc1N0YXRpYyk7CiAKICAgICAgICAgICAgIGlmICgkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJDaGVja0RvbWFpblNlY3VyaXR5In0gYW5kCiAgICAgICAgICAgICAgICAgISRmdW5j dGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiRG9Ob3RDaGVja0RvbWFpblNl Y3VyaXR5In0gYW5kCi0gICAgICAgICAgICAgICAgISRpc1N0YXRpYykgeworICAgICAgICAgICAg ICAgICEkZnVuY3Rpb24tPmlzU3RhdGljKSB7CiAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgaWYgKCFjYXN0ZWRUaGlzLT5hbGxvd3NBY2Nlc3NGcm9tKGV4ZWMpKVxuIik7 CiAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7XG4iKTsKICAgICAgICAgICAgIH0KIAogICAgICAg ICAgICAgaWYgKCRpc0N1c3RvbSkgewotICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhpcy0+IiAuICRmdW5jdGlvbklt cGxlbWVudGF0aW9uTmFtZSAuICIoZXhlYykpO1xuIikgdW5sZXNzICgkaXNTdGF0aWMpOworICAg ICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoY2FzdGVkVGhpcy0+IiAuICRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFtZSAuICIoZXhlYykp O1xuIikgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3RhdGljKTsKICAgICAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGltcGxUeXBlKiBpbXAg PSBzdGF0aWNfY2FzdDwkaW1wbFR5cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIikgdW5sZXNz ICgkaXNTdGF0aWMpOwotICAgICAgICAgICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAh JGlzU3RhdGljKSB7CisgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGlt cGxUeXBlKiBpbXAgPSBzdGF0aWNfY2FzdDwkaW1wbFR5cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkp O1xuIikgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3RhdGljKTsKKyAgICAgICAgICAgICAgICBpZiAo JHN2Z1Byb3BlcnR5VHlwZSBhbmQgISRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAgICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKGltcC0+cm9sZSgpID09IEFuaW1W YWxSb2xlKSB7XG4iKTsKICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBOT19NT0RJRklDQVRJT05fQUxMT1dFRF9FUlIp O1xuIik7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpO1xuIik7CkBAIC0yMDg4LDcgKzIw ODQsNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgICAgICBw dXNoKEBpbXBsQ29udGVudCwgIiAgICBFeGNlcHRpb25Db2RlIGVjID0gMDtcbiIpOwogICAgICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlNWR0NoZWNrU2VjdXJpdHlEb2N1bWVudCJ9IGFuZCAhJGlz U3RhdGljKSB7CisgICAgICAgICAgICAgICAgaWYgKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiU1ZHQ2hlY2tTZWN1cml0eURvY3VtZW50In0gYW5kICEkZnVuY3Rp b24tPmlzU3RhdGljKSB7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAi ICAgIGlmICghY2hlY2tOb2RlU2VjdXJpdHkoZXhlYywgaW1wLT5nZXRTVkdEb2N1bWVudCgiIC4g KEB7JGZ1bmN0aW9uLT5yYWlzZXNFeGNlcHRpb25zfSA/ICJlYyIgOiAiIikgLiIpKSlcbiIpOwog ICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTtcbiIpOwogICAgICAgICAgICAgICAgICAgICAk aW1wbEluY2x1ZGVzeyJKU0RPTUJpbmRpbmcuaCJ9ID0gMTsKQEAgLTIzMzgsMTAgKzIzMzQsOSBA QCBzdWIgR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2sKICAgICBteSAkcGFyYW1JbmRleCA9IDA7CiAg ICAgbXkgJGFyZ3NJbmRleCA9IDA7CiAgICAgbXkgJGhhc09wdGlvbmFsQXJndW1lbnRzID0gMDsK LSAgICBteSAkaXNTdGF0aWMgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IkNsYXNzTWV0aG9kIn07CiAKICAgICBteSAkZnVuY3Rpb25CYXNlID0gIiI7Ci0gICAg aWYgKCRpc1N0YXRpYykgeworICAgIGlmICgkZnVuY3Rpb24tPmlzU3RhdGljKSB7CiAgICAgICAg ICRmdW5jdGlvbkJhc2UgPSAiJHtpbXBsQ2xhc3NOYW1lfTo6IjsKICAgICB9IGVsc2lmICgkc3Zn UHJvcGVydHlPckxpc3RQcm9wZXJ0eVR5cGUgYW5kICEkc3ZnTGlzdFByb3BlcnR5VHlwZSkgewog ICAgICAgICAkZnVuY3Rpb25CYXNlID0gInBvZEltcC4iOwpAQCAtMjM1MCw3ICsyMzQ1LDcgQEAg c3ViIEdlbmVyYXRlUGFyYW1ldGVyc0NoZWNrCiAgICAgfQogICAgIG15ICRmdW5jdGlvblN0cmlu ZyA9ICIkZnVuY3Rpb25CYXNlJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lKCI7CiAKLSAgICBp ZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21Bcmd1 bWVudEhhbmRsaW5nIn0gYW5kICEkaXNTdGF0aWMpIHsKKyAgICBpZiAoJGZ1bmN0aW9uLT5zaWdu YXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21Bcmd1bWVudEhhbmRsaW5nIn0gYW5k ICEkZnVuY3Rpb24tPmlzU3RhdGljKSB7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAg ICBSZWZQdHI8U2NyaXB0QXJndW1lbnRzPiBzY3JpcHRBcmd1bWVudHMoY3JlYXRlU2NyaXB0QXJn dW1lbnRzKGV4ZWMsICRudW1QYXJhbWV0ZXJzKSk7XG4iKTsKICAgICAgICAgcHVzaChAJG91dHB1 dEFycmF5LCAiICAgIHNpemVfdCBtYXhTdGFja1NpemUgPSBpbXAtPnNob3VsZENhcHR1cmVGdWxs U3RhY2tUcmFjZSgpID8gU2NyaXB0Q2FsbFN0YWNrOjptYXhDYWxsU3RhY2tTaXplVG9DYXB0dXJl IDogMTtcbiIpOwogICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgUmVmUHRyPFNjcmlw dENhbGxTdGFjaz4gY2FsbFN0YWNrKGNyZWF0ZVNjcmlwdENhbGxTdGFjayhleGVjLCBtYXhTdGFj a1NpemUpKTtcbiIpOwpAQCAtMjY3OSwxMyArMjY3NCwxMSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1l bnRhdGlvbkZ1bmN0aW9uQ2FsbCgpCiAgICAgfQogICAgICRmdW5jdGlvblN0cmluZyAuPSAiKSI7 CiAKLSAgICBteSAkaXNTdGF0aWMgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkNsYXNzTWV0aG9kIn07Ci0KICAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUt PnR5cGUgZXEgInZvaWQiKSB7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAkaW5kZW50IC4g IiRmdW5jdGlvblN0cmluZztcbiIpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgJGluZGVu dCAuICJzZXRET01FeGNlcHRpb24oZXhlYywgZWMpO1xuIikgaWYgQHskZnVuY3Rpb24tPnJhaXNl c0V4Y2VwdGlvbnN9OwogCi0gICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAhJGlzU3Rh dGljKSB7CisgICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAhJGZ1bmN0aW9uLT5pc1N0 YXRpYykgewogICAgICAgICAgICAgaWYgKEB7JGZ1bmN0aW9uLT5yYWlzZXNFeGNlcHRpb25zfSkg ewogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAkaW5kZW50IC4gImlmICghZWMp XG4iKTsgCiAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICRpbmRlbnQgLiAiICAg IGltcC0+Y29tbWl0Q2hhbmdlKCk7XG4iKTsKQEAgLTMzNDEsNyArMzMzNCw3IEBAIHN1YiBHZW5l cmF0ZUNvbnN0cnVjdG9yRGVmaW5pdGlvbgogCiAgICAgbXkgJGhhc1N0YXRpY0Z1bmN0aW9ucyA9 IDA7CiAgICAgZm9yZWFjaCBteSAkZnVuY3Rpb24gKEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7 Ci0gICAgICAgIGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57 IkNsYXNzTWV0aG9kIn0pIHsKKyAgICAgICAgaWYgKCRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAg ICAgICAgICAgICRoYXNTdGF0aWNGdW5jdGlvbnMgPSAxOwogICAgICAgICAgICAgbGFzdDsKICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3JWOC5wbQppbmRleCA2YWZkODEwZGM0YzRmZGE2OGEyMDlmN2NmODQ0NzI2ZDY0Y2ZiZDU3 Li41NjlkODZkOTIzNDljNTkwZDRhYmY5YzE1NGQzZTA2OWZlY2I0MDdmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtMTMz NSw3ICsxMzM1LDcgQEAgRU5ECiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAi ICAgICRzdmdXcmFwcGVkTmF0aXZlVHlwZSYgaW1wSW5zdGFuY2UgPSB3cmFwcGVyLT5wcm9wZXJ0 eVJlZmVyZW5jZSgpO1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAi ICAgICRzdmdXcmFwcGVkTmF0aXZlVHlwZSogaW1wID0gJmltcEluc3RhbmNlO1xuIik7CiAgICAg ICAgIH0KLSAgICB9IGVsc2lmICghJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJDbGFzc01ldGhvZCJ9KSB7CisgICAgfSBlbHNpZiAoISRmdW5jdGlvbi0+aXNTdGF0 aWMpIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgPDxFTkQpOwogICAgICR7aW1w bENsYXNzTmFtZX0qIGltcCA9IFY4JHtpbXBsQ2xhc3NOYW1lfTo6dG9OYXRpdmUoYXJncy5Ib2xk ZXIoKSk7CiBFTkQKQEAgLTIzMDcsNyArMjMwNyw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0 aW9uCiAgICAgICAgIGlmICgkYXR0ckV4dC0+eyJWOE9uSW5zdGFuY2UifSkgewogICAgICAgICAg ICAgbmV4dDsKICAgICAgICAgfQotICAgICAgICBpZiAoJGF0dHJFeHQtPnsiQ2xhc3NNZXRob2Qi fSkgeworICAgICAgICBpZiAoJGZ1bmN0aW9uLT5pc1N0YXRpYykgewogICAgICAgICAgICAgbmV4 dDsKICAgICAgICAgfQogICAgICAgICBpZiAoJGF0dHJFeHQtPnsiRW5hYmxlZEF0UnVudGltZSJ9 IHx8IFJlcXVpcmVzQ3VzdG9tU2lnbmF0dXJlKCRmdW5jdGlvbikgfHwgJGF0dHJFeHQtPnsiVjhE b05vdENoZWNrU2lnbmF0dXJlIn0pIHsKQEAgLTI1MjYsNyArMjUyNiw3IEBAIEVORAogICAgICAg ICBpZiAoJGF0dHJFeHQtPnsiVjhPbkluc3RhbmNlIn0pIHsKICAgICAgICAgICAgICR0ZW1wbGF0 ZSA9ICJpbnN0YW5jZSI7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCRhdHRyRXh0LT57IkNsYXNz TWV0aG9kIn0pIHsKKyAgICAgICAgaWYgKCRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKICAgICAgICAg ICAgICR0ZW1wbGF0ZSA9ICJkZXNjIjsKICAgICAgICAgfQogCkBAIC0yNTU5LDM4ICsyNTU5LDM4 IEBAIEVORAogICAgIC8vICRjb21tZW50SW5mbwogICAgICR7Y29uZGl0aW9uYWx9JHRlbXBsYXRl LT5TZXRBY2Nlc3Nvcih2ODo6U3RyaW5nOjpOZXcoIiRuYW1lIiksICR7aW50ZXJmYWNlTmFtZX1J bnRlcm5hbDo6JHtuYW1lfUF0dHJHZXR0ZXIsIDAsIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpLCB2 ODo6QUxMX0NBTl9SRUFELCBzdGF0aWNfY2FzdDx2ODo6UHJvcGVydHlBdHRyaWJ1dGU+KCRwcm9w ZXJ0eV9hdHRyaWJ1dGVzKSk7CiBFTkQKLSAgICAgICAgICAkbnVtX2NhbGxiYWNrcysrOwotICAg ICAgICAgIG5leHQ7Ci0gICAgICB9CisgICAgICAgICAgICAkbnVtX2NhbGxiYWNrcysrOworICAg ICAgICAgICAgbmV4dDsKKyAgICAgICAgfQogCi0gICAgICBteSAkc2lnbmF0dXJlID0gImRlZmF1 bHRTaWduYXR1cmUiOwotICAgICAgaWYgKCRhdHRyRXh0LT57IlY4RG9Ob3RDaGVja1NpZ25hdHVy ZSJ9IHx8ICRhdHRyRXh0LT57IkNsYXNzTWV0aG9kIn0pIHsKLSAgICAgICAgICAkc2lnbmF0dXJl ID0gInY4OjpMb2NhbDx2ODo6U2lnbmF0dXJlPigpIjsKLSAgICAgIH0KKyAgICAgICAgbXkgJHNp Z25hdHVyZSA9ICJkZWZhdWx0U2lnbmF0dXJlIjsKKyAgICAgICAgaWYgKCRhdHRyRXh0LT57IlY4 RG9Ob3RDaGVja1NpZ25hdHVyZSJ9IHx8ICRmdW5jdGlvbi0+aXNTdGF0aWMpIHsKKyAgICAgICAg ICAgICRzaWduYXR1cmUgPSAidjg6OkxvY2FsPHY4OjpTaWduYXR1cmU+KCkiOworICAgICAgICB9 CiAKLSAgICAgIGlmIChSZXF1aXJlc0N1c3RvbVNpZ25hdHVyZSgkZnVuY3Rpb24pKSB7Ci0gICAg ICAgICAgJHNpZ25hdHVyZSA9ICIke25hbWV9U2lnbmF0dXJlIjsKLSAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIlxuICAgIC8vIEN1c3RvbSBTaWduYXR1cmUgJyRuYW1lJ1xuIiwgQ3JlYXRl Q3VzdG9tU2lnbmF0dXJlKCRmdW5jdGlvbikpOwotICAgICAgfQorICAgICAgICBpZiAoUmVxdWly ZXNDdXN0b21TaWduYXR1cmUoJGZ1bmN0aW9uKSkgeworICAgICAgICAgICAgJHNpZ25hdHVyZSA9 ICIke25hbWV9U2lnbmF0dXJlIjsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiXG4g ICAgLy8gQ3VzdG9tIFNpZ25hdHVyZSAnJG5hbWUnXG4iLCBDcmVhdGVDdXN0b21TaWduYXR1cmUo JGZ1bmN0aW9uKSk7CisgICAgICAgIH0KIAotICAgICAgIyBOb3JtYWwgZnVuY3Rpb24gY2FsbCBp cyBhIHRlbXBsYXRlCi0gICAgICBteSAkY2FsbGJhY2sgPSBHZXRGdW5jdGlvblRlbXBsYXRlQ2Fs bGJhY2tOYW1lKCRmdW5jdGlvbiwgJGludGVyZmFjZU5hbWUpOworICAgICAgICAjIE5vcm1hbCBm dW5jdGlvbiBjYWxsIGlzIGEgdGVtcGxhdGUKKyAgICAgICAgbXkgJGNhbGxiYWNrID0gR2V0RnVu Y3Rpb25UZW1wbGF0ZUNhbGxiYWNrTmFtZSgkZnVuY3Rpb24sICRpbnRlcmZhY2VOYW1lKTsKIAot ICAgICAgaWYgKCRwcm9wZXJ0eV9hdHRyaWJ1dGVzIGVxICJ2ODo6RG9udERlbGV0ZSIpIHsKLSAg ICAgICAgICAkcHJvcGVydHlfYXR0cmlidXRlcyA9ICIiOwotICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAkcHJvcGVydHlfYXR0cmlidXRlcyA9ICIsIHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0 dHJpYnV0ZT4oJHByb3BlcnR5X2F0dHJpYnV0ZXMpIjsKLSAgICAgIH0KKyAgICAgICAgaWYgKCRw cm9wZXJ0eV9hdHRyaWJ1dGVzIGVxICJ2ODo6RG9udERlbGV0ZSIpIHsKKyAgICAgICAgICAgICRw cm9wZXJ0eV9hdHRyaWJ1dGVzID0gIiI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAk cHJvcGVydHlfYXR0cmlidXRlcyA9ICIsIHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0dHJpYnV0 ZT4oJHByb3BlcnR5X2F0dHJpYnV0ZXMpIjsKKyAgICAgICAgfQogCi0gICAgICBpZiAoJHRlbXBs YXRlIGVxICJwcm90byIgJiYgJGNvbmRpdGlvbmFsIGVxICIiICYmICRzaWduYXR1cmUgZXEgImRl ZmF1bHRTaWduYXR1cmUiICYmICRwcm9wZXJ0eV9hdHRyaWJ1dGVzIGVxICIiKSB7Ci0gICAgICAg ICAgIyBTdGFuZGFyZCB0eXBlIG9mIGNhbGxiYWNrLCBhbHJlYWR5IGNyZWF0ZWQgaW4gdGhlIGJh dGNoLCBzbyBza2lwIGl0IGhlcmUuCi0gICAgICAgICAgbmV4dDsKLSAgICAgIH0KKyAgICAgICAg aWYgKCR0ZW1wbGF0ZSBlcSAicHJvdG8iICYmICRjb25kaXRpb25hbCBlcSAiIiAmJiAkc2lnbmF0 dXJlIGVxICJkZWZhdWx0U2lnbmF0dXJlIiAmJiAkcHJvcGVydHlfYXR0cmlidXRlcyBlcSAiIikg eworICAgICAgICAgICAgIyBTdGFuZGFyZCB0eXBlIG9mIGNhbGxiYWNrLCBhbHJlYWR5IGNyZWF0 ZWQgaW4gdGhlIGJhdGNoLCBzbyBza2lwIGl0IGhlcmUuCisgICAgICAgICAgICBuZXh0OworICAg ICAgICB9CiAKLSAgICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CisgICAgICAgIHB1c2go QGltcGxDb250ZW50LCA8PEVORCk7CiAgICAgJHtjb25kaXRpb25hbH0kdGVtcGxhdGUtPlNldCh2 ODo6U3RyaW5nOjpOZXcoIiRuYW1lIiksIHY4OjpGdW5jdGlvblRlbXBsYXRlOjpOZXcoJGNhbGxi YWNrLCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKSwgJHtzaWduYXR1cmV9KSRwcm9wZXJ0eV9hdHRy aWJ1dGVzKTsKIEVORAotICAgICAgJG51bV9jYWxsYmFja3MrKzsKKyAgICAgICAgJG51bV9jYWxs YmFja3MrKzsKICAgICB9CiAKICAgICBkaWUgIldyb25nIG51bWJlciBvZiBjYWxsYmFja3MgZ2Vu ZXJhdGVkIGZvciAkaW50ZXJmYWNlTmFtZSAoJG51bV9jYWxsYmFja3MsIHNob3VsZCBiZSAkdG90 YWxfZnVuY3Rpb25zKSIgaWYgJG51bV9jYWxsYmFja3MgIT0gJHRvdGFsX2Z1bmN0aW9uczsKQEAg LTMxMjIsNyArMzEyMiw3IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uQ2FsbFN0cmluZygpCiAgICAg fQogCiAgICAgbXkgJGZ1bmN0aW9uU3RyaW5nID0gImltcC0+JHtuYW1lfSgiOwotICAgIGlmICgk ZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNsYXNzTWV0aG9kIn0p IHsKKyAgICBpZiAoJGZ1bmN0aW9uLT5pc1N0YXRpYykgewogICAgICAgICAkZnVuY3Rpb25TdHJp bmcgPSAiJHtpbXBsQ2xhc3NOYW1lfTo6JHtuYW1lfSgiOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0gYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQppbmRleCA5MzViYTIyZjQyZGViNzg5 MzQ4ZDE0OThhYTQzZGMyOWQzMjkwOWQ1Li4wNjMzMTc1Y2E5ZTE0NGQ3NTc3NjlkOWMxYmIwY2Q0 YWVkY2ZhZjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNl ci5wbQpAQCAtMzYwLDEwICszNjAsMTEgQEAgc3ViIFBhcnNlSW50ZXJmYWNlCiAgICAgICAgICAg ICB9IGVsc2lmICgoJGxpbmUgIX4gcy9eXHMqJC8vZykgYW5kICgkbGluZSAhfiAvXlxzKmNvbnN0 LykpIHsKICAgICAgICAgICAgICAgICAkbGluZSA9fiAvJElETFN0cnVjdHVyZTo6aW50ZXJmYWNl TWV0aG9kU2VsZWN0b3IvIG9yIGRpZSAiUGFyc2luZyBlcnJvciFcblNvdXJjZTpcbiRsaW5lXG4p IjsKIAotICAgICAgICAgICAgICAgIG15ICRtZXRob2RFeHRlbmRlZEF0dHJpYnV0ZXMgPSAoZGVm aW5lZCgkMSkgPyAkMSA6ICIgIik7IGNob3AoJG1ldGhvZEV4dGVuZGVkQXR0cmlidXRlcyk7Ci0g ICAgICAgICAgICAgICAgbXkgJG1ldGhvZFR5cGUgPSAoZGVmaW5lZCgkMikgPyAkMiA6IGRpZSgi UGFyc2luZyBlcnJvciFcblNvdXJjZTpcbiRsaW5lXG4pIikpOwotICAgICAgICAgICAgICAgIG15 ICRtZXRob2ROYW1lID0gKGRlZmluZWQoJDMpID8gJDMgOiBkaWUoIlBhcnNpbmcgZXJyb3IhXG5T b3VyY2U6XG4kbGluZVxuKSIpKTsKLSAgICAgICAgICAgICAgICBteSAkbWV0aG9kU2lnbmF0dXJl ID0gKGRlZmluZWQoJDQpID8gJDQgOiBkaWUoIlBhcnNpbmcgZXJyb3IhXG5Tb3VyY2U6XG4kbGlu ZVxuKSIpKTsKKyAgICAgICAgICAgICAgICBteSAkaXNTdGF0aWMgPSBkZWZpbmVkKCQxKTsKKyAg ICAgICAgICAgICAgICBteSAkbWV0aG9kRXh0ZW5kZWRBdHRyaWJ1dGVzID0gKGRlZmluZWQoJDIp ID8gJDIgOiAiICIpOyBjaG9wKCRtZXRob2RFeHRlbmRlZEF0dHJpYnV0ZXMpOworICAgICAgICAg ICAgICAgIG15ICRtZXRob2RUeXBlID0gKGRlZmluZWQoJDMpID8gJDMgOiBkaWUoIlBhcnNpbmcg ZXJyb3IhXG5Tb3VyY2U6XG4kbGluZVxuKSIpKTsKKyAgICAgICAgICAgICAgICBteSAkbWV0aG9k TmFtZSA9IChkZWZpbmVkKCQ0KSA/ICQ0IDogZGllKCJQYXJzaW5nIGVycm9yIVxuU291cmNlOlxu JGxpbmVcbikiKSk7CisgICAgICAgICAgICAgICAgbXkgJG1ldGhvZFNpZ25hdHVyZSA9IChkZWZp bmVkKCQ1KSA/ICQ1IDogZGllKCJQYXJzaW5nIGVycm9yIVxuU291cmNlOlxuJGxpbmVcbikiKSk7 CiAKICAgICAgICAgICAgICAgICAoJycgPX4gL14vKTsgIyBSZXNldCB2YXJpYWJsZXMgbmVlZGVk IGZvciByZWdleHAgbWF0Y2hpbmcKIApAQCAtMzcyLDYgKzM3Myw3IEBAIHN1YiBQYXJzZUludGVy ZmFjZQogCiAgICAgICAgICAgICAgICAgbXkgJG5ld0RhdGFOb2RlID0gbmV3IGRvbUZ1bmN0aW9u KCk7CiAKKyAgICAgICAgICAgICAgICAkbmV3RGF0YU5vZGUtPmlzU3RhdGljKCRpc1N0YXRpYyk7 CiAgICAgICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT5zaWduYXR1cmUobmV3IGRvbVNpZ25hdHVy ZSgpKTsKICAgICAgICAgICAgICAgICAkbmV3RGF0YU5vZGUtPnNpZ25hdHVyZS0+bmFtZSgkbWV0 aG9kTmFtZSk7CiAgICAgICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT5zaWduYXR1cmUtPnR5cGUo JG1ldGhvZFR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9JRExTdHJ1Y3R1cmUucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFN0 cnVjdHVyZS5wbQppbmRleCA4ODVhODhkYThjMTZjMTRhYTgzMWQ1NzE0ZWVjMjJhNDdkMWE0NmRi Li5hZGQwNDc0ZDA4MjIxMjA4NTVlMjI4Njc3NmY0NzNjOGQ2MmEyODU0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFN0cnVjdHVyZS5wbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFN0cnVjdHVyZS5wbQpAQCAtNDUsNiArNDUs NyBAQCBzdHJ1Y3QoIGRvbUNsYXNzID0+IHsKIAogIyBVc2VkIHRvIHJlcHJlc2VudCBkb21DbGFz cyBjb250ZW50cyAobmFtZSBvZiBtZXRob2QsIHNpZ25hdHVyZSkKIHN0cnVjdCggZG9tRnVuY3Rp b24gPT4geworICAgIGlzU3RhdGljID0+ICckJywKICAgICBzaWduYXR1cmUgPT4gJyQnLCAgICAj IFJldHVybiB0eXBlL09iamVjdCBuYW1lL2V4dGVuZGVkIGF0dHJpYnV0ZXMKICAgICBwYXJhbWV0 ZXJzID0+ICdAJywgICAgIyBMaXN0IG9mICdkb21TaWduYXR1cmUnCiAgICAgcmFpc2VzRXhjZXB0 aW9ucyA9PiAnQCcsICAjIFBvc3NpYmx5IHJhaXNlZCBleGNlcHRpb25zLgpAQCAtMTAzLDcgKzEw NCw3IEBAIG91ciAkc2V0dGVyUmFpc2VzU2VsZWN0b3IgPSAnXGJzZXR0ZXJccytyYWlzZXNccypc KCgnIC4gJGlkbElkTnNMaXN0IC4gJyopXHMqXCknCiBvdXIgJHR5cGVOYW1lc3BhY2VTZWxlY3Rv ciA9ICcoKD86JyAuICRpZGxJZCAuICcqOjopKilccyooJyAuICRpZGxEYXRhVHlwZSAuICcqKSc7 CiAKIG91ciAkaW50ZXJmYWNlU2VsZWN0b3IgPSAnaW50ZXJmYWNlXHMqKCg/OicgLiAkZXh0ZW5k ZWRBdHRyaWJ1dGVTeW50YXggLiAnICk/KSgnIC4gJGlkbElkTnMgLiAnKilccyooPzo6KFxzKlte e10qKSk/eyhbLWEtekEtWjAtOV8iPVxzKCksOzpcW1xdJlx8XSopJzsKLW91ciAkaW50ZXJmYWNl TWV0aG9kU2VsZWN0b3IgPSAnXHMqKCg/OicgLiAkZXh0ZW5kZWRBdHRyaWJ1dGVTeW50YXggLiAn ICk/KScgLiAkc3VwcG9ydGVkVHlwZXMgLiAnXHMqKCcgLiAkaWRsSWROcyAuICcqKVxzKlwoXHMq KFthLXpBLVowLTk6XHMsPVxbXF1dKiknOworb3VyICRpbnRlcmZhY2VNZXRob2RTZWxlY3RvciA9 ICdccyooc3RhdGljXHMrKT8oKD86JyAuICRleHRlbmRlZEF0dHJpYnV0ZVN5bnRheCAuICcgKT8p JyAuICRzdXBwb3J0ZWRUeXBlcyAuICdccyooJyAuICRpZGxJZE5zIC4gJyopXHMqXChccyooW2Et ekEtWjAtOTpccyw9XFtcXV0qKSc7CiBvdXIgJGludGVyZmFjZVBhcmFtZXRlclNlbGVjdG9yID0g JyhpbnxvdXQpXHMqKCg/OicgLiAkZXh0ZW5kZWRBdHRyaWJ1dGVTeW50YXggLiAnICk/KScgLiAk c3VwcG9ydGVkVHlwZXMgLiAnXHMqKCcgLiAkaWRsSWROcyAuICcqKSc7CiAKIG91ciAkaW50ZXJm YWNlQXR0cmlidXRlU2VsZWN0b3IgPSAnXHMqKHJlYWRvbmx5IGF0dHJpYnV0ZXxhdHRyaWJ1dGUp XHMqKCcgLiAkZXh0ZW5kZWRBdHRyaWJ1dGVTeW50YXggLiAnICk/JyAuICRzdXBwb3J0ZWRUeXBl cyAuICdccyooJyAuICRpZGxUeXBlIC4gJyopJzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbAppbmRleCA5YzM3NmEyMGFjOWM4ODMyMmEzOGVm NWRjNTBlZjc0YmI3YWJkZjY5Li44MDNhZTI3MmZkZmZiMzI5NmJjYWU0YmE4MmRlMDA5M2JkZDdh ZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVz dE9iai5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RP YmouaWRsCkBAIC0xNjIsOCArMTYyLDggQEAgbW9kdWxlIHRlc3QgewogI2VuZGlmCiAKICAgICAg ICAgLy8gQ2xhc3MgbWV0aG9kcyB3aXRoaW4gSmF2YVNjcmlwdCAobGlrZSB3aGF0J3MgdXNlZCBm b3IgSURCS2V5UmFuZ2UpLgotICAgICAgICBbQ2xhc3NNZXRob2RdIHZvaWQgY2xhc3NNZXRob2Qo KTsKLSAgICAgICAgW0NsYXNzTWV0aG9kXSBsb25nIGNsYXNzTWV0aG9kV2l0aE9wdGlvbmFsKGlu IFtPcHRpb25hbF0gbG9uZyBhcmcpOworICAgICAgICBzdGF0aWMgdm9pZCBjbGFzc01ldGhvZCgp OworICAgICAgICBzdGF0aWMgbG9uZyBjbGFzc01ldGhvZFdpdGhPcHRpb25hbChpbiBbT3B0aW9u YWxdIGxvbmcgYXJnKTsKIAogI2lmIGRlZmluZWQoVEVTVElOR19WOCkKICAgICAgICAgLy8gJ0Vu YWJsZWRBdFJ1bnRpbWUnIG1ldGhvZHMgYW5kIGF0dHJpYnV0ZXMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL0lEQktleVJhbmdlLmlkbCBiL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvSURCS2V5UmFuZ2UuaWRsCmluZGV4IGZjMGFmNmNkMGIxNGExNjk1YTMwMzIwZTZhODgyNmUw YTkxZDhmMjQuLjE2MWNiOWM0NzczM2ZiYWFhYmU0YTE4Zjk2ZDUzMTU3ZDY2NTEzZWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuaWRsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvSURCS2V5UmFuZ2UuaWRsCkBAIC0zMywxNCArMzMsMTMgQEAgbW9k dWxlIHN0b3JhZ2UgewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiBsb3dlck9w ZW47CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuIHVwcGVyT3BlbjsKIAotICAg ICAgICAvLyBGSVhNRTogTWFrZSBDbGFzc01ldGhvZCB3b3JrIGZvciBKU0MgYXMgd2VsbC4KLSAg ICAgICAgW0NsYXNzTWV0aG9kXSBJREJLZXlSYW5nZSBvbmx5KGluIElEQktleSB2YWx1ZSkKKyAg ICAgICAgc3RhdGljIElEQktleVJhbmdlIG9ubHkoaW4gSURCS2V5IHZhbHVlKQogICAgICAgICAg ICAgcmFpc2VzIChJREJEYXRhYmFzZUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDbGFzc01ldGhvZF0g SURCS2V5UmFuZ2UgbG93ZXJCb3VuZChpbiBJREJLZXkgYm91bmQsIGluIFtPcHRpb25hbF0gYm9v bGVhbiBvcGVuKQorICAgICAgICBzdGF0aWMgSURCS2V5UmFuZ2UgbG93ZXJCb3VuZChpbiBJREJL ZXkgYm91bmQsIGluIFtPcHRpb25hbF0gYm9vbGVhbiBvcGVuKQogICAgICAgICAgICAgcmFpc2Vz IChJREJEYXRhYmFzZUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDbGFzc01ldGhvZF0gSURCS2V5UmFu Z2UgdXBwZXJCb3VuZChpbiBJREJLZXkgYm91bmQsIGluIFtPcHRpb25hbF0gYm9vbGVhbiBvcGVu KQorICAgICAgICBzdGF0aWMgSURCS2V5UmFuZ2UgdXBwZXJCb3VuZChpbiBJREJLZXkgYm91bmQs IGluIFtPcHRpb25hbF0gYm9vbGVhbiBvcGVuKQogICAgICAgICAgICAgcmFpc2VzIChJREJEYXRh YmFzZUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDbGFzc01ldGhvZF0gSURCS2V5UmFuZ2UgYm91bmQo aW4gSURCS2V5IGxvd2VyLCBpbiBJREJLZXkgdXBwZXIsIGluIFtPcHRpb25hbF0gYm9vbGVhbiBs b3dlck9wZW4sIGluIFtPcHRpb25hbF0gYm9vbGVhbiB1cHBlck9wZW4pCisgICAgICAgIHN0YXRp YyBJREJLZXlSYW5nZSBib3VuZChpbiBJREJLZXkgbG93ZXIsIGluIElEQktleSB1cHBlciwgaW4g W09wdGlvbmFsXSBib29sZWFuIGxvd2VyT3BlbiwgaW4gW09wdGlvbmFsXSBib29sZWFuIHVwcGVy T3BlbikKICAgICAgICAgICAgIHJhaXNlcyAoSURCRGF0YWJhc2VFeGNlcHRpb24pOwogICAgIH07 CiAK