55820 2011-03-05 03:40:06 -0800 Web Inspector: pass explicit agent references to InspectorBackendDispatcher 2011-03-09 06:03:37 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 54112 1 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 362927 0 yurys 2011-03-05 03:40:06 -0800 Web Inspector: pass explicit agent references to InspectorBackendDispatcher. The dispatcher should exists only when frontend is connected to the backend as in other moments we don't expect any messages to be sent to the backend. 362928 1 84856 yurys 2011-03-05 03:41:41 -0800 Created attachment 84856 Patch 362929 2 84857 yurys 2011-03-05 03:44:33 -0800 Created attachment 84857 Patch 364448 3 85164 yurys 2011-03-09 05:24:08 -0800 Created attachment 85164 Patch 364458 4 yurys 2011-03-09 06:03:37 -0800 Committed r80640: <http://trac.webkit.org/changeset/80640> 84856 2011-03-05 03:41:41 -0800 2011-03-05 03:44:27 -0800 Patch bug-55820-20110305144138.patch text/plain 10229 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogODA0MTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MTdhYjBkNDAzOTI2YWY4 MjdiNWViZmVjZGFkM2I0ODAxMDk1NGU2Li5kNWRkNTgyY2U5ZDc3MGNkZDg3MzVhM2YzNWE3MzEz ODk3ZDI1MzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDUgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcGFzcyBleHBsaWNpdCBh Z2VudCByZWZlcmVuY2VzIHRvIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTgyMAorCisgICAgICAgICog aW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG06CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JDb250cm9sbGVyOjpjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckNvbnRyb2xsZXI6OmRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVuZCk6CisKIDIwMTEt MDMtMDUgIElseWEgU2hlcm1hbiAgPGlzaGVybWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KaW5kZXggOTYzZWI2YzVlNDc2M2E2YWVlNjk2ODkx ZGNkMGUyNTFkZjJmYzNhNi4uMTAzYWI3M2I4MTlkOWIxODgzZDIxNGVlZDM5M2RkODA1ZjUxZWYw YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNw ZWN0b3IucG0KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNw ZWN0b3IucG0KQEAgLTEzLDcxICsxMyw3MiBAQCBteSAldHlwZVRyYW5zZm9ybTsKICR0eXBlVHJh bnNmb3JteyJBcHBsaWNhdGlvbkNhY2hlIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0 b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JBcHBs aWNhdGlvbkNhY2hlQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0 b3JBZ2VudC0+YXBwbGljYXRpb25DYWNoZUFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIg PT4gIm1fYXBwbGljYXRpb25DYWNoZUFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiQ1NTIn0g PSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JDU1NBZ2VudCIsCiAgICAgImhlYWRlciIg PT4gIkluc3BlY3RvckNTU0FnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5z cGVjdG9yQWdlbnQtPmNzc0FnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fY3Nz QWdlbnQiLAogfTsKICR0eXBlVHJhbnNmb3JteyJDb25zb2xlIn0gPSB7CiAgICAgImZvcndhcmQi ID0+ICJJbnNwZWN0b3JDb25zb2xlQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JD b25zb2xlQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2Vu dC0+Y29uc29sZUFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fY29uc29sZUFn ZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiRGVidWdnZXIifSA9IHsKICAgICAiZm9yd2FyZCIg PT4gIkluc3BlY3RvckRlYnVnZ2VyQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdl bnQtPmRlYnVnZ2VyQWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9kZWJ1Z2dl ckFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiQnJvd3NlckRlYnVnZ2VyIn0gPSB7CiAgICAg ImZvcndhcmQiID0+ICJJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudCIsCiAgICAgImhlYWRl ciIgPT4gIkluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nl c3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPmJyb3dzZXJEZWJ1Z2dlckFnZW50KCkiLAorICAg ICJkb21haW5BY2Nlc3NvciIgPT4gIm1fYnJvd3NlckRlYnVnZ2VyQWdlbnQiLAogfTsKICR0eXBl VHJhbnNmb3JteyJEYXRhYmFzZSJ9ID0gewogICAgICJmb3J3YXJkIiA9PiAiSW5zcGVjdG9yRGF0 YWJhc2VBZ2VudCIsCiAgICAgImhlYWRlciIgPT4gIkluc3BlY3RvckRhdGFiYXNlQWdlbnQuaCIs Ci0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ZGF0YWJhc2VBZ2Vu dCgpIiwKKyAgICAiZG9tYWluQWNjZXNzb3IiID0+ICJtX2RhdGFiYXNlQWdlbnQiLAogfTsKICR0 eXBlVHJhbnNmb3JteyJET00ifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckRPTUFn ZW50IiwKICAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yRE9NQWdlbnQuaCIsCi0gICAgImRvbWFp bkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ZG9tQWdlbnQoKSIsCisgICAgImRvbWFp bkFjY2Vzc29yIiA9PiAibV9kb21BZ2VudCIsCiB9OwogJHR5cGVUcmFuc2Zvcm17IkRPTVN0b3Jh Z2UifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudCIsCiAg ICAgImhlYWRlciIgPT4gIkluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5oIiwKLSAgICAiZG9tYWlu QWNjZXNzb3IiID0+ICJtX2luc3BlY3RvckFnZW50LT5kb21TdG9yYWdlQWdlbnQoKSIsCisgICAg ImRvbWFpbkFjY2Vzc29yIiA9PiAibV9kb21TdG9yYWdlQWdlbnQiLAogfTsKICR0eXBlVHJhbnNm b3JteyJGaWxlU3lzdGVtIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuaCIs Ci0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ZmlsZVN5c3RlbUFn ZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fZmlsZVN5c3RlbUFnZW50IiwKIH07 CiAkdHlwZVRyYW5zZm9ybXsiSW5zcGVjdG9yIn0gPSB7Ci0gICAgImZvcndhcmRIZWFkZXIiID0+ ICJJbnNwZWN0b3JBZ2VudC5oIiwKKyAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckFnZW50IiwK KyAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yQWdlbnQuaCIsCiAgICAgImRvbWFpbkFjY2Vzc29y IiA9PiAibV9pbnNwZWN0b3JBZ2VudCIsCiB9OwogJHR5cGVUcmFuc2Zvcm17Ik5ldHdvcmsifSA9 IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvclJlc291cmNlQWdlbnQiLAogICAgICJoZWFk ZXIiID0+ICJJbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIg PT4gIm1faW5zcGVjdG9yQWdlbnQtPnJlc291cmNlQWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vz c29yIiA9PiAibV9yZXNvdXJjZUFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiUHJvZmlsZXIi fSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvclByb2ZpbGVyQWdlbnQiLAogICAgICJo ZWFkZXIiID0+ICJJbnNwZWN0b3JQcm9maWxlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3Nv ciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnByb2ZpbGVyQWdlbnQoKSIsCisgICAgImRvbWFpbkFj Y2Vzc29yIiA9PiAibV9wcm9maWxlckFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiUnVudGlt ZSJ9ID0gewogICAgICJmb3J3YXJkIiA9PiAiSW5zcGVjdG9yUnVudGltZUFnZW50IiwKICAgICAi aGVhZGVyIiA9PiAiSW5zcGVjdG9yUnVudGltZUFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3Nv ciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnJ1bnRpbWVBZ2VudCgpIiwKKyAgICAiZG9tYWluQWNj ZXNzb3IiID0+ICJtX3J1bnRpbWVBZ2VudCIsCiB9OwogJHR5cGVUcmFuc2Zvcm17IlRpbWVsaW5l In0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JUaW1lbGluZUFnZW50IiwKICAgICAi aGVhZGVyIiA9PiAiSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIiwKLSAgICAiZG9tYWluQWNjZXNz b3IiID0+ICJtX2luc3BlY3RvckFnZW50LT50aW1lbGluZUFnZW50KCkiLAorICAgICJkb21haW5B Y2Nlc3NvciIgPT4gIm1fdGltZWxpbmVBZ2VudCIsCiB9OwogCiAkdHlwZVRyYW5zZm9ybXsiRnJv bnRlbmQifSA9IHsKQEAgLTIxNSw4ICsyMTYsOSBAQCBteSAlYmFja2VuZE1ldGhvZFNpZ25hdHVy ZXM7CiBteSAkYmFja2VuZENvbnN0cnVjdG9yOwogbXkgQGJhY2tlbmRDb25zdGFudERlY2xhcmF0 aW9uczsKIG15IEBiYWNrZW5kQ29uc3RhbnREZWZpbml0aW9uczsKLW15ICRiYWNrZW5kRm9vdGVy OworbXkgQGJhY2tlbmRGb290ZXI7CiBteSBAYmFja2VuZEpTU3R1YnM7CitteSAlYmFja2VuZERv bWFpbnM7CiAKIG15ICRmcm9udGVuZENsYXNzTmFtZTsKIG15ICVmcm9udGVuZFR5cGVzOwpAQCAt Mjc1LDcgKzI3Nyw2IEBAIHN1YiBHZW5lcmF0ZU1vZHVsZQogICAgIHB1c2goQGJhY2tlbmRIZWFk LCAiICAgIHZvaWQgZGlzcGF0Y2goY29uc3QgU3RyaW5nJiBtZXNzYWdlKTsiKTsKICAgICBwdXNo KEBiYWNrZW5kSGVhZCwgIiAgICBzdGF0aWMgYm9vbCBnZXRDb21tYW5kTmFtZShjb25zdCBTdHJp bmcmIG1lc3NhZ2UsIFN0cmluZyogcmVzdWx0KTsiKTsKICAgICAkYmFja2VuZENvbnN0cnVjdG9y ID0gam9pbigiXG4iLCBAYmFja2VuZEhlYWQpOwotICAgICRiYWNrZW5kRm9vdGVyID0gIiAgICBJ bnNwZWN0b3JBZ2VudCogbV9pbnNwZWN0b3JBZ2VudDsiOwogICAgICRiYWNrZW5kVHlwZXN7Iklu c3BlY3RvciJ9ID0gMTsKICAgICAkYmFja2VuZFR5cGVzeyJJbnNwZWN0b3JDbGllbnQifSA9IDE7 CiAgICAgJGJhY2tlbmRUeXBlc3siUGFzc1JlZlB0ciJ9ID0gMTsKQEAgLTQ3Niw2ICs0NzcsNyBA QCBzdWIgZ2VuZXJhdGVCYWNrZW5kRnVuY3Rpb24KICAgICBteSAkZG9tYWluID0gJGludGVyZmFj ZS0+bmFtZTsKICAgICBteSAkZG9tYWluQWNjZXNzb3IgPSB0eXBlVHJhaXRzKCRkb21haW4sICJk b21haW5BY2Nlc3NvciIpOwogICAgICRiYWNrZW5kVHlwZXN7JGRvbWFpbn0gPSAxOworICAgICRi YWNrZW5kRG9tYWluc3skZG9tYWlufSA9IDE7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgaWYg KCEkZG9tYWluQWNjZXNzb3IpIik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIHByb3Rv Y29sRXJyb3JzLT5wdXNoU3RyaW5nKFwiUHJvdG9jb2wgRXJyb3I6ICRkb21haW4gaGFuZGxlciBp cyBub3QgYXZhaWxhYmxlLlwiKTsiKTsKICAgICBwdXNoKEBmdW5jdGlvbiwgIiIpOwpAQCAtMTAy MSw2ICsxMDIzLDM5IEBAIHN1YiBwYXJhbWV0ZXJEb2NMaW5lCiAgICAgcmV0dXJuICRyZXN1bHQ7 CiB9CiAKK3N1YiBnZW5lcmF0ZUJhY2tlbmRBZ2VudEZpZWxkc0FuZENvbnN0cnVjdG9yCit7Cisg ICAgbXkgQGFyZ3VtZW50czsKKyAgICBteSBAZmllbGRJbml0aWFsaXplcnM7CisKKyAgICBmb3Jl YWNoIG15ICRkb21haW4gKHNvcnQga2V5cyAlYmFja2VuZERvbWFpbnMpIHsKKyAgICAgICAgIyBB ZGQgYWdlbnQgZmllbGQgZGVjbGFyYXRpb24gdG8gdGhlIGZvb3Rlci4KKyAgICAgICAgbXkgJGFn ZW50Q2xhc3NOYW1lID0gdHlwZVRyYWl0cygkZG9tYWluLCAiZm9yd2FyZCIpOworICAgICAgICBt eSAkZmllbGQgPSB0eXBlVHJhaXRzKCRkb21haW4sICJkb21haW5BY2Nlc3NvciIpOworICAgICAg ICBwdXNoKEBiYWNrZW5kRm9vdGVyLCAiICAgICR7YWdlbnRDbGFzc05hbWV9KiAke2ZpZWxkfTsi KTsKKworICAgICAgICAjIEFkZCBhZ2VudCBwYXJhbWV0ZXIgYW5kIGluaXRpYWxpemVyLgorICAg ICAgICBteSAkZGVsaW1pdGVyID0gIjoiOworICAgICAgICBpZiAoQGZpZWxkSW5pdGlhbGl6ZXJz KSB7CisgICAgICAgICAgICAkZGVsaW1pdGVyID0gIiwiOworICAgICAgICB9CisgICAgICAgIG15 ICRhcmcgPSBzdWJzdHIoJGZpZWxkLCAyKTsKKyAgICAgICAgcHVzaChAZmllbGRJbml0aWFsaXpl cnMsICIgICAgICAgICR7ZGVsaW1pdGVyfSAke2ZpZWxkfSgke2FyZ30pIik7CisgICAgICAgIHB1 c2goQGFyZ3VtZW50cywgIiR7YWdlbnRDbGFzc05hbWV9KiAke2FyZ30iKTsKKyAgICB9CisKKyAg ICBteSAkYXJndW1lbnRTdHJpbmcgPSBqb2luKCIsICIsIEBhcmd1bWVudHMpOworCisgICAgbXkg QGJhY2tlbmRIZWFkOworICAgIHB1c2goQGJhY2tlbmRIZWFkLCAiICAgICR7YmFja2VuZENsYXNz TmFtZX0oJHthcmd1bWVudFN0cmluZ30pIik7CisgICAgcHVzaChAYmFja2VuZEhlYWQsIEBmaWVs ZEluaXRpYWxpemVycyk7CisgICAgcHVzaChAYmFja2VuZEhlYWQsICIgICAgeyB9Iik7CisgICAg cHVzaChAYmFja2VuZEhlYWQsICIgICAgdm9pZCByZXBvcnRQcm90b2NvbEVycm9yKGNvbnN0IGxv bmcgY2FsbElkLCBjb25zdCBTdHJpbmcmIGVycm9yVGV4dCkgY29uc3Q7Iik7CisgICAgcHVzaChA YmFja2VuZEhlYWQsICIgICAgdm9pZCBkaXNwYXRjaChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOyIp OworICAgIHB1c2goQGJhY2tlbmRIZWFkLCAiICAgIHN0YXRpYyBib29sIGdldENvbW1hbmROYW1l KGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgU3RyaW5nKiByZXN1bHQpOyIpOworICAgICRiYWNrZW5k Q29uc3RydWN0b3IgPSBqb2luKCJcbiIsIEBiYWNrZW5kSGVhZCk7Cit9CisKIHN1YiBmaW5pc2gK IHsKICAgICBteSAkb2JqZWN0ID0gc2hpZnQ7CkBAIC0xMDQ4LDYgKzEwODMsNyBAQCBzdWIgZmlu aXNoCiAgICAgICAgICAgICBwdXNoKEBiYWNrZW5kTWV0aG9kc0ltcGwsIGdlbmVyYXRlQXJndW1l bnRHZXR0ZXJzKCR0eXBlKSk7CiAgICAgICAgIH0KICAgICB9CisgICAgZ2VuZXJhdGVCYWNrZW5k QWdlbnRGaWVsZHNBbmRDb25zdHJ1Y3RvcigpOwogCiAgICAgcHVzaChAYmFja2VuZE1ldGhvZHNJ bXBsLCBnZW5lcmF0ZUJhY2tlbmRNZXNzYWdlUGFyc2VyKCkpOwogICAgIHB1c2goQGJhY2tlbmRN ZXRob2RzSW1wbCwgIiIpOwpAQCAtMTA2MCw3ICsxMDk2LDcgQEAgc3ViIGZpbmlzaAogICAgIHVu ZGVmKCRTT1VSQ0UpOwogCiAgICAgb3BlbigkSEVBREVSLCAiPiRvdXRwdXRIZWFkZXJzRGlyLyRi YWNrZW5kQ2xhc3NOYW1lLmgiKSB8fCBkaWUgIkNvdWxkbid0IG9wZW4gZmlsZSAkb3V0cHV0SGVh ZGVyc0Rpci8kYmFja2VuZENsYXNzTmFtZS5oIjsKLSAgICBwcmludCAkSEVBREVSIGpvaW4oIlxu IiwgZ2VuZXJhdGVIZWFkZXIoJGJhY2tlbmRDbGFzc05hbWUsIFwlYmFja2VuZFR5cGVzLCAkYmFj a2VuZENvbnN0cnVjdG9yLCBcQGJhY2tlbmRDb25zdGFudERlY2xhcmF0aW9ucywgXEBiYWNrZW5k TWV0aG9kcywgJGJhY2tlbmRGb290ZXIpKTsKKyAgICBwcmludCAkSEVBREVSIGpvaW4oIlxuIiwg Z2VuZXJhdGVIZWFkZXIoJGJhY2tlbmRDbGFzc05hbWUsIFwlYmFja2VuZFR5cGVzLCAkYmFja2Vu ZENvbnN0cnVjdG9yLCBcQGJhY2tlbmRDb25zdGFudERlY2xhcmF0aW9ucywgXEBiYWNrZW5kTWV0 aG9kcywgam9pbigiXG4iLCBAYmFja2VuZEZvb3RlcikpKTsKICAgICBjbG9zZSgkSEVBREVSKTsK ICAgICB1bmRlZigkSEVBREVSKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDJmMWJlYTJlNDVhZmI1ZTFjMzAxMDFhNjRkNGEx OTk2ZGZmOWZkYjEuLjNlMWZhMWJkZDlhMGY2MjNjNmNjY2U2NGMxOGZlYTQ2YjkzZGY1OWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAK QEAgLTUzLDcgKzUzLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBJbnNwZWN0b3JDb250cm9s bGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UqIHBhZ2UsIEluc3BlY3RvckNsaWVudCogaW5z cGVjdG9yQ2xpZW50KQogICAgIDogbV9pbnNwZWN0b3JBZ2VudChuZXcgSW5zcGVjdG9yQWdlbnQo cGFnZSwgaW5zcGVjdG9yQ2xpZW50KSkKLSAgICAsIG1faW5zcGVjdG9yQmFja2VuZERpc3BhdGNo ZXIobmV3IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKG1faW5zcGVjdG9yQWdlbnQuZ2V0KCkp KQogICAgICwgbV9pbnNwZWN0b3JDbGllbnQoaW5zcGVjdG9yQ2xpZW50KQogICAgICwgbV9vcGVu aW5nRnJvbnRlbmQoZmFsc2UpCiB7CkBAIC0xMDUsMTIgKzEwNCw0MCBAQCB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZCgpCiAgICAgaWYgKCFJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246Omhhc0Zyb250ZW5kcygpKQogICAgICAgICBTY3JpcHRDb250cm9sbGVyOjpzZXRD YXB0dXJlQ2FsbFN0YWNrRm9yVW5jYXVnaHRFeGNlcHRpb25zKHRydWUpOwogICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZnJvbnRlbmRDcmVhdGVkKCk7CisKKyAgICBtX2luc3BlY3RvckJh Y2tlbmREaXNwYXRjaGVyID0gbmV3IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKAorI2lmIEVO QUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQt PmFwcGxpY2F0aW9uQ2FjaGVBZ2VudCgpLAorI2VuZGlmCisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRf REVCVUdHRVIpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPmJyb3dzZXJEZWJ1Z2dlckFnZW50 KCksCisjZW5kaWYKKyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+Y3NzQWdlbnQoKSwKKyAgICAg ICAgbV9pbnNwZWN0b3JBZ2VudC0+Y29uc29sZUFnZW50KCksCisgICAgICAgIG1faW5zcGVjdG9y QWdlbnQtPmRvbUFnZW50KCksCisjaWYgRU5BQkxFKERPTV9TVE9SQUdFKQorICAgICAgICBtX2lu c3BlY3RvckFnZW50LT5kb21TdG9yYWdlQWdlbnQoKSwKKyNlbmRpZgorI2lmIEVOQUJMRShEQVRB QkFTRSkKKyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+ZGF0YWJhc2VBZ2VudCgpLAorI2VuZGlm CisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisgICAgICAgIG1faW5zcGVjdG9yQWdl bnQtPmRlYnVnZ2VyQWdlbnQoKSwKKyNlbmRpZgorICAgICAgICBtX2luc3BlY3RvckFnZW50Lmdl dCgpLAorICAgICAgICBtX2luc3BlY3RvckFnZW50LT5yZXNvdXJjZUFnZW50KCksCisjaWYgRU5B QkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPnByb2Zp bGVyQWdlbnQoKSwKKyNlbmRpZgorICAgICAgICBtX2luc3BlY3RvckFnZW50LT5ydW50aW1lQWdl bnQoKSwKKyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+dGltZWxpbmVBZ2VudCgpKTsKIH0KIAog dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaXNjb25uZWN0RnJvbnRlbmQoKQogewogICAgIGlm ICghbV9pbnNwZWN0b3JGcm9udGVuZCkKICAgICAgICAgcmV0dXJuOworICAgIG1faW5zcGVjdG9y QmFja2VuZERpc3BhdGNoZXIuY2xlYXIoKTsKIAogICAgIG1faW5zcGVjdG9yQWdlbnQtPmRpc2Nv bm5lY3RGcm9udGVuZCgpOwogCkBAIC0yMDMsNiArMjMwLDggQEAgdm9pZCBJbnNwZWN0b3JDb250 cm9sbGVyOjpzZXRJbnNwZWN0b3JFeHRlbnNpb25BUEkoY29uc3QgU3RyaW5nJiBzb3VyY2UpCiAK IHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzcGF0Y2hNZXNzYWdlRnJvbUZyb250ZW5kKGNv bnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKKyAgICBpZiAoIW1faW5zcGVjdG9yQmFja2VuZERpc3Bh dGNoZXIpCisgICAgICAgIHJldHVybjsKICAgICBtX2luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVy LT5kaXNwYXRjaChtZXNzYWdlKTsKIH0KIAo= 84857 2011-03-05 03:44:33 -0800 2011-03-09 05:24:01 -0800 Patch bug-55820-20110305144431.patch text/plain 10590 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogODA0MTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MTdhYjBkNDAzOTI2YWY4 MjdiNWViZmVjZGFkM2I0ODAxMDk1NGU2Li5kNWRkNTgyY2U5ZDc3MGNkZDg3MzVhM2YzNWE3MzEz ODk3ZDI1MzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDUgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcGFzcyBleHBsaWNpdCBh Z2VudCByZWZlcmVuY2VzIHRvIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTgyMAorCisgICAgICAgICog aW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG06CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29u dHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JDb250cm9sbGVyOjpjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckNvbnRyb2xsZXI6OmRpc3BhdGNoTWVzc2FnZUZyb21Gcm9udGVuZCk6CisKIDIwMTEt MDMtMDUgIElseWEgU2hlcm1hbiAgPGlzaGVybWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KaW5kZXggOTYzZWI2YzVlNDc2M2E2YWVlNjk2ODkx ZGNkMGUyNTFkZjJmYzNhNi4uY2ZkZGQ4MWRjZDk3ODJhYjk1OWZiNmQzNTk1MzY4NTljZjhmNDMz OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNw ZWN0b3IucG0KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNw ZWN0b3IucG0KQEAgLTEzLDcxICsxMyw3MiBAQCBteSAldHlwZVRyYW5zZm9ybTsKICR0eXBlVHJh bnNmb3JteyJBcHBsaWNhdGlvbkNhY2hlIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0 b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JBcHBs aWNhdGlvbkNhY2hlQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0 b3JBZ2VudC0+YXBwbGljYXRpb25DYWNoZUFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIg PT4gIm1fYXBwbGljYXRpb25DYWNoZUFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiQ1NTIn0g PSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JDU1NBZ2VudCIsCiAgICAgImhlYWRlciIg PT4gIkluc3BlY3RvckNTU0FnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5z cGVjdG9yQWdlbnQtPmNzc0FnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fY3Nz QWdlbnQiLAogfTsKICR0eXBlVHJhbnNmb3JteyJDb25zb2xlIn0gPSB7CiAgICAgImZvcndhcmQi ID0+ICJJbnNwZWN0b3JDb25zb2xlQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JD b25zb2xlQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2Vu dC0+Y29uc29sZUFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fY29uc29sZUFn ZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiRGVidWdnZXIifSA9IHsKICAgICAiZm9yd2FyZCIg PT4gIkluc3BlY3RvckRlYnVnZ2VyQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JE ZWJ1Z2dlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdl bnQtPmRlYnVnZ2VyQWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9kZWJ1Z2dl ckFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiQnJvd3NlckRlYnVnZ2VyIn0gPSB7CiAgICAg ImZvcndhcmQiID0+ICJJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudCIsCiAgICAgImhlYWRl ciIgPT4gIkluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nl c3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPmJyb3dzZXJEZWJ1Z2dlckFnZW50KCkiLAorICAg ICJkb21haW5BY2Nlc3NvciIgPT4gIm1fYnJvd3NlckRlYnVnZ2VyQWdlbnQiLAogfTsKICR0eXBl VHJhbnNmb3JteyJEYXRhYmFzZSJ9ID0gewogICAgICJmb3J3YXJkIiA9PiAiSW5zcGVjdG9yRGF0 YWJhc2VBZ2VudCIsCiAgICAgImhlYWRlciIgPT4gIkluc3BlY3RvckRhdGFiYXNlQWdlbnQuaCIs Ci0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ZGF0YWJhc2VBZ2Vu dCgpIiwKKyAgICAiZG9tYWluQWNjZXNzb3IiID0+ICJtX2RhdGFiYXNlQWdlbnQiLAogfTsKICR0 eXBlVHJhbnNmb3JteyJET00ifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckRPTUFn ZW50IiwKICAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yRE9NQWdlbnQuaCIsCi0gICAgImRvbWFp bkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ZG9tQWdlbnQoKSIsCisgICAgImRvbWFp bkFjY2Vzc29yIiA9PiAibV9kb21BZ2VudCIsCiB9OwogJHR5cGVUcmFuc2Zvcm17IkRPTVN0b3Jh Z2UifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudCIsCiAg ICAgImhlYWRlciIgPT4gIkluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5oIiwKLSAgICAiZG9tYWlu QWNjZXNzb3IiID0+ICJtX2luc3BlY3RvckFnZW50LT5kb21TdG9yYWdlQWdlbnQoKSIsCisgICAg ImRvbWFpbkFjY2Vzc29yIiA9PiAibV9kb21TdG9yYWdlQWdlbnQiLAogfTsKICR0eXBlVHJhbnNm b3JteyJGaWxlU3lzdGVtIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JGaWxlU3lz dGVtQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQuaCIs Ci0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ZmlsZVN5c3RlbUFn ZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fZmlsZVN5c3RlbUFnZW50IiwKIH07 CiAkdHlwZVRyYW5zZm9ybXsiSW5zcGVjdG9yIn0gPSB7Ci0gICAgImZvcndhcmRIZWFkZXIiID0+ ICJJbnNwZWN0b3JBZ2VudC5oIiwKKyAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckFnZW50IiwK KyAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yQWdlbnQuaCIsCiAgICAgImRvbWFpbkFjY2Vzc29y IiA9PiAibV9pbnNwZWN0b3JBZ2VudCIsCiB9OwogJHR5cGVUcmFuc2Zvcm17Ik5ldHdvcmsifSA9 IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvclJlc291cmNlQWdlbnQiLAogICAgICJoZWFk ZXIiID0+ICJJbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIg PT4gIm1faW5zcGVjdG9yQWdlbnQtPnJlc291cmNlQWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vz c29yIiA9PiAibV9yZXNvdXJjZUFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiUHJvZmlsZXIi fSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvclByb2ZpbGVyQWdlbnQiLAogICAgICJo ZWFkZXIiID0+ICJJbnNwZWN0b3JQcm9maWxlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3Nv ciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnByb2ZpbGVyQWdlbnQoKSIsCisgICAgImRvbWFpbkFj Y2Vzc29yIiA9PiAibV9wcm9maWxlckFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiUnVudGlt ZSJ9ID0gewogICAgICJmb3J3YXJkIiA9PiAiSW5zcGVjdG9yUnVudGltZUFnZW50IiwKICAgICAi aGVhZGVyIiA9PiAiSW5zcGVjdG9yUnVudGltZUFnZW50LmgiLAotICAgICJkb21haW5BY2Nlc3Nv ciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnJ1bnRpbWVBZ2VudCgpIiwKKyAgICAiZG9tYWluQWNj ZXNzb3IiID0+ICJtX3J1bnRpbWVBZ2VudCIsCiB9OwogJHR5cGVUcmFuc2Zvcm17IlRpbWVsaW5l In0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JUaW1lbGluZUFnZW50IiwKICAgICAi aGVhZGVyIiA9PiAiSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIiwKLSAgICAiZG9tYWluQWNjZXNz b3IiID0+ICJtX2luc3BlY3RvckFnZW50LT50aW1lbGluZUFnZW50KCkiLAorICAgICJkb21haW5B Y2Nlc3NvciIgPT4gIm1fdGltZWxpbmVBZ2VudCIsCiB9OwogCiAkdHlwZVRyYW5zZm9ybXsiRnJv bnRlbmQifSA9IHsKQEAgLTIxNSw4ICsyMTYsOSBAQCBteSAlYmFja2VuZE1ldGhvZFNpZ25hdHVy ZXM7CiBteSAkYmFja2VuZENvbnN0cnVjdG9yOwogbXkgQGJhY2tlbmRDb25zdGFudERlY2xhcmF0 aW9uczsKIG15IEBiYWNrZW5kQ29uc3RhbnREZWZpbml0aW9uczsKLW15ICRiYWNrZW5kRm9vdGVy OworbXkgQGJhY2tlbmRGb290ZXI7CiBteSBAYmFja2VuZEpTU3R1YnM7CitteSAlYmFja2VuZERv bWFpbnM7CiAKIG15ICRmcm9udGVuZENsYXNzTmFtZTsKIG15ICVmcm9udGVuZFR5cGVzOwpAQCAt MjY5LDEzICsyNzEsNiBAQCBzdWIgR2VuZXJhdGVNb2R1bGUKIAogICAgICRiYWNrZW5kQ2xhc3NO YW1lID0gIkluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyIjsKICAgICAkYmFja2VuZEpTU3R1Yk5h bWUgPSAiSW5zcGVjdG9yQmFja2VuZFN0dWIiOwotICAgIG15IEBiYWNrZW5kSGVhZDsKLSAgICBw dXNoKEBiYWNrZW5kSGVhZCwgIiAgICAke2JhY2tlbmRDbGFzc05hbWV9KEluc3BlY3RvckFnZW50 KiBpbnNwZWN0b3JBZ2VudCkgOiBtX2luc3BlY3RvckFnZW50KGluc3BlY3RvckFnZW50KSB7IH0i KTsKLSAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICB2b2lkIHJlcG9ydFByb3RvY29sRXJyb3Io Y29uc3QgbG9uZyBjYWxsSWQsIGNvbnN0IFN0cmluZyYgZXJyb3JUZXh0KSBjb25zdDsiKTsKLSAg ICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICB2b2lkIGRpc3BhdGNoKGNvbnN0IFN0cmluZyYgbWVz c2FnZSk7Iik7Ci0gICAgcHVzaChAYmFja2VuZEhlYWQsICIgICAgc3RhdGljIGJvb2wgZ2V0Q29t bWFuZE5hbWUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBTdHJpbmcqIHJlc3VsdCk7Iik7Ci0gICAg JGJhY2tlbmRDb25zdHJ1Y3RvciA9IGpvaW4oIlxuIiwgQGJhY2tlbmRIZWFkKTsKLSAgICAkYmFj a2VuZEZvb3RlciA9ICIgICAgSW5zcGVjdG9yQWdlbnQqIG1faW5zcGVjdG9yQWdlbnQ7IjsKICAg ICAkYmFja2VuZFR5cGVzeyJJbnNwZWN0b3IifSA9IDE7CiAgICAgJGJhY2tlbmRUeXBlc3siSW5z cGVjdG9yQ2xpZW50In0gPSAxOwogICAgICRiYWNrZW5kVHlwZXN7IlBhc3NSZWZQdHIifSA9IDE7 CkBAIC00NzYsNiArNDcxLDcgQEAgc3ViIGdlbmVyYXRlQmFja2VuZEZ1bmN0aW9uCiAgICAgbXkg JGRvbWFpbiA9ICRpbnRlcmZhY2UtPm5hbWU7CiAgICAgbXkgJGRvbWFpbkFjY2Vzc29yID0gdHlw ZVRyYWl0cygkZG9tYWluLCAiZG9tYWluQWNjZXNzb3IiKTsKICAgICAkYmFja2VuZFR5cGVzeyRk b21haW59ID0gMTsKKyAgICAkYmFja2VuZERvbWFpbnN7JGRvbWFpbn0gPSAxOwogICAgIHB1c2go QGZ1bmN0aW9uLCAiICAgIGlmICghJGRvbWFpbkFjY2Vzc29yKSIpOwogICAgIHB1c2goQGZ1bmN0 aW9uLCAiICAgICAgICBwcm90b2NvbEVycm9ycy0+cHVzaFN0cmluZyhcIlByb3RvY29sIEVycm9y OiAkZG9tYWluIGhhbmRsZXIgaXMgbm90IGF2YWlsYWJsZS5cIik7Iik7CiAgICAgcHVzaChAZnVu Y3Rpb24sICIiKTsKQEAgLTEwMjEsNiArMTAxNywzOSBAQCBzdWIgcGFyYW1ldGVyRG9jTGluZQog ICAgIHJldHVybiAkcmVzdWx0OwogfQogCitzdWIgZ2VuZXJhdGVCYWNrZW5kQWdlbnRGaWVsZHNB bmRDb25zdHJ1Y3RvcgoreworICAgIG15IEBhcmd1bWVudHM7CisgICAgbXkgQGZpZWxkSW5pdGlh bGl6ZXJzOworCisgICAgZm9yZWFjaCBteSAkZG9tYWluIChzb3J0IGtleXMgJWJhY2tlbmREb21h aW5zKSB7CisgICAgICAgICMgQWRkIGFnZW50IGZpZWxkIGRlY2xhcmF0aW9uIHRvIHRoZSBmb290 ZXIuCisgICAgICAgIG15ICRhZ2VudENsYXNzTmFtZSA9IHR5cGVUcmFpdHMoJGRvbWFpbiwgImZv cndhcmQiKTsKKyAgICAgICAgbXkgJGZpZWxkID0gdHlwZVRyYWl0cygkZG9tYWluLCAiZG9tYWlu QWNjZXNzb3IiKTsKKyAgICAgICAgcHVzaChAYmFja2VuZEZvb3RlciwgIiAgICAke2FnZW50Q2xh c3NOYW1lfSogJHtmaWVsZH07Iik7CisKKyAgICAgICAgIyBBZGQgYWdlbnQgcGFyYW1ldGVyIGFu ZCBpbml0aWFsaXplci4KKyAgICAgICAgbXkgJGRlbGltaXRlciA9ICI6IjsKKyAgICAgICAgaWYg KEBmaWVsZEluaXRpYWxpemVycykgeworICAgICAgICAgICAgJGRlbGltaXRlciA9ICIsIjsKKyAg ICAgICAgfQorICAgICAgICBteSAkYXJnID0gc3Vic3RyKCRmaWVsZCwgMik7CisgICAgICAgIHB1 c2goQGZpZWxkSW5pdGlhbGl6ZXJzLCAiICAgICAgICAke2RlbGltaXRlcn0gJHtmaWVsZH0oJHth cmd9KSIpOworICAgICAgICBwdXNoKEBhcmd1bWVudHMsICIke2FnZW50Q2xhc3NOYW1lfSogJHth cmd9Iik7CisgICAgfQorCisgICAgbXkgJGFyZ3VtZW50U3RyaW5nID0gam9pbigiLCAiLCBAYXJn dW1lbnRzKTsKKworICAgIG15IEBiYWNrZW5kSGVhZDsKKyAgICBwdXNoKEBiYWNrZW5kSGVhZCwg IiAgICAke2JhY2tlbmRDbGFzc05hbWV9KCR7YXJndW1lbnRTdHJpbmd9KSIpOworICAgIHB1c2go QGJhY2tlbmRIZWFkLCBAZmllbGRJbml0aWFsaXplcnMpOworICAgIHB1c2goQGJhY2tlbmRIZWFk LCAiICAgIHsgfSIpOworICAgIHB1c2goQGJhY2tlbmRIZWFkLCAiICAgIHZvaWQgcmVwb3J0UHJv dG9jb2xFcnJvcihjb25zdCBsb25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBlcnJvclRleHQpIGNv bnN0OyIpOworICAgIHB1c2goQGJhY2tlbmRIZWFkLCAiICAgIHZvaWQgZGlzcGF0Y2goY29uc3Qg U3RyaW5nJiBtZXNzYWdlKTsiKTsKKyAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICBzdGF0aWMg Ym9vbCBnZXRDb21tYW5kTmFtZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFN0cmluZyogcmVzdWx0 KTsiKTsKKyAgICAkYmFja2VuZENvbnN0cnVjdG9yID0gam9pbigiXG4iLCBAYmFja2VuZEhlYWQp OworfQorCiBzdWIgZmluaXNoCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwpAQCAtMTA0OCw2 ICsxMDc3LDcgQEAgc3ViIGZpbmlzaAogICAgICAgICAgICAgcHVzaChAYmFja2VuZE1ldGhvZHNJ bXBsLCBnZW5lcmF0ZUFyZ3VtZW50R2V0dGVycygkdHlwZSkpOwogICAgICAgICB9CiAgICAgfQor ICAgIGdlbmVyYXRlQmFja2VuZEFnZW50RmllbGRzQW5kQ29uc3RydWN0b3IoKTsKIAogICAgIHB1 c2goQGJhY2tlbmRNZXRob2RzSW1wbCwgZ2VuZXJhdGVCYWNrZW5kTWVzc2FnZVBhcnNlcigpKTsK ICAgICBwdXNoKEBiYWNrZW5kTWV0aG9kc0ltcGwsICIiKTsKQEAgLTEwNjAsNyArMTA5MCw3IEBA IHN1YiBmaW5pc2gKICAgICB1bmRlZigkU09VUkNFKTsKIAogICAgIG9wZW4oJEhFQURFUiwgIj4k b3V0cHV0SGVhZGVyc0Rpci8kYmFja2VuZENsYXNzTmFtZS5oIikgfHwgZGllICJDb3VsZG4ndCBv cGVuIGZpbGUgJG91dHB1dEhlYWRlcnNEaXIvJGJhY2tlbmRDbGFzc05hbWUuaCI7Ci0gICAgcHJp bnQgJEhFQURFUiBqb2luKCJcbiIsIGdlbmVyYXRlSGVhZGVyKCRiYWNrZW5kQ2xhc3NOYW1lLCBc JWJhY2tlbmRUeXBlcywgJGJhY2tlbmRDb25zdHJ1Y3RvciwgXEBiYWNrZW5kQ29uc3RhbnREZWNs YXJhdGlvbnMsIFxAYmFja2VuZE1ldGhvZHMsICRiYWNrZW5kRm9vdGVyKSk7CisgICAgcHJpbnQg JEhFQURFUiBqb2luKCJcbiIsIGdlbmVyYXRlSGVhZGVyKCRiYWNrZW5kQ2xhc3NOYW1lLCBcJWJh Y2tlbmRUeXBlcywgJGJhY2tlbmRDb25zdHJ1Y3RvciwgXEBiYWNrZW5kQ29uc3RhbnREZWNsYXJh dGlvbnMsIFxAYmFja2VuZE1ldGhvZHMsIGpvaW4oIlxuIiwgQGJhY2tlbmRGb290ZXIpKSk7CiAg ICAgY2xvc2UoJEhFQURFUik7CiAgICAgdW5kZWYoJEhFQURFUik7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCAyZjFiZWEyZTQ1 YWZiNWUxYzMwMTAxYTY0ZDRhMTk5NmRmZjlmZGIxLi4zZTFmYTFiZGQ5YTBmNjIzYzZjY2NlNjRj MThmZWE0NmI5M2RmNTlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwCkBAIC01Myw3ICs1Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogSW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJ bnNwZWN0b3JDbGllbnQqIGluc3BlY3RvckNsaWVudCkKICAgICA6IG1faW5zcGVjdG9yQWdlbnQo bmV3IEluc3BlY3RvckFnZW50KHBhZ2UsIGluc3BlY3RvckNsaWVudCkpCi0gICAgLCBtX2luc3Bl Y3RvckJhY2tlbmREaXNwYXRjaGVyKG5ldyBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcihtX2lu c3BlY3RvckFnZW50LmdldCgpKSkKICAgICAsIG1faW5zcGVjdG9yQ2xpZW50KGluc3BlY3RvckNs aWVudCkKICAgICAsIG1fb3BlbmluZ0Zyb250ZW5kKGZhbHNlKQogewpAQCAtMTA1LDEyICsxMDQs NDAgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0RnJvbnRlbmQoKQogICAgIGlm ICghSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpoYXNGcm9udGVuZHMoKSkKICAgICAgICAgU2Ny aXB0Q29udHJvbGxlcjo6c2V0Q2FwdHVyZUNhbGxTdGFja0ZvclVuY2F1Z2h0RXhjZXB0aW9ucyh0 cnVlKTsKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyb250ZW5kQ3JlYXRlZCgpOwor CisgICAgbV9pbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlciA9IG5ldyBJbnNwZWN0b3JCYWNrZW5k RGlzcGF0Y2hlcigKKyNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQorICAgICAg ICBtX2luc3BlY3RvckFnZW50LT5hcHBsaWNhdGlvbkNhY2hlQWdlbnQoKSwKKyNlbmRpZgorI2lm IEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQorICAgICAgICBtX2luc3BlY3RvckFnZW50LT5i cm93c2VyRGVidWdnZXJBZ2VudCgpLAorI2VuZGlmCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQt PmNzc0FnZW50KCksCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPmNvbnNvbGVBZ2VudCgpLAor ICAgICAgICBtX2luc3BlY3RvckFnZW50LT5kb21BZ2VudCgpLAorI2lmIEVOQUJMRShET01fU1RP UkFHRSkKKyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+ZG9tU3RvcmFnZUFnZW50KCksCisjZW5k aWYKKyNpZiBFTkFCTEUoREFUQUJBU0UpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPmRhdGFi YXNlQWdlbnQoKSwKKyNlbmRpZgorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQorICAg ICAgICBtX2luc3BlY3RvckFnZW50LT5kZWJ1Z2dlckFnZW50KCksCisjZW5kaWYKKyAgICAgICAg bV9pbnNwZWN0b3JBZ2VudC5nZXQoKSwKKyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+cmVzb3Vy Y2VBZ2VudCgpLAorI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQorICAgICAgICBtX2lu c3BlY3RvckFnZW50LT5wcm9maWxlckFnZW50KCksCisjZW5kaWYKKyAgICAgICAgbV9pbnNwZWN0 b3JBZ2VudC0+cnVudGltZUFnZW50KCksCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPnRpbWVs aW5lQWdlbnQoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZy b250ZW5kKCkKIHsKICAgICBpZiAoIW1faW5zcGVjdG9yRnJvbnRlbmQpCiAgICAgICAgIHJldHVy bjsKKyAgICBtX2luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmNsZWFyKCk7CiAKICAgICBtX2lu c3BlY3RvckFnZW50LT5kaXNjb25uZWN0RnJvbnRlbmQoKTsKIApAQCAtMjAzLDYgKzIzMCw4IEBA IHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0SW5zcGVjdG9yRXh0ZW5zaW9uQVBJKGNvbnN0 IFN0cmluZyYgc291cmNlKQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpc3BhdGNoTWVz c2FnZUZyb21Gcm9udGVuZChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiB7CisgICAgaWYgKCFtX2lu c3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKQorICAgICAgICByZXR1cm47CiAgICAgbV9pbnNwZWN0 b3JCYWNrZW5kRGlzcGF0Y2hlci0+ZGlzcGF0Y2gobWVzc2FnZSk7CiB9CiAK 85164 2011-03-09 05:24:08 -0800 2011-03-09 05:57:28 -0800 Patch bug-55820-20110309162405.patch text/plain 16063 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogODA2MzUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NTIxZjIyZDUwMDk3NTJjMjIwZGQ2 Y2YwNjI0MjQxOTI5YzMwODgwLi42ZTFkYzVhYjhlNGRiMmNlYjNkNjM1MDUyZWM3ZDU0NjEwN2Q2 YTVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMDkgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcGFzcyBleHBsaWNpdCBhZ2VudCByZWZlcmVu Y2VzIHRvIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTgyMAorCisgICAgICAgICogaHR0cC90ZXN0cy9p bnNwZWN0b3ItZW5hYmxlZC9vcGVuLWNsb3NlLW9wZW4tZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGh0dHAvdGVzdHMvaW5zcGVjdG9yLWVuYWJsZWQvb3Blbi1jbG9zZS1vcGVuLmh0bWw6CisgICAg ICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanM6CisgICAgICAgICgp OgorCiAyMDExLTAzLTA5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLiBNb3ZlIGZhc3QvY2FudmFzL3JnYmEtcGFyc2luZy5o dG1sIHRvIHRoZSBncm91cCBvZgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3ItZW5hYmxlZC9vcGVuLWNsb3NlLW9wZW4tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3ItZW5hYmxlZC9vcGVuLWNsb3NlLW9wZW4tZXhwZWN0ZWQu dHh0CmluZGV4IGNlYzQ5ZGEyMDFmYmJmY2MzOTcyMzMyOTg2ZTI2ODA5NzQyZTNlMmMuLjUzN2E5 MjBjNzNlNjIxMTY1OGUxOTA0OGJkYWIwYjAxYWZlMDkwMDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yLWVuYWJsZWQvb3Blbi1jbG9zZS1vcGVuLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci1lbmFibGVkL29wZW4t Y2xvc2Utb3Blbi1leHBlY3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiBDT05TT0xFIE1FU1NBR0U6 IGxpbmUgMTM6IE9wZW5pbmcgV2ViIEluc3BlY3Rvci4KLUNPTlNPTEUgTUVTU0FHRTogbGluZSAy MDogQ2xvc2luZyBXZWIgSW5zcGVjdG9yLgotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDIzOiBSZS1v cGVuZGluZyBXZWIgSW5zcGVjdG9yLgotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDMyOiBDb21wbGV0 aW5nIHRoZSB0ZXN0LgorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDIzOiBDbG9zaW5nIFdlYiBJbnNw ZWN0b3IuCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMjY6IFJlLW9wZW5kaW5nIFdlYiBJbnNwZWN0 b3IuCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMzY6IENvbXBsZXRpbmcgdGhlIHRlc3QuCiBUZXN0 cyB0aGF0IFdlYiBJbnNwZWN0b3IgaXMgZnVuY3Rpb25hbCBhZnRlciB0aGUgb3BlbiAtIGNsb3Nl IC0gb3BlbiBzZXF1ZW5jZS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU0ODc5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci1lbmFi bGVkL29wZW4tY2xvc2Utb3Blbi5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3ItZW5hYmxlZC9vcGVuLWNsb3NlLW9wZW4uaHRtbAppbmRleCA2Y2U5MmVkZGUxMjNiMTA3Yzc1 MTBlYjJmNDljZWRkNTYwNmYwMDBhLi43ODRmYzA3N2ViZGM4NjMxZmIwMDM2MDJmNjk0NjViYTZi Mjk5Zjc5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci1lbmFi bGVkL29wZW4tY2xvc2Utb3Blbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5z cGVjdG9yLWVuYWJsZWQvb3Blbi1jbG9zZS1vcGVuLmh0bWwKQEAgLTE3LDEzICsxNywxNyBAQCBm dW5jdGlvbiBvbmxvYWQoKQogZnVuY3Rpb24gZGlkRXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZChj YWxsSWQpCiB7CiAgICAgaWYgKGNhbGxJZCA9PT0gMCkgewotICAgICAgICBjb25zb2xlLmxvZygi Q2xvc2luZyBXZWIgSW5zcGVjdG9yLiIpOwotICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5j bG9zZVdlYkluc3BlY3RvcigpOworICAgICAgICAvLyBEbyB0aGlzIGFzeW5jaHJvbm91c2x5IHRv IGFsbG93IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyIHRvIHNlbmQgcmVzcG9uc2UKKyAgICAg ICAgLy8gYmFjayB0byB0aGUgZnJvbnRlbmQgYmVmb3JlIGl0J3MgZGVzdHJveWVkLgorICAgICAg ICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgY29uc29sZS5sb2coIkNsb3Np bmcgV2ViIEluc3BlY3Rvci4iKTsKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmNs b3NlV2ViSW5zcGVjdG9yKCk7CiAKLSAgICAgICAgY29uc29sZS5sb2coIlJlLW9wZW5kaW5nIFdl YiBJbnNwZWN0b3IuIik7Ci0gICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLnNob3dXZWJJbnNw ZWN0b3IoKTsKKyAgICAgICAgICAgIGNvbnNvbGUubG9nKCJSZS1vcGVuZGluZyBXZWIgSW5zcGVj dG9yLiIpOworICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2hvd1dlYkluc3BlY3Rv cigpOwogCi0gICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmV2YWx1YXRlSW5XZWJJbnNwZWN0 b3IoMSwgIigiICsgZnJvbnRlbmRfdGVzdENvbW11bnVjYXRpb25XaXRoU2VydmVyICsgIikoKSIp OworICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZXZhbHVhdGVJbldlYkluc3BlY3Rv cigxLCAiKCIgKyBmcm9udGVuZF90ZXN0Q29tbXVudWNhdGlvbldpdGhTZXJ2ZXIgKyAiKSgpIik7 CisgICAgICAgIH0sIDApOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcwppbmRleCAwNjI0NDY5NWY0Nzk2Mjg4NjA1 ODc4MjM3YzkyZWIxNTkzOTMxN2Y5Li40ZmE0ZTlmMmQwYmM3MTMzMjEyN2UwOWI5NmU3MmU0Zjdj ZjA4MDc1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNw ZWN0b3ItdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNw ZWN0b3ItdGVzdC5qcwpAQCAtMzMzLDcgKzMzMyw5IEBAIGZ1bmN0aW9uIGRpZEV2YWx1YXRlRm9y VGVzdEluRnJvbnRlbmQoY2FsbElkKQogICAgIGlmIChjYWxsSWQgIT09IGNvbXBsZXRlVGVzdENh bGxJZCkKICAgICAgICAgcmV0dXJuOwogICAgIGRlbGV0ZSB3aW5kb3cuY29tcGxldGVUZXN0Q2Fs bElkOwotICAgIGNsb3NlSW5zcGVjdG9yQW5kTm90aWZ5RG9uZSgpOworICAgIC8vIENsb3NlIGlu c3BlY3RvciBhc3luY2hyb3VzbHkgdG8gYWxsb3cgY2FsbGVyIG9mIHRoaXMKKyAgICAvLyBmdW5j dGlvbiBzZW5kIHJlc3BvbnNlIGJlZm9yZSBiYWNrZW5kIGRpc3BhdGNoZXIgYW5kIGZyb250ZW5k IGFyZSBkZXN0cm95ZWQuCisgICAgc2V0VGltZW91dChjbG9zZUluc3BlY3RvckFuZE5vdGlmeURv bmUsIDApOwogfQogCiBmdW5jdGlvbiBjbG9zZUluc3BlY3RvckFuZE5vdGlmeURvbmUoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDAzMDNlZjkxN2JjNDM5ZTM0MTY5NGZkMjFjZmZjNWJjMTQyMzYxMGIuLjM1MTNh ZTBiNGQwYTg3Y2QzYTRmYWEzNTQ5ODdkMTkyOWYyMDFlZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxMS0wMy0wOSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBwYXNzIGV4cGxpY2l0IGFnZW50IHJlZmVyZW5jZXMgdG8gSW5zcGVjdG9yQmFj a2VuZERpc3BhdGNoZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU1ODIwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rv ci5wbToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpkaXNjb25uZWN0RnJvbnRl bmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzcGF0Y2hNZXNz YWdlRnJvbUZyb250ZW5kKToKKwogMjAxMS0wMy0wOCAgSGFucyBXZW5uYm9yZyAgPGhhbnNAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KaW5kZXgg NzBlYjYxZDZkZTNjOTlhMjM5NzAzYjcwYjU0MjRmYTIyZTMzMjI4Ny4uZjRiMGQ1NmVhMTlhMmFj YjE5OTc1NzYyMDFhODY0OThlNzYxYmRlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KQEAgLTEzLDcxICsxMyw3MiBAQCBteSAl dHlwZVRyYW5zZm9ybTsKICR0eXBlVHJhbnNmb3JteyJBcHBsaWNhdGlvbkNhY2hlIn0gPSB7CiAg ICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQiLAogICAgICJo ZWFkZXIiID0+ICJJbnNwZWN0b3JBcHBsaWNhdGlvbkNhY2hlQWdlbnQuaCIsCi0gICAgImRvbWFp bkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+YXBwbGljYXRpb25DYWNoZUFnZW50KCki LAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fYXBwbGljYXRpb25DYWNoZUFnZW50IiwKIH07 CiAkdHlwZVRyYW5zZm9ybXsiQ1NTIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JD U1NBZ2VudCIsCiAgICAgImhlYWRlciIgPT4gIkluc3BlY3RvckNTU0FnZW50LmgiLAotICAgICJk b21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPmNzc0FnZW50KCkiLAorICAgICJk b21haW5BY2Nlc3NvciIgPT4gIm1fY3NzQWdlbnQiLAogfTsKICR0eXBlVHJhbnNmb3JteyJDb25z b2xlIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JDb25zb2xlQWdlbnQiLAogICAg ICJoZWFkZXIiID0+ICJJbnNwZWN0b3JDb25zb2xlQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vz c29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+Y29uc29sZUFnZW50KCkiLAorICAgICJkb21haW5B Y2Nlc3NvciIgPT4gIm1fY29uc29sZUFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiRGVidWdn ZXIifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvckRlYnVnZ2VyQWdlbnQiLAogICAg ICJoZWFkZXIiID0+ICJJbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgiLAotICAgICJkb21haW5BY2Nl c3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPmRlYnVnZ2VyQWdlbnQoKSIsCisgICAgImRvbWFp bkFjY2Vzc29yIiA9PiAibV9kZWJ1Z2dlckFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiQnJv d3NlckRlYnVnZ2VyIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0b3JCcm93c2VyRGVi dWdnZXJBZ2VudCIsCiAgICAgImhlYWRlciIgPT4gIkluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFn ZW50LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPmJyb3dz ZXJEZWJ1Z2dlckFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fYnJvd3NlckRl YnVnZ2VyQWdlbnQiLAogfTsKICR0eXBlVHJhbnNmb3JteyJEYXRhYmFzZSJ9ID0gewogICAgICJm b3J3YXJkIiA9PiAiSW5zcGVjdG9yRGF0YWJhc2VBZ2VudCIsCiAgICAgImhlYWRlciIgPT4gIklu c3BlY3RvckRhdGFiYXNlQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNw ZWN0b3JBZ2VudC0+ZGF0YWJhc2VBZ2VudCgpIiwKKyAgICAiZG9tYWluQWNjZXNzb3IiID0+ICJt X2RhdGFiYXNlQWdlbnQiLAogfTsKICR0eXBlVHJhbnNmb3JteyJET00ifSA9IHsKICAgICAiZm9y d2FyZCIgPT4gIkluc3BlY3RvckRPTUFnZW50IiwKICAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9y RE9NQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudC0+ ZG9tQWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9kb21BZ2VudCIsCiB9Owog JHR5cGVUcmFuc2Zvcm17IkRPTVN0b3JhZ2UifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3Bl Y3RvckRPTVN0b3JhZ2VBZ2VudCIsCiAgICAgImhlYWRlciIgPT4gIkluc3BlY3RvckRPTVN0b3Jh Z2VBZ2VudC5oIiwKLSAgICAiZG9tYWluQWNjZXNzb3IiID0+ICJtX2luc3BlY3RvckFnZW50LT5k b21TdG9yYWdlQWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9kb21TdG9yYWdl QWdlbnQiLAogfTsKICR0eXBlVHJhbnNmb3JteyJGaWxlU3lzdGVtIn0gPSB7CiAgICAgImZvcndh cmQiID0+ICJJbnNwZWN0b3JGaWxlU3lzdGVtQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNw ZWN0b3JGaWxlU3lzdGVtQWdlbnQuaCIsCi0gICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNw ZWN0b3JBZ2VudC0+ZmlsZVN5c3RlbUFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4g Im1fZmlsZVN5c3RlbUFnZW50IiwKIH07CiAkdHlwZVRyYW5zZm9ybXsiSW5zcGVjdG9yIn0gPSB7 Ci0gICAgImZvcndhcmRIZWFkZXIiID0+ICJJbnNwZWN0b3JBZ2VudC5oIiwKKyAgICAiZm9yd2Fy ZCIgPT4gIkluc3BlY3RvckFnZW50IiwKKyAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yQWdlbnQu aCIsCiAgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9pbnNwZWN0b3JBZ2VudCIsCiB9OwogJHR5 cGVUcmFuc2Zvcm17Ik5ldHdvcmsifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3RvclJl c291cmNlQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JSZXNvdXJjZUFnZW50Lmgi LAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnJlc291cmNlQWdl bnQoKSIsCisgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9yZXNvdXJjZUFnZW50IiwKIH07CiAk dHlwZVRyYW5zZm9ybXsiUHJvZmlsZXIifSA9IHsKICAgICAiZm9yd2FyZCIgPT4gIkluc3BlY3Rv clByb2ZpbGVyQWdlbnQiLAogICAgICJoZWFkZXIiID0+ICJJbnNwZWN0b3JQcm9maWxlckFnZW50 LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnByb2ZpbGVy QWdlbnQoKSIsCisgICAgImRvbWFpbkFjY2Vzc29yIiA9PiAibV9wcm9maWxlckFnZW50IiwKIH07 CiAkdHlwZVRyYW5zZm9ybXsiUnVudGltZSJ9ID0gewogICAgICJmb3J3YXJkIiA9PiAiSW5zcGVj dG9yUnVudGltZUFnZW50IiwKICAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yUnVudGltZUFnZW50 LmgiLAotICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1faW5zcGVjdG9yQWdlbnQtPnJ1bnRpbWVB Z2VudCgpIiwKKyAgICAiZG9tYWluQWNjZXNzb3IiID0+ICJtX3J1bnRpbWVBZ2VudCIsCiB9Owog JHR5cGVUcmFuc2Zvcm17IlRpbWVsaW5lIn0gPSB7CiAgICAgImZvcndhcmQiID0+ICJJbnNwZWN0 b3JUaW1lbGluZUFnZW50IiwKICAgICAiaGVhZGVyIiA9PiAiSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dC5oIiwKLSAgICAiZG9tYWluQWNjZXNzb3IiID0+ICJtX2luc3BlY3RvckFnZW50LT50aW1lbGlu ZUFnZW50KCkiLAorICAgICJkb21haW5BY2Nlc3NvciIgPT4gIm1fdGltZWxpbmVBZ2VudCIsCiB9 OwogCiAkdHlwZVRyYW5zZm9ybXsiRnJvbnRlbmQifSA9IHsKQEAgLTIxNSw4ICsyMTYsOSBAQCBt eSAlYmFja2VuZE1ldGhvZFNpZ25hdHVyZXM7CiBteSAkYmFja2VuZENvbnN0cnVjdG9yOwogbXkg QGJhY2tlbmRDb25zdGFudERlY2xhcmF0aW9uczsKIG15IEBiYWNrZW5kQ29uc3RhbnREZWZpbml0 aW9uczsKLW15ICRiYWNrZW5kRm9vdGVyOworbXkgQGJhY2tlbmRGb290ZXI7CiBteSBAYmFja2Vu ZEpTU3R1YnM7CitteSAlYmFja2VuZERvbWFpbnM7CiAKIG15ICRmcm9udGVuZENsYXNzTmFtZTsK IG15ICVmcm9udGVuZFR5cGVzOwpAQCAtMjY5LDEzICsyNzEsNiBAQCBzdWIgR2VuZXJhdGVNb2R1 bGUKIAogICAgICRiYWNrZW5kQ2xhc3NOYW1lID0gIkluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVy IjsKICAgICAkYmFja2VuZEpTU3R1Yk5hbWUgPSAiSW5zcGVjdG9yQmFja2VuZFN0dWIiOwotICAg IG15IEBiYWNrZW5kSGVhZDsKLSAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICAke2JhY2tlbmRD bGFzc05hbWV9KEluc3BlY3RvckFnZW50KiBpbnNwZWN0b3JBZ2VudCkgOiBtX2luc3BlY3RvckFn ZW50KGluc3BlY3RvckFnZW50KSB7IH0iKTsKLSAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICB2 b2lkIHJlcG9ydFByb3RvY29sRXJyb3IoY29uc3QgbG9uZyBjYWxsSWQsIGNvbnN0IFN0cmluZyYg ZXJyb3JUZXh0KSBjb25zdDsiKTsKLSAgICBwdXNoKEBiYWNrZW5kSGVhZCwgIiAgICB2b2lkIGRp c3BhdGNoKGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7Iik7Ci0gICAgcHVzaChAYmFja2VuZEhlYWQs ICIgICAgc3RhdGljIGJvb2wgZ2V0Q29tbWFuZE5hbWUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBT dHJpbmcqIHJlc3VsdCk7Iik7Ci0gICAgJGJhY2tlbmRDb25zdHJ1Y3RvciA9IGpvaW4oIlxuIiwg QGJhY2tlbmRIZWFkKTsKLSAgICAkYmFja2VuZEZvb3RlciA9ICIgICAgSW5zcGVjdG9yQWdlbnQq IG1faW5zcGVjdG9yQWdlbnQ7IjsKICAgICAkYmFja2VuZFR5cGVzeyJJbnNwZWN0b3IifSA9IDE7 CiAgICAgJGJhY2tlbmRUeXBlc3siSW5zcGVjdG9yQ2xpZW50In0gPSAxOwogICAgICRiYWNrZW5k VHlwZXN7IlBhc3NSZWZQdHIifSA9IDE7CkBAIC00NzYsNiArNDcxLDcgQEAgc3ViIGdlbmVyYXRl QmFja2VuZEZ1bmN0aW9uCiAgICAgbXkgJGRvbWFpbiA9ICRpbnRlcmZhY2UtPm5hbWU7CiAgICAg bXkgJGRvbWFpbkFjY2Vzc29yID0gdHlwZVRyYWl0cygkZG9tYWluLCAiZG9tYWluQWNjZXNzb3Ii KTsKICAgICAkYmFja2VuZFR5cGVzeyRkb21haW59ID0gMTsKKyAgICAkYmFja2VuZERvbWFpbnN7 JGRvbWFpbn0gPSAxOwogICAgIHB1c2goQGZ1bmN0aW9uLCAiICAgIGlmICghJGRvbWFpbkFjY2Vz c29yKSIpOwogICAgIHB1c2goQGZ1bmN0aW9uLCAiICAgICAgICBwcm90b2NvbEVycm9ycy0+cHVz aFN0cmluZyhcIlByb3RvY29sIEVycm9yOiAkZG9tYWluIGhhbmRsZXIgaXMgbm90IGF2YWlsYWJs ZS5cIik7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIiKTsKQEAgLTUxMCw3ICs1MDYsNyBAQCBz dWIgZ2VuZXJhdGVCYWNrZW5kRnVuY3Rpb24KICAgICB9CiAKICAgICBwdXNoKEBmdW5jdGlvbiwg IiAgICAvLyB1c2UgSW5zcGVjdG9yRnJvbnRlbmQgYXMgYSBtYXJrZXIgb2YgV2ViSW5zcGVjdG9y IGF2YWlsYWJpbGl0eSIpOwotICAgIHB1c2goQGZ1bmN0aW9uLCAiICAgIGlmICgoY2FsbElkIHx8 IHByb3RvY29sRXJyb3JzLT5sZW5ndGgoKSkgJiYgbV9pbnNwZWN0b3JBZ2VudC0+aGFzRnJvbnRl bmQoKSkgeyIpOworICAgIHB1c2goQGZ1bmN0aW9uLCAiICAgIGlmIChjYWxsSWQgfHwgcHJvdG9j b2xFcnJvcnMtPmxlbmd0aCgpKSB7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlc3BvbnNlTWVzc2FnZSA9IEluc3BlY3Rvck9iamVjdDo6 Y3JlYXRlKCk7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIHJlc3BvbnNlTWVzc2Fn ZS0+c2V0TnVtYmVyKFwic2VxXCIsIGNhbGxJZCk7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIi KTsKQEAgLTUyMyw3ICs1MTksNyBAQCBzdWIgZ2VuZXJhdGVCYWNrZW5kRnVuY3Rpb24KICAgICAg ICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgICAgICByZXNwb25zZU1lc3NhZ2UtPnNldE9iamVj dChcImJvZHlcIiwgcmVzcG9uc2VCb2R5KTsiKTsKICAgICAgICAgcHVzaChAZnVuY3Rpb24sICIg ICAgICAgIH0iKTsKICAgICB9Ci0gICAgcHVzaChAZnVuY3Rpb24sICIgICAgICAgIG1faW5zcGVj dG9yQWdlbnQtPmluc3BlY3RvckNsaWVudCgpLT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQocmVzcG9u c2VNZXNzYWdlLT50b0pTT05TdHJpbmcoKSk7Iik7CisgICAgcHVzaChAZnVuY3Rpb24sICIgICAg ICAgIG1faW5zcGVjdG9yQ2xpZW50LT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQocmVzcG9uc2VNZXNz YWdlLT50b0pTT05TdHJpbmcoKSk7Iik7CiAgICAgcHVzaChAZnVuY3Rpb24sICIgICAgfSIpOwog CiAKQEAgLTYwMSw3ICs1OTcsNyBAQCB2b2lkICR7YmFja2VuZENsYXNzTmFtZX06OnJlcG9ydFBy b3RvY29sRXJyb3IoY29uc3QgbG9uZyBjYWxsSWQsIGNvbnN0IFN0cmluZyYgZQogICAgIFJlZlB0 cjxJbnNwZWN0b3JBcnJheT4gZXJyb3JzID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwogICAg IGVycm9ycy0+cHVzaFN0cmluZyhlcnJvclRleHQpOwogICAgIG1lc3NhZ2UtPnNldEFycmF5KCJl cnJvcnMiLCBlcnJvcnMpOwotICAgIG1faW5zcGVjdG9yQWdlbnQtPmluc3BlY3RvckNsaWVudCgp LT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQobWVzc2FnZS0+dG9KU09OU3RyaW5nKCkpOworICAgIG1f aW5zcGVjdG9yQ2xpZW50LT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQobWVzc2FnZS0+dG9KU09OU3Ry aW5nKCkpOwogfQogRU9GCiAgICAgcmV0dXJuIHNwbGl0KCJcbiIsICRyZXBvcnRQcm90b2NvbEVy cm9yKTsKQEAgLTEwMzIsNiArMTAyOCwzOSBAQCBzdWIgcGFyYW1ldGVyRG9jTGluZQogICAgIHJl dHVybiAkcmVzdWx0OwogfQogCitzdWIgZ2VuZXJhdGVCYWNrZW5kQWdlbnRGaWVsZHNBbmRDb25z dHJ1Y3RvcgoreworICAgIG15IEBhcmd1bWVudHM7CisgICAgbXkgQGZpZWxkSW5pdGlhbGl6ZXJz OworCisgICAgcHVzaChAYXJndW1lbnRzLCAiSW5zcGVjdG9yQ2xpZW50KiBpbnNwZWN0b3JDbGll bnQiKTsKKyAgICBwdXNoKEBmaWVsZEluaXRpYWxpemVycywgIiAgICAgICAgOiBtX2luc3BlY3Rv ckNsaWVudChpbnNwZWN0b3JDbGllbnQpIik7CisgICAgcHVzaChAYmFja2VuZEZvb3RlciwgIiAg ICBJbnNwZWN0b3JDbGllbnQqIG1faW5zcGVjdG9yQ2xpZW50OyIpOworCisgICAgZm9yZWFjaCBt eSAkZG9tYWluIChzb3J0IGtleXMgJWJhY2tlbmREb21haW5zKSB7CisgICAgICAgICMgQWRkIGFn ZW50IGZpZWxkIGRlY2xhcmF0aW9uIHRvIHRoZSBmb290ZXIuCisgICAgICAgIG15ICRhZ2VudENs YXNzTmFtZSA9IHR5cGVUcmFpdHMoJGRvbWFpbiwgImZvcndhcmQiKTsKKyAgICAgICAgbXkgJGZp ZWxkID0gdHlwZVRyYWl0cygkZG9tYWluLCAiZG9tYWluQWNjZXNzb3IiKTsKKyAgICAgICAgcHVz aChAYmFja2VuZEZvb3RlciwgIiAgICAke2FnZW50Q2xhc3NOYW1lfSogJHtmaWVsZH07Iik7CisK KyAgICAgICAgIyBBZGQgYWdlbnQgcGFyYW1ldGVyIGFuZCBpbml0aWFsaXplci4KKyAgICAgICAg bXkgJGFyZyA9IHN1YnN0cigkZmllbGQsIDIpOworICAgICAgICBwdXNoKEBmaWVsZEluaXRpYWxp emVycywgIiAgICAgICAgLCAke2ZpZWxkfSgke2FyZ30pIik7CisgICAgICAgIHB1c2goQGFyZ3Vt ZW50cywgIiR7YWdlbnRDbGFzc05hbWV9KiAke2FyZ30iKTsKKyAgICB9CisKKyAgICBteSAkYXJn dW1lbnRTdHJpbmcgPSBqb2luKCIsICIsIEBhcmd1bWVudHMpOworCisgICAgbXkgQGJhY2tlbmRI ZWFkOworICAgIHB1c2goQGJhY2tlbmRIZWFkLCAiICAgICR7YmFja2VuZENsYXNzTmFtZX0oJHth cmd1bWVudFN0cmluZ30pIik7CisgICAgcHVzaChAYmFja2VuZEhlYWQsIEBmaWVsZEluaXRpYWxp emVycyk7CisgICAgcHVzaChAYmFja2VuZEhlYWQsICIgICAgeyB9Iik7CisgICAgcHVzaChAYmFj a2VuZEhlYWQsICIgICAgdm9pZCByZXBvcnRQcm90b2NvbEVycm9yKGNvbnN0IGxvbmcgY2FsbElk LCBjb25zdCBTdHJpbmcmIGVycm9yVGV4dCkgY29uc3Q7Iik7CisgICAgcHVzaChAYmFja2VuZEhl YWQsICIgICAgdm9pZCBkaXNwYXRjaChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOyIpOworICAgIHB1 c2goQGJhY2tlbmRIZWFkLCAiICAgIHN0YXRpYyBib29sIGdldENvbW1hbmROYW1lKGNvbnN0IFN0 cmluZyYgbWVzc2FnZSwgU3RyaW5nKiByZXN1bHQpOyIpOworICAgICRiYWNrZW5kQ29uc3RydWN0 b3IgPSBqb2luKCJcbiIsIEBiYWNrZW5kSGVhZCk7Cit9CisKIHN1YiBmaW5pc2gKIHsKICAgICBt eSAkb2JqZWN0ID0gc2hpZnQ7CkBAIC0xMDU5LDYgKzEwODgsNyBAQCBzdWIgZmluaXNoCiAgICAg ICAgICAgICBwdXNoKEBiYWNrZW5kTWV0aG9kc0ltcGwsIGdlbmVyYXRlQXJndW1lbnRHZXR0ZXJz KCR0eXBlKSk7CiAgICAgICAgIH0KICAgICB9CisgICAgZ2VuZXJhdGVCYWNrZW5kQWdlbnRGaWVs ZHNBbmRDb25zdHJ1Y3RvcigpOwogCiAgICAgcHVzaChAYmFja2VuZE1ldGhvZHNJbXBsLCBnZW5l cmF0ZUJhY2tlbmRNZXNzYWdlUGFyc2VyKCkpOwogICAgIHB1c2goQGJhY2tlbmRNZXRob2RzSW1w bCwgIiIpOwpAQCAtMTA3MSw3ICsxMTAxLDcgQEAgc3ViIGZpbmlzaAogICAgIHVuZGVmKCRTT1VS Q0UpOwogCiAgICAgb3BlbigkSEVBREVSLCAiPiRvdXRwdXRIZWFkZXJzRGlyLyRiYWNrZW5kQ2xh c3NOYW1lLmgiKSB8fCBkaWUgIkNvdWxkbid0IG9wZW4gZmlsZSAkb3V0cHV0SGVhZGVyc0Rpci8k YmFja2VuZENsYXNzTmFtZS5oIjsKLSAgICBwcmludCAkSEVBREVSIGpvaW4oIlxuIiwgZ2VuZXJh dGVIZWFkZXIoJGJhY2tlbmRDbGFzc05hbWUsIFwlYmFja2VuZFR5cGVzLCAkYmFja2VuZENvbnN0 cnVjdG9yLCBcQGJhY2tlbmRDb25zdGFudERlY2xhcmF0aW9ucywgXEBiYWNrZW5kTWV0aG9kcywg JGJhY2tlbmRGb290ZXIpKTsKKyAgICBwcmludCAkSEVBREVSIGpvaW4oIlxuIiwgZ2VuZXJhdGVI ZWFkZXIoJGJhY2tlbmRDbGFzc05hbWUsIFwlYmFja2VuZFR5cGVzLCAkYmFja2VuZENvbnN0cnVj dG9yLCBcQGJhY2tlbmRDb25zdGFudERlY2xhcmF0aW9ucywgXEBiYWNrZW5kTWV0aG9kcywgam9p bigiXG4iLCBAYmFja2VuZEZvb3RlcikpKTsKICAgICBjbG9zZSgkSEVBREVSKTsKICAgICB1bmRl ZigkSEVBREVSKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCmluZGV4IDJmMWJlYTJlNDVhZmI1ZTFjMzAxMDFhNjRkNGExOTk2ZGZmOWZk YjEuLjU3YWU3N2JjMzI2YjgzMjgxZjhhMWQxY2UxNWU3OGY0OWI1ODEzZTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTUzLDcg KzUzLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNw ZWN0b3JDb250cm9sbGVyKFBhZ2UqIHBhZ2UsIEluc3BlY3RvckNsaWVudCogaW5zcGVjdG9yQ2xp ZW50KQogICAgIDogbV9pbnNwZWN0b3JBZ2VudChuZXcgSW5zcGVjdG9yQWdlbnQocGFnZSwgaW5z cGVjdG9yQ2xpZW50KSkKLSAgICAsIG1faW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIobmV3IElu c3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKG1faW5zcGVjdG9yQWdlbnQuZ2V0KCkpKQogICAgICwg bV9pbnNwZWN0b3JDbGllbnQoaW5zcGVjdG9yQ2xpZW50KQogICAgICwgbV9vcGVuaW5nRnJvbnRl bmQoZmFsc2UpCiB7CkBAIC0xMDUsMTIgKzEwNCw0MiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OmNvbm5lY3RGcm9udGVuZCgpCiAgICAgaWYgKCFJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 Omhhc0Zyb250ZW5kcygpKQogICAgICAgICBTY3JpcHRDb250cm9sbGVyOjpzZXRDYXB0dXJlQ2Fs bFN0YWNrRm9yVW5jYXVnaHRFeGNlcHRpb25zKHRydWUpOwogICAgIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6ZnJvbnRlbmRDcmVhdGVkKCk7CisKKyAgICBBU1NFUlQobV9pbnNwZWN0b3JDbGll bnQpOworICAgIG1faW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIgPSBuZXcgSW5zcGVjdG9yQmFj a2VuZERpc3BhdGNoZXIoCisgICAgICAgIG1faW5zcGVjdG9yQ2xpZW50LAorI2lmIEVOQUJMRShP RkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPmFwcGxp Y2F0aW9uQ2FjaGVBZ2VudCgpLAorI2VuZGlmCisjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdH RVIpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPmJyb3dzZXJEZWJ1Z2dlckFnZW50KCksCisj ZW5kaWYKKyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+Y3NzQWdlbnQoKSwKKyAgICAgICAgbV9p bnNwZWN0b3JBZ2VudC0+Y29uc29sZUFnZW50KCksCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQt PmRvbUFnZW50KCksCisjaWYgRU5BQkxFKERPTV9TVE9SQUdFKQorICAgICAgICBtX2luc3BlY3Rv ckFnZW50LT5kb21TdG9yYWdlQWdlbnQoKSwKKyNlbmRpZgorI2lmIEVOQUJMRShEQVRBQkFTRSkK KyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+ZGF0YWJhc2VBZ2VudCgpLAorI2VuZGlmCisjaWYg RU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPmRl YnVnZ2VyQWdlbnQoKSwKKyNlbmRpZgorICAgICAgICBtX2luc3BlY3RvckFnZW50LmdldCgpLAor ICAgICAgICBtX2luc3BlY3RvckFnZW50LT5yZXNvdXJjZUFnZW50KCksCisjaWYgRU5BQkxFKEpB VkFTQ1JJUFRfREVCVUdHRVIpCisgICAgICAgIG1faW5zcGVjdG9yQWdlbnQtPnByb2ZpbGVyQWdl bnQoKSwKKyNlbmRpZgorICAgICAgICBtX2luc3BlY3RvckFnZW50LT5ydW50aW1lQWdlbnQoKSwK KyAgICAgICAgbV9pbnNwZWN0b3JBZ2VudC0+dGltZWxpbmVBZ2VudCgpKTsKIH0KIAogdm9pZCBJ bnNwZWN0b3JDb250cm9sbGVyOjpkaXNjb25uZWN0RnJvbnRlbmQoKQogewogICAgIGlmICghbV9p bnNwZWN0b3JGcm9udGVuZCkKICAgICAgICAgcmV0dXJuOworICAgIG1faW5zcGVjdG9yQmFja2Vu ZERpc3BhdGNoZXIuY2xlYXIoKTsKIAogICAgIG1faW5zcGVjdG9yQWdlbnQtPmRpc2Nvbm5lY3RG cm9udGVuZCgpOwogCkBAIC0yMDMsNyArMjMyLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVy OjpzZXRJbnNwZWN0b3JFeHRlbnNpb25BUEkoY29uc3QgU3RyaW5nJiBzb3VyY2UpCiAKIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzcGF0Y2hNZXNzYWdlRnJvbUZyb250ZW5kKGNvbnN0IFN0 cmluZyYgbWVzc2FnZSkKIHsKLSAgICBtX2luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLT5kaXNw YXRjaChtZXNzYWdlKTsKKyAgICBpZiAobV9pbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcikKKyAg ICAgICAgbV9pbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci0+ZGlzcGF0Y2gobWVzc2FnZSk7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6aGlkZUhpZ2hsaWdodCgpCg==