65040 2011-07-22 12:32:45 -0700 Consider Conditional attribute in CodeGeneratorJS' JSValueToNative and NativeToJSValue function 2011-08-29 13:04:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 64231 65050 1 paroga paroga bfulgham webkit.review.bot oldest_to_newest 441092 0 paroga 2011-07-22 12:32:45 -0700 Consider Conditional attribute in CodeGeneratorJS' JSValueToNative and NativeToJSValue function 441110 1 101755 paroga 2011-07-22 12:49:09 -0700 Created attachment 101755 Patch 458333 2 101755 bfulgham 2011-08-29 11:53:17 -0700 Comment on attachment 101755 Patch This looks great! 458359 3 101755 webkit.review.bot 2011-08-29 12:24:46 -0700 Comment on attachment 101755 Patch Rejecting attachment 101755 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: set 37 lines). Hunk #4 succeeded at 2660 (offset 37 lines). Hunk #5 succeeded at 2697 (offset 37 lines). Hunk #6 succeeded at 2717 (offset 37 lines). Hunk #7 FAILED at 2691. Hunk #8 succeeded at 2782 (offset 37 lines). Hunk #9 succeeded at 2793 (offset 37 lines). 1 out of 9 hunks FAILED -- saving rejects to file Source/WebCore/bindings/scripts/CodeGeneratorJS.pm.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Brent Fulgham', u'--fo..." exit_code: 1 Full output: http://queues.webkit.org/results/9567158 458392 4 paroga 2011-08-29 13:04:01 -0700 Committed r94005: <http://trac.webkit.org/changeset/94005> 101755 2011-07-22 12:49:09 -0700 2011-08-29 12:24:46 -0700 Patch bug-65040.patch text/plain 9608 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZTU1MDk0Li44MjRjNjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDctMjIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgQ29uc2lkZXIgQ29uZGl0aW9uYWwgYXR0cmlidXRlIGluIENvZGVHZW5lcmF0b3JK UycgSlNWYWx1ZVRvTmF0aXZlIGFuZCBOYXRpdmVUb0pTVmFsdWUgZnVuY3Rpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MDQwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSlNWYWx1ZVRvTmF0aXZlIGFu ZCBOYXRpdmVUb0pTVmFsdWUgYWRkIGFkZGl0aW9uYWwgaW5jbHVkZSBzdGF0ZW1lbnRzCisgICAg ICAgIHRvIHRoZSBpbXBsZW1lbnRhdGlvbiBhbmQgbmVlZCB0byBoYW5kbGUgdGhlIENvbmRpdGlv bmFsIGF0dHJpYnV0ZSBmcm9tCisgICAgICAgIHRoZSBJREwgZmlsZS4gVGhlIENvbmRpdGlvbmFs IGF0dHJpYnV0ZSBhZGRzIGFwcHJvcHJpYXRlICNpZiBFTkFCTEUoKQorICAgICAgICBsaW5lcyBm b3IgdGhlIHByZXByb2Nlc3NvciBhcm91bmQgdGhlIGluY2x1ZGUgc3RhdGVtZW50cyB0byByZW1v dmUKKyAgICAgICAgc29tZSB1bm5lZWRlZCBidWlsZCBkZXBlbmRlbmNpZXMuCisKKyAgICAgICAg KiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKwogMjAxMS0wNy0yMSAgUGF2 ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogW3Byb3RvY29sXSBleHRlbmQgc2V0QnJlYWtwb2ludEJ5VXJsIHJlcXVlc3QgdG8gYWNjZXB0 IGluY29tcGxldGUgVVJMIChwcmVkaWNhdGVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCA0ZDcwY2ExLi43MzI3NTY1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JK Uy5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JK Uy5wbQpAQCAtMjkyLDYgKzI5MiwyOCBAQCBzdWIgQWRkSW5jbHVkZXNGb3JTVkdBbmltYXRlZFR5 cGUKICAgICB9CiB9CiAKK3N1YiBBZGRUb0ltcGxJbmNsdWRlcworeworICAgIG15ICRoZWFkZXIg PSBzaGlmdDsKKyAgICBteSAkY29uZGl0aW9uYWwgPSBzaGlmdDsKKworICAgIGlmIChub3QgJGNv bmRpdGlvbmFsKSB7CisgICAgICAgICRpbXBsSW5jbHVkZXN7JGhlYWRlcn0gPSAxOworICAgIH0g ZWxzaWYgKG5vdCBleGlzdHMoJGltcGxJbmNsdWRlc3skaGVhZGVyfSkpIHsKKyAgICAgICAgJGlt cGxJbmNsdWRlc3skaGVhZGVyfSA9ICRjb25kaXRpb25hbDsKKyAgICB9IGVsc2UgeworICAgICAg ICBteSAkb2xkVmFsdWUgPSAkaW1wbEluY2x1ZGVzeyRoZWFkZXJ9OworICAgICAgICBpZiAoJG9s ZFZhbHVlIG5lIDEpIHsKKyAgICAgICAgICAgIG15ICVuZXdWYWx1ZSA9ICgpOworICAgICAgICAg ICAgJG5ld1ZhbHVleyRjb25kaXRpb25hbH0gPSAxOworICAgICAgICAgICAgZm9yZWFjaCBteSAk Y29uZGl0aW9uIChzcGxpdCgvXHwvLCAkb2xkVmFsdWUpKSB7CisgICAgICAgICAgICAgICAgJG5l d1ZhbHVleyRjb25kaXRpb259ID0gMTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICRpbXBs SW5jbHVkZXN7JGhlYWRlcn0gPSBqb2luKCJ8Iiwgc29ydCBrZXlzICVuZXdWYWx1ZSk7CisgICAg ICAgIH0KKyAgICB9Cit9CisKIHN1YiBJc1NjcmlwdFByb2ZpbGVUeXBlCiB7CiAgICAgbXkgJHR5 cGUgPSBzaGlmdDsKQEAgLTE3NTEsMjMgKzE3NzMsNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRh dGlvbgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG15ICRjb25zdHJ1Y3RvclR5cGUgPSAk YXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JGNvbnN0cnVjdG9yVHlwZSA9fiBzL0NvbnN0cnVjdG9yJC8vOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmICgkY29uc3RydWN0b3JUeXBlIG5lICJET01PYmplY3QiKSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG15ICRoZWFkZXIgPSAiSlMiIC4gJGNvbnN0cnVjdG9y VHlwZSAuICIuaCI7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG15ICRjb25kaXRp b25hbCA9ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNvbmRp dGlvbmFsIn07Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChub3QgJGNvbmRp dGlvbmFsKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkaW1wbEluY2x1 ZGVzeyRoZWFkZXJ9ID0gMTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNp ZiAobm90IGV4aXN0cygkaW1wbEluY2x1ZGVzeyRoZWFkZXJ9KSkgewotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJGltcGxJbmNsdWRlc3skaGVhZGVyfSA9ICRjb25kaXRpb25h bDsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG15ICRvbGRWYWx1ZSA9ICRpbXBsSW5jbHVkZXN7JGhl YWRlcn07Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoJG9sZFZhbHVl IG5lIDEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBteSAlbmV3 VmFsdWUgPSAoKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkbmV3 VmFsdWV7JGNvbmRpdGlvbmFsfSA9IDE7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZm9yZWFjaCBteSAkY29uZGl0aW9uIChzcGxpdCgvXHwvLCAkb2xkVmFsdWUpKSB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICRuZXdWYWx1ZXsk Y29uZGl0aW9ufSA9IDE7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7 JGhlYWRlcn0gPSBqb2luKCJ8Iiwgc29ydCBrZXlzICVuZXdWYWx1ZSk7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoIkpT IiAuICRjb25zdHJ1Y3RvclR5cGUgLiAiLmgiLCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVu ZGVkQXR0cmlidXRlcy0+eyJDb25kaXRpb25hbCJ9KTsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgLy8gU2hhZG93aW5nIGEgYnVpbHQtaW4gY29uc3RydWN0b3JcbiIpOwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGlmICgkaW50ZXJmYWNlTmFtZSBlcSAiRE9NV2luZG93IiAmJiAkY2xh c3NOYW1lIGVxICJKU2JsYWgiKSB7CkBAIC0yNTkzLDYgKzI1OTksNyBAQCBzdWIgSlNWYWx1ZVRv TmF0aXZlCiAgICAgbXkgJHNpZ25hdHVyZSA9IHNoaWZ0OwogICAgIG15ICR2YWx1ZSA9IHNoaWZ0 OwogCisgICAgbXkgJGNvbmRpdGlvbmFsID0gJHNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IkNvbmRpdGlvbmFsIn07CiAgICAgbXkgJHR5cGUgPSAkY29kZUdlbmVyYXRvci0+U3RyaXBN b2R1bGUoJHNpZ25hdHVyZS0+dHlwZSk7CiAKICAgICByZXR1cm4gIiR2YWx1ZS50b0Jvb2xlYW4o ZXhlYykiIGlmICR0eXBlIGVxICJib29sZWFuIjsKQEAgLTI2MTYsMzIgKzI2MjMsMzIgQEAgc3Vi IEpTVmFsdWVUb05hdGl2ZQogICAgIH0KIAogICAgIGlmICgkdHlwZSBlcSAiTm9kZUZpbHRlciIp IHsKLSAgICAgICAgJGltcGxJbmNsdWRlc3siSlMkdHlwZS5oIn0gPSAxOworICAgICAgICBBZGRU b0ltcGxJbmNsdWRlcygiSlMkdHlwZS5oIiwgJGNvbmRpdGlvbmFsKTsKICAgICAgICAgcmV0dXJu ICJ0byR0eXBlKGV4ZWMtPmdsb2JhbERhdGEoKSwgJHZhbHVlKSI7CiAgICAgfQogCiAgICAgaWYg KCR0eXBlIGVxICJNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyIikgewotICAgICAgICAkaW1wbEluY2x1 ZGVzeyJNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyLmgifSA9IDE7CisgICAgICAgIEFkZFRvSW1wbElu Y2x1ZGVzKCJNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyLmgiLCAkY29uZGl0aW9uYWwpOwogICAgICAg ICByZXR1cm4gIk1lZGlhUXVlcnlMaXN0TGlzdGVuZXI6OmNyZWF0ZShTY3JpcHRWYWx1ZShleGVj LT5nbG9iYWxEYXRhKCksICIgLiAkdmFsdWUgLiIpKSI7CiAgICAgfQogCiAgICAgaWYgKCR0eXBl IGVxICJTZXJpYWxpemVkU2NyaXB0VmFsdWUiIG9yICR0eXBlIGVxICJhbnkiKSB7Ci0gICAgICAg ICRpbXBsSW5jbHVkZXN7IlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIn0gPSAxOworICAgICAgICBB ZGRUb0ltcGxJbmNsdWRlcygiU2VyaWFsaXplZFNjcmlwdFZhbHVlLmgiLCAkY29uZGl0aW9uYWwp OwogICAgICAgICByZXR1cm4gIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKGV4ZWMsICR2 YWx1ZSkiOwogICAgIH0KIAogICAgIGlmICgkdHlwZSBlcSAiSURCS2V5IikgewotICAgICAgICAk aW1wbEluY2x1ZGVzeyJJREJCaW5kaW5nVXRpbGl0aWVzLmgifSA9IDE7Ci0gICAgICAgICRpbXBs SW5jbHVkZXN7IklEQktleS5oIn0gPSAxOworICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiSURC QmluZGluZ1V0aWxpdGllcy5oIiwgJGNvbmRpdGlvbmFsKTsKKyAgICAgICAgQWRkVG9JbXBsSW5j bHVkZXMoIklEQktleS5oIiwgJGNvbmRpdGlvbmFsKTsKICAgICAgICAgcmV0dXJuICJjcmVhdGVJ REJLZXlGcm9tVmFsdWUoZXhlYywgJHZhbHVlKSI7CiAgICAgfQogCi0gICAgJGltcGxJbmNsdWRl c3siSFRNTE9wdGlvbkVsZW1lbnQuaCJ9ID0gMSBpZiAkdHlwZSBlcSAiSFRNTE9wdGlvbkVsZW1l bnQiOwotICAgICRpbXBsSW5jbHVkZXN7IkpTQ3VzdG9tVm9pZENhbGxiYWNrLmgifSA9IDEgaWYg JHR5cGUgZXEgIlZvaWRDYWxsYmFjayI7Ci0gICAgJGltcGxJbmNsdWRlc3siRXZlbnQuaCJ9ID0g MSBpZiAkdHlwZSBlcSAiRXZlbnQiOworICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJIVE1MT3B0aW9u RWxlbWVudC5oIiwgJGNvbmRpdGlvbmFsKSBpZiAkdHlwZSBlcSAiSFRNTE9wdGlvbkVsZW1lbnQi OworICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJKU0N1c3RvbVZvaWRDYWxsYmFjay5oIiwgJGNvbmRp dGlvbmFsKSBpZiAkdHlwZSBlcSAiVm9pZENhbGxiYWNrIjsKKyAgICBBZGRUb0ltcGxJbmNsdWRl cygiRXZlbnQuaCIsICRjb25kaXRpb25hbCkgaWYgJHR5cGUgZXEgIkV2ZW50IjsKIAogICAgICMg RGVmYXVsdCwgYXNzdW1lIGF1dG9nZW5lcmF0ZWQgdHlwZSBjb252ZXJzaW9uIHJvdXRpbmVzCi0g ICAgJGltcGxJbmNsdWRlc3siSlMkdHlwZS5oIn0gPSAxOworICAgIEFkZFRvSW1wbEluY2x1ZGVz KCJKUyR0eXBlLmgiLCAkY29uZGl0aW9uYWwpOwogICAgIHJldHVybiAidG8kdHlwZSgkdmFsdWUp IjsKIH0KIApAQCAtMjY1Myw2ICsyNjYwLDcgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAgIG15 ICR2YWx1ZSA9IHNoaWZ0OwogICAgIG15ICR0aGlzVmFsdWUgPSBzaGlmdDsKIAorICAgIG15ICRj b25kaXRpb25hbCA9ICRzaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb25kaXRpb25h bCJ9OwogICAgIG15ICR0eXBlID0gJGNvZGVHZW5lcmF0b3ItPlN0cmlwTW9kdWxlKCRzaWduYXR1 cmUtPnR5cGUpOwogCiAgICAgcmV0dXJuICJqc0Jvb2xlYW4oJHZhbHVlKSIgaWYgJHR5cGUgZXEg ImJvb2xlYW4iOwpAQCAtMjY3Miw3ICsyNjgwLDcgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAg IH0KIAogICAgIGlmICgkY29kZUdlbmVyYXRvci0+SXNTdHJpbmdUeXBlKCR0eXBlKSkgewotICAg ICAgICAkaW1wbEluY2x1ZGVzeyJLVVJMLmgifSA9IDE7CisgICAgICAgIEFkZFRvSW1wbEluY2x1 ZGVzKCJLVVJMLmgiLCAkY29uZGl0aW9uYWwpOwogICAgICAgICBteSAkY29udiA9ICRzaWduYXR1 cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb252ZXJ0TnVsbFN0cmluZ1RvIn07CiAgICAgICAg IGlmIChkZWZpbmVkICRjb252KSB7CiAgICAgICAgICAgICByZXR1cm4gImpzU3RyaW5nT3JOdWxs KGV4ZWMsICR2YWx1ZSkiIGlmICRjb252IGVxICJOdWxsIjsKQEAgLTI2ODMsMzggKzI2OTEsMzgg QEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAgICAgICB9CiAgICAgICAgICRjb252ID0gJHNpZ25h dHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNvbnZlcnRTY3JpcHRTdHJpbmcifTsKICAgICAg ICAgcmV0dXJuICJqc093bmVkU3RyaW5nT3JOdWxsKGV4ZWMsICR2YWx1ZSkiIGlmICRjb252Owot ICAgICAgICAkaW1wbEluY2x1ZGVzeyI8cnVudGltZS9KU1N0cmluZy5oPiJ9ID0gMTsKKyAgICAg ICAgQWRkVG9JbXBsSW5jbHVkZXMoIjxydW50aW1lL0pTU3RyaW5nLmg+IiwgJGNvbmRpdGlvbmFs KTsKICAgICAgICAgcmV0dXJuICJqc1N0cmluZyhleGVjLCAkdmFsdWUpIjsKICAgICB9CiAgICAg CiAgICAgbXkgJGdsb2JhbE9iamVjdCA9ICIkdGhpc1ZhbHVlLT5nbG9iYWxPYmplY3QoKSI7CiAK ICAgICBpZiAoJHR5cGUgZXEgIkNTU1N0eWxlRGVjbGFyYXRpb24iKSB7Ci0gICAgICAgICRpbXBs SW5jbHVkZXN7IkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmgifSA9IDE7CisgICAgICAgIEFk ZFRvSW1wbEluY2x1ZGVzKCJDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5oIiwgJGNvbmRpdGlv bmFsKTsKICAgICB9CiAKICAgICBpZiAoJHR5cGUgZXEgIk5vZGVMaXN0IikgewotICAgICAgICAk aW1wbEluY2x1ZGVzeyJOYW1lTm9kZUxpc3QuaCJ9ID0gMTsKKyAgICAgICAgQWRkVG9JbXBsSW5j bHVkZXMoIk5hbWVOb2RlTGlzdC5oIiwgJGNvbmRpdGlvbmFsKTsKICAgICB9CiAKICAgICBpZiAo JHR5cGUgZXEgIkRPTU9iamVjdCIpIHsKICAgICAgICAgaWYgKCRpbXBsQ2xhc3NOYW1lIGVxICJE b2N1bWVudCIpIHsKLSAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkpTQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmgifSA9IDE7CisgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiSlNDYW52 YXNSZW5kZXJpbmdDb250ZXh0MkQuaCIsICRjb25kaXRpb25hbCk7CiAgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICByZXR1cm4gIigkdmFsdWUuaGFzTm9WYWx1ZSgpID8ganNOdWxsKCkgOiAk dmFsdWUuanNWYWx1ZSgpKSI7CiAgICAgICAgIH0KICAgICB9IGVsc2lmICgkdHlwZSA9fiAvU1ZH UGF0aFNlZy8pIHsKLSAgICAgICAgJGltcGxJbmNsdWRlc3siSlMkdHlwZS5oIn0gPSAxOworICAg ICAgICBBZGRUb0ltcGxJbmNsdWRlcygiSlMkdHlwZS5oIiwgJGNvbmRpdGlvbmFsKTsKICAgICAg ICAgJGpvaW5lZE5hbWUgPSAkdHlwZTsKICAgICAgICAgJGpvaW5lZE5hbWUgPX4gcy9BYnN8UmVs Ly87Ci0gICAgICAgICRpbXBsSW5jbHVkZXN7IiRqb2luZWROYW1lLmgifSA9IDE7CisgICAgICAg IEFkZFRvSW1wbEluY2x1ZGVzKCIkam9pbmVkTmFtZS5oIiwgJGNvbmRpdGlvbmFsKTsKICAgICB9 IGVsc2lmICgkdHlwZSBlcSAiU2VyaWFsaXplZFNjcmlwdFZhbHVlIiBvciAkdHlwZSBlcSAiYW55 IikgewotICAgICAgICAkaW1wbEluY2x1ZGVzeyJTZXJpYWxpemVkU2NyaXB0VmFsdWUuaCJ9ID0g MTsKKyAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIiwg JGNvbmRpdGlvbmFsKTsKICAgICAgICAgcmV0dXJuICIkdmFsdWUgPyAkdmFsdWUtPmRlc2VyaWFs aXplKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpKSA6IGpzTnVsbCgpIjsKICAgICB9 IGVsc2UgewogICAgICAgICAjIERlZmF1bHQsIGluY2x1ZGUgaGVhZGVyIHdpdGggc2FtZSBuYW1l LgotICAgICAgICAkaW1wbEluY2x1ZGVzeyJKUyR0eXBlLmgifSA9IDE7Ci0gICAgICAgICRpbXBs SW5jbHVkZXN7IiR0eXBlLmgifSA9IDEgaWYgbm90ICRjb2RlR2VuZXJhdG9yLT5Bdm9pZEluY2x1 c2lvbk9mVHlwZSgkdHlwZSk7CisgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJKUyR0eXBlLmgi LCAkY29uZGl0aW9uYWwpOworICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiJHR5cGUuaCIsICRj b25kaXRpb25hbCkgaWYgbm90ICRjb2RlR2VuZXJhdG9yLT5Bdm9pZEluY2x1c2lvbk9mVHlwZSgk dHlwZSk7CiAgICAgfQogCiAgICAgcmV0dXJuICR2YWx1ZSBpZiAkY29kZUdlbmVyYXRvci0+SXNT VkdBbmltYXRlZFR5cGUoJHR5cGUpOwpAQCAtMjczNyw3ICsyNzQ1LDcgQEAgc3ViIE5hdGl2ZVRv SlNWYWx1ZQogCiAgICAgICAgICAgICBteSAkc2VsZklzVGVhck9mZlR5cGUgPSAkY29kZUdlbmVy YXRvci0+SXNTVkdUeXBlTmVlZGluZ1RlYXJPZmYoJGltcGxDbGFzc05hbWUpOwogICAgICAgICAg ICAgaWYgKCRzZWxmSXNUZWFyT2ZmVHlwZSkgewotICAgICAgICAgICAgICAgICRpbXBsSW5jbHVk ZXN7IlNWR1N0YXRpY1Byb3BlcnR5V2l0aFBhcmVudFRlYXJPZmYuaCJ9ID0gMTsKKyAgICAgICAg ICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiU1ZHU3RhdGljUHJvcGVydHlXaXRoUGFyZW50VGVh ck9mZi5oIiwgJGNvbmRpdGlvbmFsKTsKICAgICAgICAgICAgICAgICAkdGVhck9mZlR5cGUgPX4g cy9TVkdQcm9wZXJ0eVRlYXJPZmY8L1NWR1N0YXRpY1Byb3BlcnR5V2l0aFBhcmVudFRlYXJPZmY8 JGltcGxDbGFzc05hbWUsIC87CiAKICAgICAgICAgICAgICAgICBpZiAoJHZhbHVlID1+IC9tYXRy aXgvIGFuZCAkaW1wbENsYXNzTmFtZSBlcSAiU1ZHVHJhbnNmb3JtIikgewpAQCAtMjc0OCw3ICsy NzU2LDcgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogCiAgICAgICAgICAgICAgICAgJHZhbHVlID0g IiR7dGVhck9mZlR5cGV9OjpjcmVhdGUoY2FzdGVkVGhpcy0+aW1wbCgpLCAkdmFsdWUsICR1cGRh dGVNZXRob2QpIjsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgJGltcGxJ bmNsdWRlc3siU1ZHU3RhdGljUHJvcGVydHlUZWFyT2ZmLmgifSA9IDE7CisgICAgICAgICAgICAg ICAgQWRkVG9JbXBsSW5jbHVkZXMoIlNWR1N0YXRpY1Byb3BlcnR5VGVhck9mZi5oIiwgJGNvbmRp dGlvbmFsKTsKICAgICAgICAgICAgICAgICAkdGVhck9mZlR5cGUgPX4gcy9TVkdQcm9wZXJ0eVRl YXJPZmY8L1NWR1N0YXRpY1Byb3BlcnR5VGVhck9mZjwkaW1wbENsYXNzTmFtZSwgLzsKICAgICAg ICAgICAgICAgICAkdmFsdWUgPSAiJHt0ZWFyT2ZmVHlwZX06OmNyZWF0ZShpbXAsICR2YWx1ZSwg JHVwZGF0ZU1ldGhvZCkiOwogICAgICAgICAgICAgfQo=