58187 2011-04-09 01:09:18 -0700 Web Inspector: refactor / document call frames in debugger domain. 2011-04-11 04:45:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo ossy pfeldman pmuellr rik timothy webkit-ews yurys oldest_to_newest 382755 0 pfeldman 2011-04-09 01:09:18 -0700 Patch to follow. Note that it regresses visual representation a bit: we are not special casing with(element) and with(document) anymore and do not tell user that it is "Event target" and "Event document". However, strictly speaking, we should not have done it for with(element) not necessarily related to an event. 382758 1 88925 pfeldman 2011-04-09 01:21:40 -0700 Created attachment 88925 Patch 383043 2 88925 yurys 2011-04-10 23:40:40 -0700 Comment on attachment 88925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88925&action=review > Source/WebCore/inspector/InjectedScriptSource.js:-513 > - scopeObjectProxy.isElement = true; We should be able to figure it out on the front-end side and avoid the regression. > Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js:100 > + if (scope.type !== "global") { This way you won't expand global scope when it is the only one. This is a regression. 383070 3 88977 pfeldman 2011-04-11 02:13:11 -0700 Created attachment 88977 Patch 383076 4 webkit-ews 2011-04-11 03:19:16 -0700 Attachment 88977 did not build on qt: Build output: http://queues.webkit.org/results/8376824 383084 5 ossy 2011-04-11 03:52:55 -0700 (In reply to comment #4) > Attachment 88977 [details] did not build on qt: > Build output: http://queues.webkit.org/results/8376824 It was a false positive alarm, sorry for the inconvenience. I fixed the Qt EWS, and tried to build this patch manually, and it works for me. ;) 383101 6 pfeldman 2011-04-11 04:45:26 -0700 Committed r83434: <http://trac.webkit.org/changeset/83434> 88925 2011-04-09 01:21:40 -0700 2011-04-11 02:13:05 -0700 Patch bug-58187-20110409122137.patch text/plain 11038 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODMzNzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YTRkNWYyNjA0ZjgxZTE5 NDMyZjYwYjliNWVmZmE1ZmQ3YzljZGIzLi5hOGYwZDYzNWNmMGE4YTNlZDNlNTUyYjk5NWNjMTM1 ZGQ5MTJjMTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMDkgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgLyBkb2N1 bWVudCBjYWxsIGZyYW1lcyBpbiBkZWJ1Z2dlciBkb21haW4uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODE4NworCisgICAgICAgIE5vdGUgdGhhdCB3 ZSBhcmUgbm90IHNwZWNpYWwgY2FzaW5nIHdpdGgoZWxlbWVudCkgYW5kIHdpdGgoZG9jdW1lbnQp IGFueW1vcmUKKyAgICAgICAgYW5kIGRvIG5vdCB0ZWxsIHVzZXIgdGhhdCBpdCBpcyAiRXZlbnQg dGFyZ2V0IiBhbmQgIkV2ZW50IGRvY3VtZW50Ii4gU3RyaWN0bHkgc3BlYWtpbmcsCisgICAgICAg IHdlIHNob3VsZCBub3QgaGF2ZSBkb25lIGl0IGZvciB3aXRoKGVsZW1lbnQpIG5vdCBuZWNlc3Nh cmlseSBiZWluZyByZWxhdGVkIHRvIGFuIGV2ZW50LgorCisgICAgICAgICogRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlw dFNvdXJjZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NvcGVDaGFpblNpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgor CiAyMDExLTA0LTA4ICBEYXZpZCBIdW1waHJleSAgPGRhdmlkLmh1bXBocmV5QHNlbmVjYWMub24u Y2E+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dl YkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDE1OTM4ZDk3ZDk4 Njc2ZjgxMDkxOGQzZGIwYjg1NDA4NTFmZWM2ZGMuLjMzZWFlODg5Yjc2ZDRlMjFlMTZhZjU5YzZh ZWJmNDc5MTBjMjAzYzkgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNjEKemNtWjI2cEx5 T3E8XyVHZmxsP1hkT3VwZm11ejgqblNNVEgtTipZUWY0OU5AYDNgentLMzw/YWtLJi1eeiUjZz9j Cks2U1pkR1ZnTFkmanUweVYKCmRlbHRhIDc4CnpjbWJPP2s5b3k+PF8lR2Y+QEUhWDQ5Tl9vbFBf azhQT2ZtfG5MTlNGWVZyWGB1RX0kQDNRZiooT3lFXnUyd19OTQpjQ31LIXdOTSRJUW9iNCNkM0Zs OCViVHI/NSU4eyFWMDFLeFcmO1M0YwoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bmplY3RlZFNjcmlwdFNvdXJjZS5qcwppbmRleCA4MjMxZDc4ZmMyNDhkN2E1YThhYjVmMzk0NzFj MWI1ODRhMzU1MWYwLi5jZTQzYTQyNmNhMTk3ODk0ZjkzNjFlMWM5ZWY5MWUwYjU2ZDhjOTRlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2Uu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpz CkBAIC0yOTksNyArMjk5LDYgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAg ICBpZiAoIWNhbGxGcmFtZSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKLSAgICAg ICAgaW5qZWN0ZWRTY3JpcHQucmVsZWFzZU9iamVjdEdyb3VwKCJiYWNrdHJhY2UiKTsKICAgICAg ICAgdmFyIHJlc3VsdCA9IFtdOwogICAgICAgICB2YXIgZGVwdGggPSAwOwogICAgICAgICBkbyB7 CkBAIC00ODcsMzggKzQ4NiwyOCBAQCBJbmplY3RlZFNjcmlwdC5DYWxsRnJhbWVQcm94eS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGNvbnN0IFdJVEhfU0NPUEUgPSAyOwogICAgICAgICBjb25zdCBD TE9TVVJFX1NDT1BFID0gMzsKICAgICAgICAgY29uc3QgQ0FUQ0hfU0NPUEUgPSA0OwotICAgIAor CisgICAgICAgIHZhciBzY29wZVR5cGVOYW1lcyA9IHt9OworICAgICAgICBzY29wZVR5cGVOYW1l c1tHTE9CQUxfU0NPUEVdID0gImdsb2JhbCI7CisgICAgICAgIHNjb3BlVHlwZU5hbWVzW0xPQ0FM X1NDT1BFXSA9ICJsb2NhbCI7CisgICAgICAgIHNjb3BlVHlwZU5hbWVzW1dJVEhfU0NPUEVdID0g IndpdGgiOworICAgICAgICBzY29wZVR5cGVOYW1lc1tDTE9TVVJFX1NDT1BFXSA9ICJjbG9zdXJl IjsKKyAgICAgICAgc2NvcGVUeXBlTmFtZXNbQ0FUQ0hfU0NPUEVdID0gImNhdGNoIjsKKwogICAg ICAgICB2YXIgc2NvcGVDaGFpbiA9IGNhbGxGcmFtZS5zY29wZUNoYWluOwogICAgICAgICB2YXIg c2NvcGVDaGFpblByb3h5ID0gW107CiAgICAgICAgIHZhciBmb3VuZExvY2FsU2NvcGUgPSBmYWxz ZTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY29wZUNoYWluLmxlbmd0aDsgaSsrKSB7 CisgICAgICAgICAgICB2YXIgc2NvcGUgPSB7fTsKKyAgICAgICAgICAgIHNjb3BlLm9iamVjdCA9 IGluamVjdGVkU2NyaXB0Ll93cmFwT2JqZWN0KHNjb3BlQ2hhaW5baV0sICJiYWNrdHJhY2UiKTsK KwogICAgICAgICAgICAgdmFyIHNjb3BlVHlwZSA9IGNhbGxGcmFtZS5zY29wZVR5cGUoaSk7Ci0g ICAgICAgICAgICB2YXIgc2NvcGVPYmplY3QgPSBzY29wZUNoYWluW2ldOwotICAgICAgICAgICAg dmFyIHNjb3BlT2JqZWN0UHJveHkgPSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChzY29wZU9i amVjdCwgImJhY2t0cmFjZSIpOwotCi0gICAgICAgICAgICBzd2l0Y2goc2NvcGVUeXBlKSB7Ci0g ICAgICAgICAgICAgICAgY2FzZSBMT0NBTF9TQ09QRTogewotICAgICAgICAgICAgICAgICAgICBm b3VuZExvY2FsU2NvcGUgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFBy b3h5LmlzTG9jYWwgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFByb3h5 LnRoaXNPYmplY3QgPSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChjYWxsRnJhbWUudGhpc09i amVjdCwgImJhY2t0cmFjZSIpOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgY2FzZSBDTE9TVVJFX1NDT1BFOiB7Ci0gICAgICAg ICAgICAgICAgICAgIHNjb3BlT2JqZWN0UHJveHkuaXNDbG9zdXJlID0gdHJ1ZTsKLSAgICAgICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGNh c2UgV0lUSF9TQ09QRToKLSAgICAgICAgICAgICAgICBjYXNlIENBVENIX1NDT1BFOiB7Ci0gICAg ICAgICAgICAgICAgICAgIGlmIChmb3VuZExvY2FsU2NvcGUgJiYgc2NvcGVPYmplY3QgaW5zdGFu Y2VvZiBpbnNwZWN0ZWRXaW5kb3cuRWxlbWVudCkKLSAgICAgICAgICAgICAgICAgICAgICAgIHNj b3BlT2JqZWN0UHJveHkuaXNFbGVtZW50ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgZWxz ZSBpZiAoZm91bmRMb2NhbFNjb3BlICYmIHNjb3BlT2JqZWN0IGluc3RhbmNlb2YgaW5zcGVjdGVk V2luZG93LkRvY3VtZW50KQotICAgICAgICAgICAgICAgICAgICAgICAgc2NvcGVPYmplY3RQcm94 eS5pc0RvY3VtZW50ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAg ICAgICAgICAgICAgICAgc2NvcGVPYmplY3RQcm94eS5pc1dpdGhCbG9jayA9IHRydWU7Ci0gICAg ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIHNjb3BlQ2hhaW5Qcm94eS5wdXNoKHNjb3BlT2JqZWN0UHJveHkpOworICAg ICAgICAgICAgc2NvcGUudHlwZSA9IHNjb3BlVHlwZU5hbWVzW3Njb3BlVHlwZV07CisKKyAgICAg ICAgICAgIGlmIChzY29wZVR5cGUgPT09IExPQ0FMX1NDT1BFKQorICAgICAgICAgICAgICAgIHNj b3BlLnRoaXMgPSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChjYWxsRnJhbWUudGhpc09iamVj dCwgImJhY2t0cmFjZSIpOworCisgICAgICAgICAgICBzY29wZUNoYWluUHJveHkucHVzaChzY29w ZSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHNjb3BlQ2hhaW5Qcm94eTsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggZjJlNjliMGIzOTFhY2Vl OWY1ZjMyYzRiYWZjZGY1ZTRmZWY0NmQyOS4uY2Q5MWI2ZDgyZGQwN2EzOTRiZDhmNzRjODY2ZmU2 ZGFjZDE5ZWFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAt MTI0MCwxMCArMTI0MCwyMCBAQAogICAgICAgICAgICAgICAgICJpZCI6ICJDYWxsRnJhbWUiLAog ICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgInByb3Bl cnRpZXMiOiB7Ci0gICAgICAgICAgICAgICAgICAgICJpZCI6IHsgInR5cGUiOiAic3RyaW5nIiwg ICJkZXNjcmlwdGlvbiI6ICJDYWxsIGZyYW1lIGlkZW50aWZpZXIiIH0sCisgICAgICAgICAgICAg ICAgICAgICJpZCI6IHsgInR5cGUiOiAic3RyaW5nIiwgICJkZXNjcmlwdGlvbiI6ICJDYWxsIGZy YW1lIGlkZW50aWZpZXIuIiB9LAogICAgICAgICAgICAgICAgICAgICAiZnVuY3Rpb25OYW1lIjog eyAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTmFtZSBvZiB0aGUgZnVuY3Rpb24g Y2FsbGVkIG9uIHRoaXMgZnJhbWUuIiB9LAogICAgICAgICAgICAgICAgICAgICAibG9jYXRpb24i OiB7ICIkcmVmIjogIkxvY2F0aW9uIiwgImRlc2NyaXB0aW9uIjogIkxvY2F0aW9uIGluIHRoZSBz b3VyY2UgY29kZS4iIH0sCi0gICAgICAgICAgICAgICAgICAgICJzY29wZUNoYWluIjogeyAidHlw ZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAib2JqZWN0IiB9LCAiZGVzY3JpcHRpb24i OiAiU2NvcGUgY2hhaW4gZm9yIGdpdmVuIGNhbGwgZnJhbWUuIC8vIEZJWE1FIiB9CisgICAgICAg ICAgICAgICAgICAgICJzY29wZUNoYWluIjogeyAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsg IiRyZWYiOiAiU2NvcGUiIH0sICJkZXNjcmlwdGlvbiI6ICJTY29wZSBjaGFpbiBmb3IgZ2l2ZW4g Y2FsbCBmcmFtZS4iIH0KKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJEZWJ1Z2dlciBjYWxsIGZyYW1lLiBBcnJheSBvZiBjYWxsIGZyYW1lcyBmb3Jt IGNhbGwgc3RhY2suIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAiaWQiOiAiU2NvcGUiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCisg ICAgICAgICAgICAgICAgInByb3BlcnRpZXMiOiB7CisgICAgICAgICAgICAgICAgICAgICJ0eXBl IjogeyAidHlwZSI6ICJzdHJpbmciLCAgImVudW0iOiBbImdsb2JhbCIsICJsb2NhbCIsICJ3aXRo IiwgImNsb3N1cmUiLCAiY2F0Y2giXSwgImRlc2NyaXB0aW9uIjogIlNjb3BlIHR5cGUuIiB9LAor ICAgICAgICAgICAgICAgICAgICAib2JqZWN0IjogeyAiJHJlZiI6ICJSZW1vdGVPYmplY3QiLCAi ZGVzY3JpcHRpb24iOiAiT2JqZWN0IHJlcHJlc2VudGluZyB0aGUgc2NvcGUuIiB9LAorICAgICAg ICAgICAgICAgICAgICAidGhpcyI6IHsgIiRyZWYiOiAiUmVtb3RlT2JqZWN0IiwgIm9wdGlvbmFs IjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIjxjb2RlPnRoaXM8L2NvZGU+IG9iamVjdCBmb3IgbG9j YWwgc2NvcGUuIiB9LAogICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgImRlc2Ny aXB0aW9uIjogIkRlYnVnZ2VyIGNhbGwgZnJhbWUuIEFycmF5IG9mIGNhbGwgZnJhbWVzIGZvcm0g Y2FsbCBzdGFjay4iCiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggNWEzYWIyNzNlOWMxODE0ODU2 MmIwN2FhZDA2MGRjOTYxZmVlNTY4NS4uYzgyODNhMTUyNDliZTg2MTZkMWNjOGExOTBmYWE5NzY3 NDc0MDcyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRl YnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE ZWJ1Z2dlckFnZW50LmNwcApAQCAtMzE0LDYgKzMxNCw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdn ZXJBZ2VudDo6cGF1c2UoRXJyb3JTdHJpbmcqKQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OnJlc3VtZShFcnJvclN0cmluZyopCiB7CisgICAgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXIt PnJlbGVhc2VPYmplY3RHcm91cCgiYmFja3RyYWNlIik7CiAgICAgc2NyaXB0RGVidWdTZXJ2ZXIo KS5jb250aW51ZVByb2dyYW0oKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njb3BlQ2hhaW5TaWRlYmFyUGFuZS5qcwppbmRleCBiZGJi MGNmNWJhMjQ2N2JhNDJlOTJmNDc3MmMxNDg4MzE4MmYwNDhkLi44YTRkNWUxZmU1MmM2YzZhOGFk OTkwMzhlMmVkOTA1MmQ1YzcxMDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Njb3BlQ2hhaW5TaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njb3BlQ2hhaW5TaWRlYmFyUGFuZS5qcwpAQCAtNTksNDEg KzU5LDQ4IEBAIFdlYkluc3BlY3Rvci5TY29wZUNoYWluU2lkZWJhclBhbmUucHJvdG90eXBlID0g ewogICAgICAgICB2YXIgZm91bmRMb2NhbFNjb3BlID0gZmFsc2U7CiAgICAgICAgIHZhciBzY29w ZUNoYWluID0gY2FsbEZyYW1lLnNjb3BlQ2hhaW47CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgc2NvcGVDaGFpbi5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIHNjb3BlT2JqZWN0 UHJveHkgPSBzY29wZUNoYWluW2ldOworICAgICAgICAgICAgdmFyIHNjb3BlID0gc2NvcGVDaGFp bltpXTsKICAgICAgICAgICAgIHZhciB0aXRsZSA9IG51bGw7Ci0gICAgICAgICAgICB2YXIgc3Vi dGl0bGUgPSBzY29wZU9iamVjdFByb3h5LmRlc2NyaXB0aW9uOworICAgICAgICAgICAgdmFyIHN1 YnRpdGxlID0gc2NvcGUub2JqZWN0LmRlc2NyaXB0aW9uOwogICAgICAgICAgICAgdmFyIGVtcHR5 UGxhY2Vob2xkZXIgPSBudWxsOwogICAgICAgICAgICAgdmFyIGV4dHJhUHJvcGVydGllcyA9IG51 bGw7CiAKLSAgICAgICAgICAgIGlmIChzY29wZU9iamVjdFByb3h5LmlzTG9jYWwpIHsKLSAgICAg ICAgICAgICAgICBmb3VuZExvY2FsU2NvcGUgPSB0cnVlOwotICAgICAgICAgICAgICAgIHRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhbCIpOwotICAgICAgICAgICAgICAgIGVtcHR5 UGxhY2Vob2xkZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vIFZhcmlhYmxlcyIpOwotICAg ICAgICAgICAgICAgIHN1YnRpdGxlID0gbnVsbDsKLSAgICAgICAgICAgICAgICBpZiAoc2NvcGVP YmplY3RQcm94eS50aGlzT2JqZWN0KQotICAgICAgICAgICAgICAgICAgICBleHRyYVByb3BlcnRp ZXMgPSBbIG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHkoInRoaXMiLCBXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHNjb3BlT2JqZWN0UHJveHkudGhpc09i amVjdCkpIF07Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKHNjb3BlT2JqZWN0UHJveHkuaXNDbG9z dXJlKSB7Ci0gICAgICAgICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNs b3N1cmUiKTsKLSAgICAgICAgICAgICAgICBlbXB0eVBsYWNlaG9sZGVyID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJObyBWYXJpYWJsZXMiKTsKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZSA9IG51 bGw7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGkgPT09IChzY29wZUNoYWluLmxlbmd0aCAtIDEp KQotICAgICAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbG9iYWwi KTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHNjb3BlT2JqZWN0UHJveHkuaXNFbGVtZW50KQotICAg ICAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFdmVudCBUYXJnZXQi KTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHNjb3BlT2JqZWN0UHJveHkuaXNEb2N1bWVudCkKLSAg ICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXZlbnQgRG9jdW1l bnQiKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHNjb3BlT2JqZWN0UHJveHkuaXNXaXRoQmxvY2sp Ci0gICAgICAgICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldpdGggQmxv Y2siKTsKKyAgICAgICAgICAgIHN3aXRjaCAoc2NvcGUudHlwZSkgeworICAgICAgICAgICAgICAg IGNhc2UgImxvY2FsIjoKKyAgICAgICAgICAgICAgICAgICAgZm91bmRMb2NhbFNjb3BlID0gdHJ1 ZTsKKyAgICAgICAgICAgICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxv Y2FsIik7CisgICAgICAgICAgICAgICAgICAgIGVtcHR5UGxhY2Vob2xkZXIgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIk5vIFZhcmlhYmxlcyIpOworICAgICAgICAgICAgICAgICAgICBzdWJ0aXRs ZSA9IG51bGw7CisgICAgICAgICAgICAgICAgICAgIGlmIChzY29wZS50aGlzKQorICAgICAgICAg ICAgICAgICAgICAgICAgZXh0cmFQcm9wZXJ0aWVzID0gWyBuZXcgV2ViSW5zcGVjdG9yLlJlbW90 ZU9iamVjdFByb3BlcnR5KCJ0aGlzIiwgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5 bG9hZChzY29wZS50aGlzKSkgXTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICAgICAgY2FzZSAiY2xvc3VyZSI6CisgICAgICAgICAgICAgICAgICAgIHRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDbG9zdXJlIik7CisgICAgICAgICAgICAgICAgICAgIGVtcHR5 UGxhY2Vob2xkZXIgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vIFZhcmlhYmxlcyIpOworICAg ICAgICAgICAgICAgICAgICBzdWJ0aXRsZSA9IG51bGw7CisgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgICAgIGNhc2UgImNhdGNoIjoKKyAgICAgICAgICAgICAgICAgICAg dGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhdGNoIik7CisgICAgICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgIndpdGgiOgorICAgICAgICAgICAgICAg ICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiV2l0aCBCbG9jayIpOworICAgICAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBjYXNlICJnbG9iYWwiOgorICAg ICAgICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiR2xvYmFsIik7 CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICBpZiAoIXRpdGxlIHx8IHRpdGxlID09PSBzdWJ0aXRsZSkKICAgICAgICAgICAgICAgICBzdWJ0 aXRsZSA9IG51bGw7CiAKLSAgICAgICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbihXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21Q YXlsb2FkKHNjb3BlT2JqZWN0UHJveHkpLCB0aXRsZSwgc3VidGl0bGUsIGVtcHR5UGxhY2Vob2xk ZXIsIHRydWUsIGV4dHJhUHJvcGVydGllcywgV2ViSW5zcGVjdG9yLlNjb3BlVmFyaWFibGVUcmVl RWxlbWVudCk7CisgICAgICAgICAgICB2YXIgc2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2Jq ZWN0UHJvcGVydGllc1NlY3Rpb24oV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9h ZChzY29wZS5vYmplY3QpLCB0aXRsZSwgc3VidGl0bGUsIGVtcHR5UGxhY2Vob2xkZXIsIHRydWUs IGV4dHJhUHJvcGVydGllcywgV2ViSW5zcGVjdG9yLlNjb3BlVmFyaWFibGVUcmVlRWxlbWVudCk7 CiAgICAgICAgICAgICBzZWN0aW9uLmVkaXRJblNlbGVjdGVkQ2FsbEZyYW1lV2hlblBhdXNlZCA9 IHRydWU7CiAgICAgICAgICAgICBzZWN0aW9uLnBhbmUgPSB0aGlzOwogCi0gICAgICAgICAgICBp ZiAoIWZvdW5kTG9jYWxTY29wZSB8fCBzY29wZU9iamVjdFByb3h5LmlzTG9jYWwgfHwgdGl0bGUg aW4gdGhpcy5fZXhwYW5kZWRTZWN0aW9ucykKLSAgICAgICAgICAgICAgICBzZWN0aW9uLmV4cGFu ZGVkID0gdHJ1ZTsKKyAgICAgICAgICAgIGlmIChzY29wZS50eXBlICE9PSAiZ2xvYmFsIikgewor ICAgICAgICAgICAgICAgIGlmICghZm91bmRMb2NhbFNjb3BlIHx8IHNjb3BlLnR5cGUgPT09ICJs b2NhbCIgfHwgdGl0bGUgaW4gdGhpcy5fZXhwYW5kZWRTZWN0aW9ucykKKyAgICAgICAgICAgICAg ICAgICAgc2VjdGlvbi5leHBhbmRlZCA9IHRydWU7CisgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIHRoaXMuX3NlY3Rpb25zLnB1c2goc2VjdGlvbik7CiAgICAgICAgICAgICB0aGlzLmJvZHlF bGVtZW50LmFwcGVuZENoaWxkKHNlY3Rpb24uZWxlbWVudCk7Cg== 88977 2011-04-11 02:13:11 -0700 2011-04-11 04:24:03 -0700 Patch bug-58187-20110411131309.patch text/plain 10858 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODM0MzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMmZjYTVjYzQ3NWQ0NGRi ZWM1ZmZlZGFkZWY0NmJiMDEzMDIyOTE4Li43NWIxZTVjOWU3ZTNiMDkwMWM3ZDZiYmYwYTQ2ZGNk ZTA3MDhhMjBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMTEgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVmYWN0b3IgLyBkb2N1 bWVudCBjYWxsIGZyYW1lcyBpbiBkZWJ1Z2dlciBkb21haW4uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODE4NworCisgICAgICAgIE5vdGUgdGhhdCB3 ZSBhcmUgbm90IHNwZWNpYWwgY2FzaW5nIHdpdGgoZWxlbWVudCkgYW5kIHdpdGgoZG9jdW1lbnQp IGFueW1vcmUKKyAgICAgICAgYW5kIGRvIG5vdCB0ZWxsIHVzZXIgdGhhdCBpdCBpcyAiRXZlbnQg dGFyZ2V0IiBhbmQgIkV2ZW50IGRvY3VtZW50Ii4gU3RyaWN0bHkgc3BlYWtpbmcsCisgICAgICAg IHdlIHNob3VsZCBub3QgaGF2ZSBkb25lIGl0IGZvciB3aXRoKGVsZW1lbnQpIG5vdCBuZWNlc3Nh cmlseSBiZWluZyByZWxhdGVkIHRvIGFuIGV2ZW50LgorCisgICAgICAgICogRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlw dFNvdXJjZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NvcGVDaGFpblNpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgor CiAyMDExLTA0LTEwICBDaGFuZ1Nlb2sgT2ggIDxzaGl2YW1pZG93QGdtYWlsLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xp c2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAxNTkzOGQ5N2Q5ODY3NmY4MTA5MThk M2RiMGI4NTQwODUxZmVjNmRjLi4zM2VhZTg4OWI3NmQ0ZTIxZTE2YWY1OWM2YWViZjQ3OTEwYzIw M2M5IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDYxCnpjbVoyNnBMeU9xPF8lR2ZsbD9Y ZE91cGZtdXo4Km5TTVRILU4qWVFmNDlOQGAzYHp7SzM8P2FrSyYtXnolI2c/YwpLNlNaZEdWZ0xZ Jmp1MHlWCgpkZWx0YSA3OAp6Y21iTz9rOW95PjxfJUdmPkBFIVg0OU5fb2xQX2s4UE9mbXxuTE5T RllWclhgdUV9JEAzUWYqKE95RV51MndfTk0KY0N9SyF3Tk0kSVFvYjQjZDNGbDglYlRyPzUlOHsh VjAxS3hXJjtTNGMKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRTb3VyY2UuanMKaW5kZXggODIzMWQ3OGZjMjQ4ZDdhNWE4YWI1ZjM5NDcxYzFiNTg0YTM1NTFm MC4uY2U0M2E0MjZjYTE5Nzg5NGY5MzYxZTFjOWVmOTFlMGI1NmQ4Yzk0ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtMjk5LDcg KzI5OSw2IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFjYWxs RnJhbWUpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgICAgIGluamVjdGVk U2NyaXB0LnJlbGVhc2VPYmplY3RHcm91cCgiYmFja3RyYWNlIik7CiAgICAgICAgIHZhciByZXN1 bHQgPSBbXTsKICAgICAgICAgdmFyIGRlcHRoID0gMDsKICAgICAgICAgZG8gewpAQCAtNDg3LDM4 ICs0ODYsMjggQEAgSW5qZWN0ZWRTY3JpcHQuQ2FsbEZyYW1lUHJveHkucHJvdG90eXBlID0gewog ICAgICAgICBjb25zdCBXSVRIX1NDT1BFID0gMjsKICAgICAgICAgY29uc3QgQ0xPU1VSRV9TQ09Q RSA9IDM7CiAgICAgICAgIGNvbnN0IENBVENIX1NDT1BFID0gNDsKLSAgICAKKworICAgICAgICB2 YXIgc2NvcGVUeXBlTmFtZXMgPSB7fTsKKyAgICAgICAgc2NvcGVUeXBlTmFtZXNbR0xPQkFMX1ND T1BFXSA9ICJnbG9iYWwiOworICAgICAgICBzY29wZVR5cGVOYW1lc1tMT0NBTF9TQ09QRV0gPSAi bG9jYWwiOworICAgICAgICBzY29wZVR5cGVOYW1lc1tXSVRIX1NDT1BFXSA9ICJ3aXRoIjsKKyAg ICAgICAgc2NvcGVUeXBlTmFtZXNbQ0xPU1VSRV9TQ09QRV0gPSAiY2xvc3VyZSI7CisgICAgICAg IHNjb3BlVHlwZU5hbWVzW0NBVENIX1NDT1BFXSA9ICJjYXRjaCI7CisKICAgICAgICAgdmFyIHNj b3BlQ2hhaW4gPSBjYWxsRnJhbWUuc2NvcGVDaGFpbjsKICAgICAgICAgdmFyIHNjb3BlQ2hhaW5Q cm94eSA9IFtdOwogICAgICAgICB2YXIgZm91bmRMb2NhbFNjb3BlID0gZmFsc2U7CiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgc2NvcGVDaGFpbi5sZW5ndGg7IGkrKykgeworICAgICAgICAg ICAgdmFyIHNjb3BlID0ge307CisgICAgICAgICAgICBzY29wZS5vYmplY3QgPSBpbmplY3RlZFNj cmlwdC5fd3JhcE9iamVjdChzY29wZUNoYWluW2ldLCAiYmFja3RyYWNlIik7CisKICAgICAgICAg ICAgIHZhciBzY29wZVR5cGUgPSBjYWxsRnJhbWUuc2NvcGVUeXBlKGkpOwotICAgICAgICAgICAg dmFyIHNjb3BlT2JqZWN0ID0gc2NvcGVDaGFpbltpXTsKLSAgICAgICAgICAgIHZhciBzY29wZU9i amVjdFByb3h5ID0gaW5qZWN0ZWRTY3JpcHQuX3dyYXBPYmplY3Qoc2NvcGVPYmplY3QsICJiYWNr dHJhY2UiKTsKLQotICAgICAgICAgICAgc3dpdGNoKHNjb3BlVHlwZSkgewotICAgICAgICAgICAg ICAgIGNhc2UgTE9DQUxfU0NPUEU6IHsKLSAgICAgICAgICAgICAgICAgICAgZm91bmRMb2NhbFNj b3BlID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgc2NvcGVPYmplY3RQcm94eS5pc0xvY2Fs ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgc2NvcGVPYmplY3RQcm94eS50aGlzT2JqZWN0 ID0gaW5qZWN0ZWRTY3JpcHQuX3dyYXBPYmplY3QoY2FsbEZyYW1lLnRoaXNPYmplY3QsICJiYWNr dHJhY2UiKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIGNhc2UgQ0xPU1VSRV9TQ09QRTogewotICAgICAgICAgICAgICAgICAg ICBzY29wZU9iamVjdFByb3h5LmlzQ2xvc3VyZSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBjYXNlIFdJVEhfU0NP UEU6Ci0gICAgICAgICAgICAgICAgY2FzZSBDQVRDSF9TQ09QRTogewotICAgICAgICAgICAgICAg ICAgICBpZiAoZm91bmRMb2NhbFNjb3BlICYmIHNjb3BlT2JqZWN0IGluc3RhbmNlb2YgaW5zcGVj dGVkV2luZG93LkVsZW1lbnQpCi0gICAgICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFBy b3h5LmlzRWxlbWVudCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKGZvdW5k TG9jYWxTY29wZSAmJiBzY29wZU9iamVjdCBpbnN0YW5jZW9mIGluc3BlY3RlZFdpbmRvdy5Eb2N1 bWVudCkKLSAgICAgICAgICAgICAgICAgICAgICAgIHNjb3BlT2JqZWN0UHJveHkuaXNEb2N1bWVu dCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAg ICAgIHNjb3BlT2JqZWN0UHJveHkuaXNXaXRoQmxvY2sgPSB0cnVlOwotICAgICAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAg ICBzY29wZUNoYWluUHJveHkucHVzaChzY29wZU9iamVjdFByb3h5KTsKKyAgICAgICAgICAgIHNj b3BlLnR5cGUgPSBzY29wZVR5cGVOYW1lc1tzY29wZVR5cGVdOworCisgICAgICAgICAgICBpZiAo c2NvcGVUeXBlID09PSBMT0NBTF9TQ09QRSkKKyAgICAgICAgICAgICAgICBzY29wZS50aGlzID0g aW5qZWN0ZWRTY3JpcHQuX3dyYXBPYmplY3QoY2FsbEZyYW1lLnRoaXNPYmplY3QsICJiYWNrdHJh Y2UiKTsKKworICAgICAgICAgICAgc2NvcGVDaGFpblByb3h5LnB1c2goc2NvcGUpOwogICAgICAg ICB9CiAgICAgICAgIHJldHVybiBzY29wZUNoYWluUHJveHk7CiAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IGYyZTY5YjBiMzkxYWNlZTlmNWYzMmM0YmFm Y2RmNWU0ZmVmNDZkMjkuLmNkOTFiNmQ4MmRkMDdhMzk0YmQ4Zjc0Yzg2NmZlNmRhY2QxOWVhYjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTEyNDAsMTAgKzEy NDAsMjAgQEAKICAgICAgICAgICAgICAgICAiaWQiOiAiQ2FsbEZyYW1lIiwKICAgICAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogewot ICAgICAgICAgICAgICAgICAgICAiaWQiOiB7ICJ0eXBlIjogInN0cmluZyIsICAiZGVzY3JpcHRp b24iOiAiQ2FsbCBmcmFtZSBpZGVudGlmaWVyIiB9LAorICAgICAgICAgICAgICAgICAgICAiaWQi OiB7ICJ0eXBlIjogInN0cmluZyIsICAiZGVzY3JpcHRpb24iOiAiQ2FsbCBmcmFtZSBpZGVudGlm aWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgImZ1bmN0aW9uTmFtZSI6IHsgInR5cGUiOiAi c3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIk5hbWUgb2YgdGhlIGZ1bmN0aW9uIGNhbGxlZCBvbiB0 aGlzIGZyYW1lLiIgfSwKICAgICAgICAgICAgICAgICAgICAgImxvY2F0aW9uIjogeyAiJHJlZiI6 ICJMb2NhdGlvbiIsICJkZXNjcmlwdGlvbiI6ICJMb2NhdGlvbiBpbiB0aGUgc291cmNlIGNvZGUu IiB9LAotICAgICAgICAgICAgICAgICAgICAic2NvcGVDaGFpbiI6IHsgInR5cGUiOiAiYXJyYXki LCAiaXRlbXMiOiB7ICJ0eXBlIjogIm9iamVjdCIgfSwgImRlc2NyaXB0aW9uIjogIlNjb3BlIGNo YWluIGZvciBnaXZlbiBjYWxsIGZyYW1lLiAvLyBGSVhNRSIgfQorICAgICAgICAgICAgICAgICAg ICAic2NvcGVDaGFpbiI6IHsgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIlNj b3BlIiB9LCAiZGVzY3JpcHRpb24iOiAiU2NvcGUgY2hhaW4gZm9yIGdpdmVuIGNhbGwgZnJhbWUu IiB9CisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAi RGVidWdnZXIgY2FsbCBmcmFtZS4gQXJyYXkgb2YgY2FsbCBmcmFtZXMgZm9ybSBjYWxsIHN0YWNr LiIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgImlkIjog IlNjb3BlIiwKKyAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAg ICAgICJwcm9wZXJ0aWVzIjogeworICAgICAgICAgICAgICAgICAgICAidHlwZSI6IHsgInR5cGUi OiAic3RyaW5nIiwgICJlbnVtIjogWyJnbG9iYWwiLCAibG9jYWwiLCAid2l0aCIsICJjbG9zdXJl IiwgImNhdGNoIl0sICJkZXNjcmlwdGlvbiI6ICJTY29wZSB0eXBlLiIgfSwKKyAgICAgICAgICAg ICAgICAgICAgIm9iamVjdCI6IHsgIiRyZWYiOiAiUmVtb3RlT2JqZWN0IiwgImRlc2NyaXB0aW9u IjogIk9iamVjdCByZXByZXNlbnRpbmcgdGhlIHNjb3BlLiIgfSwKKyAgICAgICAgICAgICAgICAg ICAgInRoaXMiOiB7ICIkcmVmIjogIlJlbW90ZU9iamVjdCIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICI8Y29kZT50aGlzPC9jb2RlPiBvYmplY3QgZm9yIGxvY2FsIHNjb3BlLiIg fSwKICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJE ZWJ1Z2dlciBjYWxsIGZyYW1lLiBBcnJheSBvZiBjYWxsIGZyYW1lcyBmb3JtIGNhbGwgc3RhY2su IgogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IDVhM2FiMjczZTljMTgxNDg1NjJiMDdhYWQwNjBk Yzk2MWZlZTU2ODUuLmM4MjgzYTE1MjQ5YmU4NjE2ZDFjYzhhMTkwZmFhOTc2NzQ3NDA3MmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5jcHAKQEAgLTMxNCw2ICszMTQsNyBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnBh dXNlKEVycm9yU3RyaW5nKikKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXN1bWUo RXJyb3JTdHJpbmcqKQogeworICAgIG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5yZWxlYXNlT2Jq ZWN0R3JvdXAoImJhY2t0cmFjZSIpOwogICAgIHNjcmlwdERlYnVnU2VydmVyKCkuY29udGludWVQ cm9ncmFtKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NvcGVDaGFpblNpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanMKaW5kZXggYmRiYjBjZjViYTI0Njdi YTQyZTkyZjQ3NzJjMTQ4ODMxODJmMDQ4ZC4uYjdmMGRhZDU3M2RmYzAxMDVkYzdhY2UxMTE1MDdl YzczNzI4M2I3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY29wZUNoYWluU2lkZWJhclBhbmUuanMKQEAgLTU5LDQwICs1OSw0NSBAQCBX ZWJJbnNwZWN0b3IuU2NvcGVDaGFpblNpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIGZvdW5kTG9jYWxTY29wZSA9IGZhbHNlOwogICAgICAgICB2YXIgc2NvcGVDaGFpbiA9IGNh bGxGcmFtZS5zY29wZUNoYWluOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNjb3BlQ2hh aW4ubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBzY29wZU9iamVjdFByb3h5ID0gc2Nv cGVDaGFpbltpXTsKKyAgICAgICAgICAgIHZhciBzY29wZSA9IHNjb3BlQ2hhaW5baV07CiAgICAg ICAgICAgICB2YXIgdGl0bGUgPSBudWxsOwotICAgICAgICAgICAgdmFyIHN1YnRpdGxlID0gc2Nv cGVPYmplY3RQcm94eS5kZXNjcmlwdGlvbjsKKyAgICAgICAgICAgIHZhciBzdWJ0aXRsZSA9IHNj b3BlLm9iamVjdC5kZXNjcmlwdGlvbjsKICAgICAgICAgICAgIHZhciBlbXB0eVBsYWNlaG9sZGVy ID0gbnVsbDsKICAgICAgICAgICAgIHZhciBleHRyYVByb3BlcnRpZXMgPSBudWxsOwogCi0gICAg ICAgICAgICBpZiAoc2NvcGVPYmplY3RQcm94eS5pc0xvY2FsKSB7Ci0gICAgICAgICAgICAgICAg Zm91bmRMb2NhbFNjb3BlID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiTG9jYWwiKTsKLSAgICAgICAgICAgICAgICBlbXB0eVBsYWNlaG9sZGVy ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJObyBWYXJpYWJsZXMiKTsKLSAgICAgICAgICAgICAg ICBzdWJ0aXRsZSA9IG51bGw7Ci0gICAgICAgICAgICAgICAgaWYgKHNjb3BlT2JqZWN0UHJveHku dGhpc09iamVjdCkKLSAgICAgICAgICAgICAgICAgICAgZXh0cmFQcm9wZXJ0aWVzID0gWyBuZXcg V2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdFByb3BlcnR5KCJ0aGlzIiwgV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5mcm9tUGF5bG9hZChzY29wZU9iamVjdFByb3h5LnRoaXNPYmplY3QpKSBdOwot ICAgICAgICAgICAgfSBlbHNlIGlmIChzY29wZU9iamVjdFByb3h5LmlzQ2xvc3VyZSkgewotICAg ICAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbG9zdXJlIik7Ci0g ICAgICAgICAgICAgICAgZW1wdHlQbGFjZWhvbGRlciA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi Tm8gVmFyaWFibGVzIik7Ci0gICAgICAgICAgICAgICAgc3VidGl0bGUgPSBudWxsOwotICAgICAg ICAgICAgfSBlbHNlIGlmIChpID09PSAoc2NvcGVDaGFpbi5sZW5ndGggLSAxKSkKLSAgICAgICAg ICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiR2xvYmFsIik7Ci0gICAgICAg ICAgICBlbHNlIGlmIChzY29wZU9iamVjdFByb3h5LmlzRWxlbWVudCkKLSAgICAgICAgICAgICAg ICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXZlbnQgVGFyZ2V0Iik7Ci0gICAgICAg ICAgICBlbHNlIGlmIChzY29wZU9iamVjdFByb3h5LmlzRG9jdW1lbnQpCi0gICAgICAgICAgICAg ICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV2ZW50IERvY3VtZW50Iik7Ci0gICAg ICAgICAgICBlbHNlIGlmIChzY29wZU9iamVjdFByb3h5LmlzV2l0aEJsb2NrKQotICAgICAgICAg ICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJXaXRoIEJsb2NrIik7CisgICAg ICAgICAgICBzd2l0Y2ggKHNjb3BlLnR5cGUpIHsKKyAgICAgICAgICAgICAgICBjYXNlICJsb2Nh bCI6CisgICAgICAgICAgICAgICAgICAgIGZvdW5kTG9jYWxTY29wZSA9IHRydWU7CisgICAgICAg ICAgICAgICAgICAgIHRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhbCIpOworICAg ICAgICAgICAgICAgICAgICBlbXB0eVBsYWNlaG9sZGVyID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJObyBWYXJpYWJsZXMiKTsKKyAgICAgICAgICAgICAgICAgICAgc3VidGl0bGUgPSBudWxsOwor ICAgICAgICAgICAgICAgICAgICBpZiAoc2NvcGUudGhpcykKKyAgICAgICAgICAgICAgICAgICAg ICAgIGV4dHJhUHJvcGVydGllcyA9IFsgbmV3IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3RQcm9w ZXJ0eSgidGhpcyIsIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQoc2NvcGUu dGhpcykpIF07CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNh c2UgImNsb3N1cmUiOgorICAgICAgICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiQ2xvc3VyZSIpOworICAgICAgICAgICAgICAgICAgICBlbXB0eVBsYWNlaG9sZGVy ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJObyBWYXJpYWJsZXMiKTsKKyAgICAgICAgICAgICAg ICAgICAgc3VidGl0bGUgPSBudWxsOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgICAgICBjYXNlICJjYXRjaCI6CisgICAgICAgICAgICAgICAgICAgIHRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDYXRjaCIpOworICAgICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgICAgICBjYXNlICJ3aXRoIjoKKyAgICAgICAgICAgICAgICAgICAgdGl0bGUg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIldpdGggQmxvY2siKTsKKyAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSAiZ2xvYmFsIjoKKyAgICAgICAgICAgICAg ICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdsb2JhbCIpOworICAgICAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCF0aXRs ZSB8fCB0aXRsZSA9PT0gc3VidGl0bGUpCiAgICAgICAgICAgICAgICAgc3VidGl0bGUgPSBudWxs OwogCi0gICAgICAgICAgICB2YXIgc2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJv cGVydGllc1NlY3Rpb24oV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChzY29w ZU9iamVjdFByb3h5KSwgdGl0bGUsIHN1YnRpdGxlLCBlbXB0eVBsYWNlaG9sZGVyLCB0cnVlLCBl eHRyYVByb3BlcnRpZXMsIFdlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxlVHJlZUVsZW1lbnQpOwor ICAgICAgICAgICAgdmFyIHNlY3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRp ZXNTZWN0aW9uKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQoc2NvcGUub2Jq ZWN0KSwgdGl0bGUsIHN1YnRpdGxlLCBlbXB0eVBsYWNlaG9sZGVyLCB0cnVlLCBleHRyYVByb3Bl cnRpZXMsIFdlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxlVHJlZUVsZW1lbnQpOwogICAgICAgICAg ICAgc2VjdGlvbi5lZGl0SW5TZWxlY3RlZENhbGxGcmFtZVdoZW5QYXVzZWQgPSB0cnVlOwogICAg ICAgICAgICAgc2VjdGlvbi5wYW5lID0gdGhpczsKIAotICAgICAgICAgICAgaWYgKCFmb3VuZExv Y2FsU2NvcGUgfHwgc2NvcGVPYmplY3RQcm94eS5pc0xvY2FsIHx8IHRpdGxlIGluIHRoaXMuX2V4 cGFuZGVkU2VjdGlvbnMpCisgICAgICAgICAgICBpZiAoIWZvdW5kTG9jYWxTY29wZSB8fCBzY29w ZS50eXBlID09PSAibG9jYWwiIHx8IHRpdGxlIGluIHRoaXMuX2V4cGFuZGVkU2VjdGlvbnMpCiAg ICAgICAgICAgICAgICAgc2VjdGlvbi5leHBhbmRlZCA9IHRydWU7CiAKICAgICAgICAgICAgIHRo aXMuX3NlY3Rpb25zLnB1c2goc2VjdGlvbik7Cg==