56713 2011-03-19 13:06:11 -0700 Web Inspector: move cookie processing and appcache from DOMAgent.js 2011-03-21 00:57:25 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 370156 0 pfeldman 2011-03-19 13:06:11 -0700 Not sure how they ended up there, but they don't belong DOMAgent. 370158 1 86270 pfeldman 2011-03-19 13:10:48 -0700 Created attachment 86270 Patch 370307 2 86270 pfeldman 2011-03-21 00:57:18 -0700 Comment on attachment 86270 Patch Clearing flags on attachment: 86270 Committed r81573: <http://trac.webkit.org/changeset/81573> 370308 3 pfeldman 2011-03-21 00:57:25 -0700 All reviewed patches have been landed. Closing bug. 86270 2011-03-19 13:10:48 -0700 2011-03-21 00:57:17 -0700 Patch bug-56713-20110319231045.patch text/plain 9500 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODE1NTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4Y2IxZGFmYzlmMmZkNGQ4 ZjkyZTAyZWQ4OWYxZjhhZmIwODAyZmIwLi4xMDVmYTlkZjFlMmNkMWI4ZGFkNDhjODc2NGQwZWU0 ZjI4MWJhMmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjggQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIGNvb2tp ZSBwcm9jZXNzaW5nIGFuZCBhcHBjYWNoZSBmcm9tIERPTUFnZW50LmpzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjcxMworCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5nZXRBcHBsaWNhdGlvbkNhY2hlc0Fz eW5jKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5w cm90b3R5cGUudXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1cyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQXBwbGljYXRpb25DYWNoZURpc3BhdGNoZXIucHJvdG90eXBlLnVwZGF0ZU5ldHdvcmtT dGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llcy5nZXRDb29raWVzQXN5bmMpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvb2tpZXMuYnVpbGRDb29raWVzRnJvbVN0cmluZyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29va2llcy5jb29raWVNYXRjaGVzUmVzb3VyY2VVUkwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvb2tpZXMuY29va2llRG9tYWluTWF0Y2hlc1Jlc291cmNlRG9tYWlu KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLmV2ZW50TGlzdGVuZXJzKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5wcm90b3R5cGUudXBk YXRlKToKKworMjAxMS0wMy0xOSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBXZWIg SW5zcGVjdG9yOiBtaWdyYXRlIEluc3BlY3Rvci5qc29uIHRvIHZhbGlkIEpTT04gdHlwZXMuCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY1MQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9u Q2FjaGVJdGVtc1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Fw cGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMKaW5kZXggYjM0NTc0OTNhYmYxYzU4MTY3ZWU3ODI1 Y2IzMDM2OTc4ZmI3MWVhMC4uZjE4MTkwNzAxNzM0MDg3MmQzOGRiMTRlYjZlNjBmNTEwZTM5ODg5 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNh dGlvbkNhY2hlSXRlbXNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcwpAQCAtMjY4LDMgKzI2OCwzMyBAQCBX ZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiB9CiAK IFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGU7CisKK1dlYkluc3BlY3Rvci5BcHBsaWNh dGlvbkNhY2hlRGlzcGF0Y2hlciA9IGZ1bmN0aW9uKCkKK3sKK30KKworV2ViSW5zcGVjdG9yLkFw cGxpY2F0aW9uQ2FjaGVEaXNwYXRjaGVyLmdldEFwcGxpY2F0aW9uQ2FjaGVzQXN5bmMgPSBmdW5j dGlvbihjYWxsYmFjaykKK3sKKyAgICBmdW5jdGlvbiBteWNhbGxiYWNrKGVycm9yLCBhcHBsaWNh dGlvbkNhY2hlcykKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBDdXJyZW50bHksIHRoaXMgbGlz dCBvbmx5IHJldHVybnMgYSBzaW5nbGUgYXBwbGljYXRpb24gY2FjaGUuCisgICAgICAgIGlmICgh ZXJyb3IgJiYgYXBwbGljYXRpb25DYWNoZXMpCisgICAgICAgICAgICBjYWxsYmFjayhhcHBsaWNh dGlvbkNhY2hlcyk7CisgICAgfQorCisgICAgQXBwbGljYXRpb25DYWNoZUFnZW50LmdldEFwcGxp Y2F0aW9uQ2FjaGVzKG15Y2FsbGJhY2spOworfQorCitXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25D YWNoZURpc3BhdGNoZXIucHJvdG90eXBlID0geworICAgIHVwZGF0ZUFwcGxpY2F0aW9uQ2FjaGVT dGF0dXM6IGZ1bmN0aW9uKHN0YXR1cykKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5l bHMucmVzb3VyY2VzLnVwZGF0ZUFwcGxpY2F0aW9uQ2FjaGVTdGF0dXMoc3RhdHVzKTsKKyAgICB9 LAorCisgICAgdXBkYXRlTmV0d29ya1N0YXRlOiBmdW5jdGlvbihpc05vd09ubGluZSkKKyAgICB7 CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnVwZGF0ZU5ldHdvcmtTdGF0 ZShpc05vd09ubGluZSk7CisgICAgfQorfQorCitJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9t YWluRGlzcGF0Y2hlcigiQXBwbGljYXRpb25DYWNoZSIsIG5ldyBXZWJJbnNwZWN0b3IuQXBwbGlj YXRpb25DYWNoZURpc3BhdGNoZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCmluZGV4IGM4MTg3YmIyZWM3YThiMjIz MjU2NGYwNjU3MTdjNjgyZGUyNGZjMDkuLmFhYTQ3YzE4ZGM1NDg0ODJiZjU5MTlhNDBiYmQwMTRl ZTUzZDA3YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29va2llSXRlbXNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ29va2llSXRlbXNWaWV3LmpzCkBAIC0xOTksMyArMTk5LDU3IEBAIFdlYkluc3BlY3Rvci5T aW1wbGVDb29raWVzVGFibGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fZGF0YUdy aWQudXBkYXRlV2lkdGhzKCk7CiAgICAgfQogfQorCisKK1dlYkluc3BlY3Rvci5Db29raWVzID0g e30KKworV2ViSW5zcGVjdG9yLkNvb2tpZXMuZ2V0Q29va2llc0FzeW5jID0gZnVuY3Rpb24oY2Fs bGJhY2spCit7CisgICAgZnVuY3Rpb24gbXljYWxsYmFjayhlcnJvciwgY29va2llcywgY29va2ll c1N0cmluZykKKyAgICB7CisgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgaWYgKGNvb2tpZXNTdHJpbmcpCisgICAgICAgICAgICBjYWxsYmFjayhXZWJJbnNw ZWN0b3IuQ29va2llcy5idWlsZENvb2tpZXNGcm9tU3RyaW5nKGNvb2tpZXNTdHJpbmcpLCBmYWxz ZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNhbGxiYWNrKGNvb2tpZXMsIHRydWUpOwor ICAgIH0KKworICAgIEluc3BlY3RvckFnZW50LmdldENvb2tpZXMobXljYWxsYmFjayk7Cit9CisK K1dlYkluc3BlY3Rvci5Db29raWVzLmJ1aWxkQ29va2llc0Zyb21TdHJpbmcgPSBmdW5jdGlvbihy YXdDb29raWVTdHJpbmcpCit7CisgICAgdmFyIHJhd0Nvb2tpZXMgPSByYXdDb29raWVTdHJpbmcu c3BsaXQoLztccyovKTsKKyAgICB2YXIgY29va2llcyA9IFtdOworCisgICAgaWYgKCEoL15ccyok Ly50ZXN0KHJhd0Nvb2tpZVN0cmluZykpKSB7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg cmF3Q29va2llcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIGNvb2tpZSA9IHJhd0Nv b2tpZXNbaV07CisgICAgICAgICAgICB2YXIgZGVsaW1JbmRleCA9IGNvb2tpZS5pbmRleE9mKCI9 Iik7CisgICAgICAgICAgICB2YXIgbmFtZSA9IGNvb2tpZS5zdWJzdHJpbmcoMCwgZGVsaW1JbmRl eCk7CisgICAgICAgICAgICB2YXIgdmFsdWUgPSBjb29raWUuc3Vic3RyaW5nKGRlbGltSW5kZXgg KyAxKTsKKyAgICAgICAgICAgIHZhciBzaXplID0gbmFtZS5sZW5ndGggKyB2YWx1ZS5sZW5ndGg7 CisgICAgICAgICAgICBjb29raWVzLnB1c2goeyBuYW1lOiBuYW1lLCB2YWx1ZTogdmFsdWUsIHNp emU6IHNpemUgfSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gY29va2llczsKK30K KworV2ViSW5zcGVjdG9yLkNvb2tpZXMuY29va2llTWF0Y2hlc1Jlc291cmNlVVJMID0gZnVuY3Rp b24oY29va2llLCByZXNvdXJjZVVSTCkKK3sKKyAgICB2YXIgdXJsID0gcmVzb3VyY2VVUkwuYXNQ YXJzZWRVUkwoKTsKKyAgICBpZiAoIXVybCB8fCAhdGhpcy5jb29raWVEb21haW5NYXRjaGVzUmVz b3VyY2VEb21haW4oY29va2llLmRvbWFpbiwgdXJsLmhvc3QpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgcmV0dXJuICh1cmwucGF0aC5pbmRleE9mKGNvb2tpZS5wYXRoKSA9PT0gMAorICAg ICAgICAmJiAoIWNvb2tpZS5wb3J0IHx8IHVybC5wb3J0ID09IGNvb2tpZS5wb3J0KQorICAgICAg ICAmJiAoIWNvb2tpZS5zZWN1cmUgfHwgdXJsLnNjaGVtZSA9PT0gImh0dHBzIikpOworfQorCitX ZWJJbnNwZWN0b3IuQ29va2llcy5jb29raWVEb21haW5NYXRjaGVzUmVzb3VyY2VEb21haW4gPSBm dW5jdGlvbihjb29raWVEb21haW4sIHJlc291cmNlRG9tYWluKQoreworICAgIGlmIChjb29raWVE b21haW4uY2hhckF0KDApICE9PSAnLicpCisgICAgICAgIHJldHVybiByZXNvdXJjZURvbWFpbiA9 PT0gY29va2llRG9tYWluOworICAgIHJldHVybiAhIXJlc291cmNlRG9tYWluLm1hdGNoKG5ldyBS ZWdFeHAoIl4oW15cXC5dK1xcLik/IiArIGNvb2tpZURvbWFpbi5zdWJzdHJpbmcoMSkuZXNjYXBl Rm9yUmVnRXhwKCkgKyAiJCIpLCAiaSIpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggMjMxYjhmMzA1MzhlNThiZDEwOTRkYTVkMDFi MDg3NWU4YjE3ZmE4NC4uYTJhOWMyZGRiMTM2NWU0MmQwNjdlYTQ0MGYxMzNmOGVjMjdmMjc1OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBA IC0yMDYsNiArMjA2LDExIEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgRE9NQWdlbnQuY29weU5vZGUodGhpcy5pZCwgY2FsbGJhY2spOwogICAgIH0sCiAKKyAg ICBldmVudExpc3RlbmVyczogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICBET01B Z2VudC5nZXRFdmVudExpc3RlbmVyc0Zvck5vZGUodGhpcy5pZCwgY2FsbGJhY2spOworICAgIH0s CisKICAgICBwYXRoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgcGF0aCA9IFtdOwpA QCAtNTQwLDk1ICs1NDUsMyBAQCBXZWJJbnNwZWN0b3IuRE9NRGlzcGF0Y2hlci5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICB0aGlzLl9kb21BZ2VudC5fc2VhcmNoUmVzdWx0Q29sbGVjdG9yKG5v ZGVJZHMpOwogICAgIH0KIH0KLQotV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVEaXNwYXRj aGVyID0gZnVuY3Rpb24oKQotewotfQotCi1XZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZURp c3BhdGNoZXIuZ2V0QXBwbGljYXRpb25DYWNoZXNBc3luYyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQot ewotICAgIGZ1bmN0aW9uIG15Y2FsbGJhY2soZXJyb3IsIGFwcGxpY2F0aW9uQ2FjaGVzKQotICAg IHsKLSAgICAgICAgLy8gRklYTUU6IEN1cnJlbnRseSwgdGhpcyBsaXN0IG9ubHkgcmV0dXJucyBh IHNpbmdsZSBhcHBsaWNhdGlvbiBjYWNoZS4KLSAgICAgICAgaWYgKCFlcnJvciAmJiBhcHBsaWNh dGlvbkNhY2hlcykKLSAgICAgICAgICAgIGNhbGxiYWNrKGFwcGxpY2F0aW9uQ2FjaGVzKTsKLSAg ICB9Ci0KLSAgICBBcHBsaWNhdGlvbkNhY2hlQWdlbnQuZ2V0QXBwbGljYXRpb25DYWNoZXMobXlj YWxsYmFjayk7Ci19Ci0KLVdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0Y2hlci5w cm90b3R5cGUgPSB7Ci0gICAgdXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1czogZnVuY3Rpb24o c3RhdHVzKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMudXBk YXRlQXBwbGljYXRpb25DYWNoZVN0YXR1cyhzdGF0dXMpOwotICAgIH0sCi0KLSAgICB1cGRhdGVO ZXR3b3JrU3RhdGU6IGZ1bmN0aW9uKGlzTm93T25saW5lKQotICAgIHsKLSAgICAgICAgV2ViSW5z cGVjdG9yLnBhbmVscy5yZXNvdXJjZXMudXBkYXRlTmV0d29ya1N0YXRlKGlzTm93T25saW5lKTsK LSAgICB9Ci19Ci0KLUluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyKCJB cHBsaWNhdGlvbkNhY2hlIiwgbmV3IFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRGlzcGF0 Y2hlcigpKTsKLQotV2ViSW5zcGVjdG9yLkNvb2tpZXMgPSB7fQotCi1XZWJJbnNwZWN0b3IuQ29v a2llcy5nZXRDb29raWVzQXN5bmMgPSBmdW5jdGlvbihjYWxsYmFjaykKLXsKLSAgICBmdW5jdGlv biBteWNhbGxiYWNrKGVycm9yLCBjb29raWVzLCBjb29raWVzU3RyaW5nKQotICAgIHsKLSAgICAg ICAgaWYgKGVycm9yKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpZiAoY29va2llc1N0 cmluZykKLSAgICAgICAgICAgIGNhbGxiYWNrKFdlYkluc3BlY3Rvci5Db29raWVzLmJ1aWxkQ29v a2llc0Zyb21TdHJpbmcoY29va2llc1N0cmluZyksIGZhbHNlKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgY2FsbGJhY2soY29va2llcywgdHJ1ZSk7Ci0gICAgfQotCi0gICAgSW5zcGVjdG9y QWdlbnQuZ2V0Q29va2llcyhteWNhbGxiYWNrKTsKLX0KLQotV2ViSW5zcGVjdG9yLkNvb2tpZXMu YnVpbGRDb29raWVzRnJvbVN0cmluZyA9IGZ1bmN0aW9uKHJhd0Nvb2tpZVN0cmluZykKLXsKLSAg ICB2YXIgcmF3Q29va2llcyA9IHJhd0Nvb2tpZVN0cmluZy5zcGxpdCgvO1xzKi8pOwotICAgIHZh ciBjb29raWVzID0gW107Ci0KLSAgICBpZiAoISgvXlxzKiQvLnRlc3QocmF3Q29va2llU3RyaW5n KSkpIHsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByYXdDb29raWVzLmxlbmd0aDsgKytp KSB7Ci0gICAgICAgICAgICB2YXIgY29va2llID0gcmF3Q29va2llc1tpXTsKLSAgICAgICAgICAg IHZhciBkZWxpbUluZGV4ID0gY29va2llLmluZGV4T2YoIj0iKTsKLSAgICAgICAgICAgIHZhciBu YW1lID0gY29va2llLnN1YnN0cmluZygwLCBkZWxpbUluZGV4KTsKLSAgICAgICAgICAgIHZhciB2 YWx1ZSA9IGNvb2tpZS5zdWJzdHJpbmcoZGVsaW1JbmRleCArIDEpOwotICAgICAgICAgICAgdmFy IHNpemUgPSBuYW1lLmxlbmd0aCArIHZhbHVlLmxlbmd0aDsKLSAgICAgICAgICAgIGNvb2tpZXMu cHVzaCh7IG5hbWU6IG5hbWUsIHZhbHVlOiB2YWx1ZSwgc2l6ZTogc2l6ZSB9KTsKLSAgICAgICAg fQotICAgIH0KLQotICAgIHJldHVybiBjb29raWVzOwotfQotCi1XZWJJbnNwZWN0b3IuQ29va2ll cy5jb29raWVNYXRjaGVzUmVzb3VyY2VVUkwgPSBmdW5jdGlvbihjb29raWUsIHJlc291cmNlVVJM KQotewotICAgIHZhciB1cmwgPSByZXNvdXJjZVVSTC5hc1BhcnNlZFVSTCgpOwotICAgIGlmICgh dXJsIHx8ICF0aGlzLmNvb2tpZURvbWFpbk1hdGNoZXNSZXNvdXJjZURvbWFpbihjb29raWUuZG9t YWluLCB1cmwuaG9zdCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gKHVybC5w YXRoLmluZGV4T2YoY29va2llLnBhdGgpID09PSAwCi0gICAgICAgICYmICghY29va2llLnBvcnQg fHwgdXJsLnBvcnQgPT0gY29va2llLnBvcnQpCi0gICAgICAgICYmICghY29va2llLnNlY3VyZSB8 fCB1cmwuc2NoZW1lID09PSAiaHR0cHMiKSk7Ci19Ci0KLVdlYkluc3BlY3Rvci5Db29raWVzLmNv b2tpZURvbWFpbk1hdGNoZXNSZXNvdXJjZURvbWFpbiA9IGZ1bmN0aW9uKGNvb2tpZURvbWFpbiwg cmVzb3VyY2VEb21haW4pCi17Ci0gICAgaWYgKGNvb2tpZURvbWFpbi5jaGFyQXQoMCkgIT09ICcu JykKLSAgICAgICAgcmV0dXJuIHJlc291cmNlRG9tYWluID09PSBjb29raWVEb21haW47Ci0gICAg cmV0dXJuICEhcmVzb3VyY2VEb21haW4ubWF0Y2gobmV3IFJlZ0V4cCgiXihbXlxcLl0rXFwuKT8i ICsgY29va2llRG9tYWluLnN1YnN0cmluZygxKS5lc2NhcGVGb3JSZWdFeHAoKSArICIkIiksICJp Iik7Ci19Ci0KLVdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVycyA9IHt9Ci0KLVdlYkluc3BlY3Rv ci5FdmVudExpc3RlbmVycy5nZXRFdmVudExpc3RlbmVyc0Zvck5vZGUgPSBmdW5jdGlvbihub2Rl LCBjYWxsYmFjaykKLXsKLSAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybjsKLSAgICBET01B Z2VudC5nZXRFdmVudExpc3RlbmVyc0Zvck5vZGUobm9kZS5pZCwgY2FsbGJhY2spOwotfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVy c1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVu dExpc3RlbmVyc1NpZGViYXJQYW5lLmpzCmluZGV4IGE5MTg5OTkxNmQ1ODFlNjU4MzdjY2Q4OTlh ZjFlNDdlMGE2N2M2MTAuLjEzOTg0NGUzNjU2OGU4YjU3YzYwYzYzYTg4NjEyOTQ0OGQxNzAzMTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRMaXN0 ZW5lcnNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuanMKQEAgLTEwNCw3ICsxMDQsOCBAQCBXZWJJ bnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lcnMu Z2V0RXZlbnRMaXN0ZW5lcnNGb3JOb2RlKG5vZGUsIGNhbGxiYWNrKTsKKyAgICAgICAgaWYgKG5v ZGUpCisgICAgICAgICAgICBub2RlLmV2ZW50TGlzdGVuZXJzKGNhbGxiYWNrKTsKICAgICB9LAog CiAgICAgX2NoYW5nZVNldHRpbmc6IGZ1bmN0aW9uKGV2ZW50KQo=