94817 2012-08-23 07:58:32 -0700 Web Inspector: extract ParsedURL into a separate file. 2012-08-23 08:08:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 702990 0 pfeldman 2012-08-23 07:58:32 -0700 Patch to follow. 702995 1 160164 pfeldman 2012-08-23 08:04:45 -0700 Created attachment 160164 Patch 702997 2 pfeldman 2012-08-23 08:08:10 -0700 Committed r126426: <http://trac.webkit.org/changeset/126426> 160164 2012-08-23 08:04:45 -0700 2012-08-23 08:07:16 -0700 Patch bug-94817-20120823190441.patch text/plain 21938 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3MjkyM2JiMGM0NDk5 ZTNlNDUzMTNkOGRkMWZhNDAxOWRkZjU5ZC4uOWQ3N2U2YmNlNzI2NjBjNGIzOWRiOGQzZTI2ZjZh YmRkODJhZjNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGV4dHJhY3QgUGFyc2VkVVJMIGludG8gYSBzZXBhcmF0ZSBmaWxlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4MTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAg ICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAgICAgKiBpbnNwZWN0b3Iv Y29tcGlsZS1mcm9udC1lbmQucHk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRp dFJ1bGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNp b25zUnVsZS5wcm90b3R5cGUuZG9SdW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0UnVs ZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUuZG9SdW4uZXh0ZXJuYWxTdHlsZXNoZWV0c1JlY2Vp dmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVzLlN0eWxlc1NjcmlwdHNPcmRl clJ1bGUucHJvdG90eXBlLmRvUnVuLmNzc0JlZm9yZUlubGluZVJlY2VpdmVkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9yZXdyaXRlSHJlZik6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9QYXJzZWRVUkwuanM6IEFkZGVkLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlBhcnNlZFVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFyc2Vk VVJMLmNvbXBsZXRlVVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYXJzZWRVUkwucHJvdG90 eXBlLmdldCBkaXNwbGF5TmFtZSk6CisgICAgICAgIChTdHJpbmcucHJvdG90eXBlLmFzUGFyc2Vk VVJMKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxGb3JSZWxhdGVkTm9kZSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnVwZGF0ZVRpdGxl LmxpbmtpZnlVUkwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYzoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgorCiAyMDEyLTA4 LTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLiBGaXggbWFrZSBkaXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggOGZj NTc4Njg2OWVlNzMwODY3NjgxZjJiNWI5MDU2OGNlYTNhNTBhNC4uMmJhOTY0NGFkODkwYjJlZWYz ZDE1MTIzYmEyODNmY2VlZjlkOTUwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNjM0Niw2ICs2MzQ2 LDcgQEAKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNT ZWN0aW9uLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzJywK ICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsRW5hYmxlclZpZXcuanMnLAor ICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvUGFyc2VkVVJMLmpzJywKICAgICAgICAg ICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1BsYWNhcmQuanMnLAogICAgICAgICAgICAgJ2luc3Bl Y3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250 LWVuZC9QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZUhlbHBlci5qcycsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDkwNTYxYTdhYTg2YjM4ZDI1 M2EyNTgzOTA2OTEzMjBkMjgzNGIxYzQuLmUyMTI0ODM1YTRmMTQxNTBmZGZhY2FhMGU2MWQ1MDg0 YjA4ZGJhOTAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNv cmUudmNwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNw cm9qCkBAIC03NjE4Niw2ICs3NjE4NiwxMCBAQAogCQkJCQk+CiAJCQkJPC9GaWxlPgogCQkJCTxG aWxlCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxQYXJzZWRVUkwu anMiCisJCQkJCT4KKwkJCQk8L0ZpbGU+CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIu LlxpbnNwZWN0b3JcZnJvbnQtZW5kXHBhbmVsRW5hYmxlclZpZXcuY3NzIgogCQkJCQk+CiAJCQkJ PC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJv bnQtZW5kLnB5IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5 CmluZGV4IDQ0OTEzMTkzNjYzOGI2ZTMxMmFiZDk0NGI4ZTNhMjY4ZmIyMjEzZjMuLmNjZDM3NmQx ZDRlMjA0NGYyODZmMjI5ZTE1ZTU1NTg2YTU4NTkxZjMgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weQorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKQEAgLTQ1LDYgKzQ1LDcgQEAgbW9kdWxlcyA9 IFsKICAgICAgICAgInNvdXJjZXMiOiBbCiAgICAgICAgICAgICAiQ29sb3IuanMiLAogICAgICAg ICAgICAgIk9iamVjdC5qcyIsCisgICAgICAgICAgICAiUGFyc2VkVVJMLmpzIiwKICAgICAgICAg ICAgICJTZXR0aW5ncy5qcyIsCiAgICAgICAgICAgICAiVUlTdHJpbmcuanMiLAogICAgICAgICAg ICAgIlVzZXJNZXRyaWNzLmpzIiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQXVkaXRSdWxlcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQXVkaXRSdWxlcy5qcwppbmRleCA5Y2RkOTgyMjIzOTA1ZDQzYzU4ZTQ0NThmNWQ0MmE1 MmY5NThhNzllLi4wNGVmYmRiMTE1MDMyMjRhMzJkNmVmZGY4MGI5NGI2ZmJmNTVmNDVlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0UnVsZXMuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdFJ1bGVzLmpzCkBA IC03MTgsNyArNzE4LDcgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0UnVsZXMuSW1hZ2VEaW1lbnNpb25z UnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoIXNyYy5hc1BhcnNlZFVSTCgpKSB7 CiAgICAgICAgICAgICAgICAgZm9yICh2YXIgZnJhbWVPd25lckNhbmRpZGF0ZSA9IG5vZGU7IGZy YW1lT3duZXJDYW5kaWRhdGU7IGZyYW1lT3duZXJDYW5kaWRhdGUgPSBmcmFtZU93bmVyQ2FuZGlk YXRlLnBhcmVudE5vZGUpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKGZyYW1lT3duZXJDYW5k aWRhdGUuZG9jdW1lbnRVUkwpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBjb21wbGV0 ZVNyYyA9IFdlYkluc3BlY3Rvci5jb21wbGV0ZVVSTChmcmFtZU93bmVyQ2FuZGlkYXRlLmRvY3Vt ZW50VVJMLCBzcmMpOworICAgICAgICAgICAgICAgICAgICAgICAgdmFyIGNvbXBsZXRlU3JjID0g V2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChmcmFtZU93bmVyQ2FuZGlkYXRlLmRv Y3VtZW50VVJMLCBzcmMpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CkBAIC04NTgsNyArODU4LDcgQEAgV2Vi SW5zcGVjdG9yLkF1ZGl0UnVsZXMuQ3NzSW5IZWFkUnVsZS5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAgICAgdmFyIGV4dGVybmFsU3R5bGVzaGVldEhyZWZzID0gW107CiAgICAgICAgICAgICAg ICAgZm9yICh2YXIgaiA9IDA7IGogPCBleHRlcm5hbFN0eWxlc2hlZXROb2RlSWRzLmxlbmd0aDsg KytqKSB7CiAgICAgICAgICAgICAgICAgICAgIHZhciBsaW5rTm9kZSA9IFdlYkluc3BlY3Rvci5k b21BZ2VudC5ub2RlRm9ySWQoZXh0ZXJuYWxTdHlsZXNoZWV0Tm9kZUlkc1tqXSk7Ci0gICAgICAg ICAgICAgICAgICAgIHZhciBjb21wbGV0ZUhyZWYgPSBXZWJJbnNwZWN0b3IuY29tcGxldGVVUkwo bGlua05vZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCwgbGlua05vZGUuZ2V0QXR0cmlidXRl KCJocmVmIikpOworICAgICAgICAgICAgICAgICAgICB2YXIgY29tcGxldGVIcmVmID0gV2ViSW5z cGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChsaW5rTm9kZS5vd25lckRvY3VtZW50LmRvY3Vt ZW50VVJMLCBsaW5rTm9kZS5nZXRBdHRyaWJ1dGUoImhyZWYiKSk7CiAgICAgICAgICAgICAgICAg ICAgIGV4dGVybmFsU3R5bGVzaGVldEhyZWZzLnB1c2goY29tcGxldGVIcmVmIHx8ICI8ZW1wdHk+ Iik7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHVybFRvVmlvbGF0aW9uc0Fy cmF5W3Jvb3QuZG9jdW1lbnRVUkxdID0gW2lubGluZVN0eWxlTm9kZUlkcy5sZW5ndGgsIGV4dGVy bmFsU3R5bGVzaGVldEhyZWZzXTsKQEAgLTkzOSw3ICs5MzksNyBAQCBXZWJJbnNwZWN0b3IuQXVk aXRSdWxlcy5TdHlsZXNTY3JpcHRzT3JkZXJSdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICB2YXIgbGF0ZVN0eWxlVXJscyA9IFtdOwogICAgICAgICAgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgbGF0ZVN0eWxlSWRzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAgICAg IHZhciBsYXRlU3R5bGVOb2RlID0gV2ViSW5zcGVjdG9yLmRvbUFnZW50Lm5vZGVGb3JJZChsYXRl U3R5bGVJZHNbaV0pOwotICAgICAgICAgICAgICAgICAgICB2YXIgY29tcGxldGVIcmVmID0gV2Vi SW5zcGVjdG9yLmNvbXBsZXRlVVJMKGxhdGVTdHlsZU5vZGUub3duZXJEb2N1bWVudC5kb2N1bWVu dFVSTCwgbGF0ZVN0eWxlTm9kZS5nZXRBdHRyaWJ1dGUoImhyZWYiKSk7CisgICAgICAgICAgICAg ICAgICAgIHZhciBjb21wbGV0ZUhyZWYgPSBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMLmNvbXBsZXRl VVJMKGxhdGVTdHlsZU5vZGUub3duZXJEb2N1bWVudC5kb2N1bWVudFVSTCwgbGF0ZVN0eWxlTm9k ZS5nZXRBdHRyaWJ1dGUoImhyZWYiKSk7CiAgICAgICAgICAgICAgICAgICAgIGxhdGVTdHlsZVVy bHMucHVzaChjb21wbGV0ZUhyZWYgfHwgIjxlbXB0eT4iKTsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgcmVzdWx0ID0gWyBsYXRlU3R5bGVVcmxzLCBjc3NCZWZvcmVJbmxpbmVD b3VudCBdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWZhdWx0VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMKaW5kZXggOTE3OTE0ZDljNWIwMDc4YjA4ZmFhYmI2NTFhNWM0 ZTdjNGU3MGQ1Yy4uMGI1Njk4MGQxODg0YmVjZmU0MjdiNjhlZmI3NTk5ZDg1MGI5MWQ1YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRU ZXh0RWRpdG9yLmpzCkBAIC0yMTEwLDcgKzIxMTAsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3VybCB8 fCAhaHJlZlZhbHVlIHx8IGhyZWZWYWx1ZS5pbmRleE9mKCI6Ly8iKSA+IDApCiAgICAgICAgICAg ICByZXR1cm4gaHJlZlZhbHVlOwotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmNvbXBsZXRl VVJMKHRoaXMuX3VybCwgaHJlZlZhbHVlKTsKKyAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5Q YXJzZWRVUkwuY29tcGxldGVVUkwodGhpcy5fdXJsLCBocmVmVmFsdWUpOwogICAgIH0sCiAKICAg ICBfaGFuZGxlRE9NVXBkYXRlczogZnVuY3Rpb24oZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFyc2VkVVJMLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9QYXJzZWRVUkwuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTA1YTRjMzk4ZTAyOTEw ZTA0Mzk5YmJiYzk3ODEzMGY1YWFjMDVhYwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFyc2VkVVJMLmpzCkBAIC0wLDAgKzEsMTc2IEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogMS4g UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyAqCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBHT09HTEUg SU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRI RSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgor ICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IEdPT0dMRSBJTkMuCisgKiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwK KyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge3N0cmluZ30g dXJsCisgKi8KK1dlYkluc3BlY3Rvci5QYXJzZWRVUkwgPSBmdW5jdGlvbih1cmwpCit7CisgICAg dGhpcy5pc1ZhbGlkID0gZmFsc2U7CisgICAgdGhpcy51cmwgPSB1cmw7CisgICAgdGhpcy5zY2hl bWUgPSAiIjsKKyAgICB0aGlzLmhvc3QgPSAiIjsKKyAgICB0aGlzLnBvcnQgPSAiIjsKKyAgICB0 aGlzLnBhdGggPSAiIjsKKyAgICB0aGlzLnF1ZXJ5UGFyYW1zID0gIiI7CisgICAgdGhpcy5mcmFn bWVudCA9ICIiOworICAgIHRoaXMuZm9sZGVyUGF0aENvbXBvbmVudHMgPSAiIjsKKyAgICB0aGlz Lmxhc3RQYXRoQ29tcG9uZW50ID0gIiI7CisKKyAgICAvLyBSZWdFeHAgZ3JvdXBzOgorICAgIC8v IDEgLSBzY2hlbWUKKyAgICAvLyAyIC0gaG9zdG5hbWUKKyAgICAvLyAzIC0gP3BvcnQKKyAgICAv LyA0IC0gP3BhdGgKKyAgICAvLyA1IC0gP2ZyYWdtZW50CisgICAgdmFyIG1hdGNoID0gdXJsLm1h dGNoKC9eKFteOl0rKTpcL1wvKFteXC86XSopKD86OihbXGRdKykpPyg/OihcL1teI10qKSg/OiMo LiopKT8pPyQvaSk7CisgICAgaWYgKG1hdGNoKSB7CisgICAgICAgIHRoaXMuaXNWYWxpZCA9IHRy dWU7CisgICAgICAgIHRoaXMuc2NoZW1lID0gbWF0Y2hbMV0udG9Mb3dlckNhc2UoKTsKKyAgICAg ICAgdGhpcy5ob3N0ID0gbWF0Y2hbMl07CisgICAgICAgIHRoaXMucG9ydCA9IG1hdGNoWzNdOwor ICAgICAgICB0aGlzLnBhdGggPSBtYXRjaFs0XSB8fCAiLyI7CisgICAgICAgIHRoaXMuZnJhZ21l bnQgPSBtYXRjaFs1XTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAodGhpcy51cmwuc3RhcnRz V2l0aCgiZGF0YToiKSkgeworICAgICAgICAgICAgdGhpcy5zY2hlbWUgPSAiZGF0YSI7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRoaXMudXJsID09PSAiYWJv dXQ6YmxhbmsiKSB7CisgICAgICAgICAgICB0aGlzLnNjaGVtZSA9ICJhYm91dCI7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5wYXRoID0gdGhpcy51cmw7Cisg ICAgfQorCisgICAgaWYgKHRoaXMucGF0aCkgeworICAgICAgICAvLyBGaXJzdCBjdXQgdGhlIHF1 ZXJ5IHBhcmFtcy4KKyAgICAgICAgdmFyIHBhdGggPSB0aGlzLnBhdGg7CisgICAgICAgIHZhciBp bmRleE9mUXVlcnkgPSBwYXRoLmluZGV4T2YoIj8iKTsKKyAgICAgICAgaWYgKGluZGV4T2ZRdWVy eSAhPT0gLTEpIHsKKyAgICAgICAgICAgIHRoaXMucXVlcnlQYXJhbXMgPSBwYXRoLnN1YnN0cmlu ZyhpbmRleE9mUXVlcnkgKyAxKQorICAgICAgICAgICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKDAs IGluZGV4T2ZRdWVyeSk7CisgICAgICAgIH0KKworICAgICAgICAvLyBUaGVuIHRha2UgbGFzdCBw YXRoIGNvbXBvbmVudC4KKyAgICAgICAgdmFyIGxhc3RTbGFzaEluZGV4ID0gcGF0aC5sYXN0SW5k ZXhPZigiLyIpOworICAgICAgICBpZiAobGFzdFNsYXNoSW5kZXggIT09IC0xKSB7CisgICAgICAg ICAgICB0aGlzLmZvbGRlclBhdGhDb21wb25lbnRzID0gcGF0aC5zdWJzdHJpbmcoMCwgbGFzdFNs YXNoSW5kZXgpOworICAgICAgICAgICAgdGhpcy5sYXN0UGF0aENvbXBvbmVudCA9IHBhdGguc3Vi c3RyaW5nKGxhc3RTbGFzaEluZGV4ICsgMSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAg dGhpcy5sYXN0UGF0aENvbXBvbmVudCA9IHBhdGg7CisgICAgfQorfQorCisvKioKKyAqIEBwYXJh bSB7c3RyaW5nfSBiYXNlVVJMCisgKiBAcGFyYW0ge3N0cmluZ30gaHJlZgorICogQHJldHVybiB7 P3N0cmluZ30KKyAqLworV2ViSW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTCA9IGZ1bmN0 aW9uKGJhc2VVUkwsIGhyZWYpCit7CisgICAgaWYgKGhyZWYpIHsKKyAgICAgICAgLy8gUmV0dXJu IGFic29sdXRlIFVSTHMgYXMtaXMuCisgICAgICAgIHZhciBwYXJzZWRIcmVmID0gaHJlZi5hc1Bh cnNlZFVSTCgpOworICAgICAgICBpZiAocGFyc2VkSHJlZiAmJiBwYXJzZWRIcmVmLnNjaGVtZSkK KyAgICAgICAgICAgIHJldHVybiBocmVmOworCisgICAgICAgIC8vIFJldHVybiBzcGVjaWFsIFVS THMgYXMtaXMuCisgICAgICAgIHZhciB0cmltbWVkSHJlZiA9IGhyZWYudHJpbSgpOworICAgICAg ICBpZiAodHJpbW1lZEhyZWYuc3RhcnRzV2l0aCgiZGF0YToiKSB8fCB0cmltbWVkSHJlZi5zdGFy dHNXaXRoKCJqYXZhc2NyaXB0OiIpIHx8IHRyaW1tZWRIcmVmLnN0YXJ0c1dpdGgoImJsb2I6Iikp CisgICAgICAgICAgICByZXR1cm4gaHJlZjsKKyAgICB9CisKKyAgICB2YXIgcGFyc2VkVVJMID0g YmFzZVVSTC5hc1BhcnNlZFVSTCgpOworICAgIGlmIChwYXJzZWRVUkwpIHsKKyAgICAgICAgdmFy IHBhdGggPSBocmVmOworICAgICAgICBpZiAocGF0aC5jaGFyQXQoMCkgIT09ICIvIikgeworICAg ICAgICAgICAgdmFyIGJhc2VQYXRoID0gcGFyc2VkVVJMLnBhdGg7CisKKyAgICAgICAgICAgIC8v IFRyaW0gb2ZmIHRoZSBxdWVyeSBwYXJ0IG9mIHRoZSBiYXNlUGF0aC4KKyAgICAgICAgICAgIHZh ciBxdWVzdGlvbk1hcmtJbmRleCA9IGJhc2VQYXRoLmluZGV4T2YoIj8iKTsKKyAgICAgICAgICAg IGlmIChxdWVzdGlvbk1hcmtJbmRleCA+IDApCisgICAgICAgICAgICAgICAgYmFzZVBhdGggPSBi YXNlUGF0aC5zdWJzdHJpbmcoMCwgcXVlc3Rpb25NYXJrSW5kZXgpOworICAgICAgICAgICAgLy8g QSBocmVmIG9mICI/Zm9vPWJhciIgaW1wbGllcyAiYmFzZVBhdGg/Zm9vPWJhciIuCisgICAgICAg ICAgICAvLyBXaXRoICJiYXNlUGF0aD9hPWIiIGFuZCAiP2Zvbz1iYXIiIHdlIHNob3VsZCBnZXQg ImJhc2VQYXRoP2Zvbz1iYXIiLgorICAgICAgICAgICAgdmFyIHByZWZpeDsKKyAgICAgICAgICAg IGlmIChwYXRoLmNoYXJBdCgwKSA9PT0gIj8iKSB7CisgICAgICAgICAgICAgICAgdmFyIGJhc2VQ YXRoQ3V0SW5kZXggPSBiYXNlUGF0aC5pbmRleE9mKCI/Iik7CisgICAgICAgICAgICAgICAgaWYg KGJhc2VQYXRoQ3V0SW5kZXggIT09IC0xKQorICAgICAgICAgICAgICAgICAgICBwcmVmaXggPSBi YXNlUGF0aC5zdWJzdHJpbmcoMCwgYmFzZVBhdGhDdXRJbmRleCk7CisgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICBwcmVmaXggPSBiYXNlUGF0aDsKKyAgICAgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgICAgIHByZWZpeCA9IGJhc2VQYXRoLnN1YnN0cmluZygwLCBi YXNlUGF0aC5sYXN0SW5kZXhPZigiLyIpKSArICIvIjsKKworICAgICAgICAgICAgcGF0aCA9IHBy ZWZpeCArIHBhdGg7CisgICAgICAgIH0gZWxzZSBpZiAocGF0aC5sZW5ndGggPiAxICYmIHBhdGgu Y2hhckF0KDEpID09PSAiLyIpIHsKKyAgICAgICAgICAgIC8vIGhyZWYgc3RhcnRzIHdpdGggIi8v IiB3aGljaCBpcyBhIGZ1bGwgVVJMIHdpdGggdGhlIHByb3RvY29sIGRyb3BwZWQgKHVzZSB0aGUg YmFzZVVSTCBwcm90b2NvbCkuCisgICAgICAgICAgICByZXR1cm4gcGFyc2VkVVJMLnNjaGVtZSAr ICI6IiArIHBhdGg7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHBhcnNlZFVSTC5zY2hlbWUg KyAiOi8vIiArIHBhcnNlZFVSTC5ob3N0ICsgKHBhcnNlZFVSTC5wb3J0ID8gKCI6IiArIHBhcnNl ZFVSTC5wb3J0KSA6ICIiKSArIHBhdGg7CisgICAgfQorICAgIHJldHVybiBudWxsOworfQorCitX ZWJJbnNwZWN0b3IuUGFyc2VkVVJMLnByb3RvdHlwZSA9IHsKKyAgICBnZXQgZGlzcGxheU5hbWUo KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2Rpc3BsYXlOYW1lKQorICAgICAgICAgICAgcmV0 dXJuIHRoaXMuX2Rpc3BsYXlOYW1lOworCisgICAgICAgIGlmICh0aGlzLnNjaGVtZSA9PT0gImRh dGEiKSB7CisgICAgICAgICAgICB0aGlzLl9kaXNwbGF5TmFtZSA9IHRoaXMudXJsLnRyaW1FbmQo MjApOworICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1lOworICAgICAgICB9CisK KyAgICAgICAgaWYgKHRoaXMudXJsID09PSAiYWJvdXQ6YmxhbmsiKQorICAgICAgICAgICAgcmV0 dXJuIHRoaXMudXJsOworCisgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy5sYXN0UGF0 aENvbXBvbmVudDsKKyAgICAgICAgaWYgKCF0aGlzLl9kaXNwbGF5TmFtZSkKKyAgICAgICAgICAg IHRoaXMuX2Rpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLmRpc3BsYXlEb21haW4odGhpcy5ob3N0 KTsKKyAgICAgICAgaWYgKCF0aGlzLl9kaXNwbGF5TmFtZSAmJiB0aGlzLnVybCkKKyAgICAgICAg ICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy51cmwudHJpbVVSTChXZWJJbnNwZWN0b3IuaW5z cGVjdGVkUGFnZURvbWFpbiA/IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQYWdlRG9tYWluIDogIiIp OworICAgICAgICBpZiAodGhpcy5fZGlzcGxheU5hbWUgPT09ICIvIikKKyAgICAgICAgICAgIHRo aXMuX2Rpc3BsYXlOYW1lID0gdGhpcy51cmw7CisgICAgICAgIHJldHVybiB0aGlzLl9kaXNwbGF5 TmFtZTsKKyAgICB9Cit9CisKKy8qKgorICogQHJldHVybiB7P1dlYkluc3BlY3Rvci5QYXJzZWRV Ukx9CisgKi8KK1N0cmluZy5wcm90b3R5cGUuYXNQYXJzZWRVUkwgPSBmdW5jdGlvbigpCit7Cisg ICAgdmFyIHBhcnNlZFVSTCA9IG5ldyBXZWJJbnNwZWN0b3IuUGFyc2VkVVJMKHRoaXMudG9TdHJp bmcoKSk7CisgICAgaWYgKHBhcnNlZFVSTC5pc1ZhbGlkKQorICAgICAgICByZXR1cm4gcGFyc2Vk VVJMOworICAgIHJldHVybiBudWxsOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCmluZGV4IDE0MTI4MTVhM2U2NDdlM2E3OGFj YjMzYmM1ODg4MmY1NDYyZTRjMWUuLjU0OTA5YzczMDU2NjE0ZjI5ODk1ZmI4OTRlNTIwNWJkMDll YTc2ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VVdGlscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVXRpbHMuanMKQEAgLTI5LDEwMyArMjksNiBAQAogICovCiAKIC8qKgotICogQGNvbnN0 cnVjdG9yCi0gKiBAcGFyYW0ge3N0cmluZ30gdXJsCi0gKi8KLVdlYkluc3BlY3Rvci5QYXJzZWRV UkwgPSBmdW5jdGlvbih1cmwpCi17Ci0gICAgdGhpcy5pc1ZhbGlkID0gZmFsc2U7Ci0gICAgdGhp cy51cmwgPSB1cmw7Ci0gICAgdGhpcy5zY2hlbWUgPSAiIjsKLSAgICB0aGlzLmhvc3QgPSAiIjsK LSAgICB0aGlzLnBvcnQgPSAiIjsKLSAgICB0aGlzLnBhdGggPSAiIjsKLSAgICB0aGlzLnF1ZXJ5 UGFyYW1zID0gIiI7Ci0gICAgdGhpcy5mcmFnbWVudCA9ICIiOwotICAgIHRoaXMuZm9sZGVyUGF0 aENvbXBvbmVudHMgPSAiIjsKLSAgICB0aGlzLmxhc3RQYXRoQ29tcG9uZW50ID0gIiI7Ci0KLSAg ICAvLyBSZWdFeHAgZ3JvdXBzOgotICAgIC8vIDEgLSBzY2hlbWUKLSAgICAvLyAyIC0gaG9zdG5h bWUKLSAgICAvLyAzIC0gP3BvcnQKLSAgICAvLyA0IC0gP3BhdGgKLSAgICAvLyA1IC0gP2ZyYWdt ZW50Ci0gICAgdmFyIG1hdGNoID0gdXJsLm1hdGNoKC9eKFteOl0rKTpcL1wvKFteXC86XSopKD86 OihbXGRdKykpPyg/OihcL1teI10qKSg/OiMoLiopKT8pPyQvaSk7Ci0gICAgaWYgKG1hdGNoKSB7 Ci0gICAgICAgIHRoaXMuaXNWYWxpZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuc2NoZW1lID0gbWF0 Y2hbMV0udG9Mb3dlckNhc2UoKTsKLSAgICAgICAgdGhpcy5ob3N0ID0gbWF0Y2hbMl07Ci0gICAg ICAgIHRoaXMucG9ydCA9IG1hdGNoWzNdOwotICAgICAgICB0aGlzLnBhdGggPSBtYXRjaFs0XSB8 fCAiLyI7Ci0gICAgICAgIHRoaXMuZnJhZ21lbnQgPSBtYXRjaFs1XTsKLSAgICB9IGVsc2Ugewot ICAgICAgICBpZiAodGhpcy51cmwuc3RhcnRzV2l0aCgiZGF0YToiKSkgewotICAgICAgICAgICAg dGhpcy5zY2hlbWUgPSAiZGF0YSI7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAg ICAgICAgaWYgKHRoaXMudXJsID09PSAiYWJvdXQ6YmxhbmsiKSB7Ci0gICAgICAgICAgICB0aGlz LnNjaGVtZSA9ICJhYm91dCI7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAg ICAgdGhpcy5wYXRoID0gdGhpcy51cmw7Ci0gICAgfQotCi0gICAgaWYgKHRoaXMucGF0aCkgewot ICAgICAgICAvLyBGaXJzdCBjdXQgdGhlIHF1ZXJ5IHBhcmFtcy4KLSAgICAgICAgdmFyIHBhdGgg PSB0aGlzLnBhdGg7Ci0gICAgICAgIHZhciBpbmRleE9mUXVlcnkgPSBwYXRoLmluZGV4T2YoIj8i KTsKLSAgICAgICAgaWYgKGluZGV4T2ZRdWVyeSAhPT0gLTEpIHsKLSAgICAgICAgICAgIHRoaXMu cXVlcnlQYXJhbXMgPSBwYXRoLnN1YnN0cmluZyhpbmRleE9mUXVlcnkgKyAxKQotICAgICAgICAg ICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVyeSk7Ci0gICAgICAgIH0KLQot ICAgICAgICAvLyBUaGVuIHRha2UgbGFzdCBwYXRoIGNvbXBvbmVudC4KLSAgICAgICAgdmFyIGxh c3RTbGFzaEluZGV4ID0gcGF0aC5sYXN0SW5kZXhPZigiLyIpOwotICAgICAgICBpZiAobGFzdFNs YXNoSW5kZXggIT09IC0xKSB7Ci0gICAgICAgICAgICB0aGlzLmZvbGRlclBhdGhDb21wb25lbnRz ID0gcGF0aC5zdWJzdHJpbmcoMCwgbGFzdFNsYXNoSW5kZXgpOwotICAgICAgICAgICAgdGhpcy5s YXN0UGF0aENvbXBvbmVudCA9IHBhdGguc3Vic3RyaW5nKGxhc3RTbGFzaEluZGV4ICsgMSk7Ci0g ICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdGhpcy5sYXN0UGF0aENvbXBvbmVudCA9IHBhdGg7 Ci0gICAgfQotfQotCi1XZWJJbnNwZWN0b3IuUGFyc2VkVVJMLnByb3RvdHlwZSA9IHsKLSAgICBn ZXQgZGlzcGxheU5hbWUoKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2Rpc3BsYXlOYW1lKQot ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1lOwotCi0gICAgICAgIGlmICh0aGlz LnNjaGVtZSA9PT0gImRhdGEiKSB7Ci0gICAgICAgICAgICB0aGlzLl9kaXNwbGF5TmFtZSA9IHRo aXMudXJsLnRyaW1FbmQoMjApOwotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1l OwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKHRoaXMudXJsID09PSAiYWJvdXQ6YmxhbmsiKQot ICAgICAgICAgICAgcmV0dXJuIHRoaXMudXJsOwotCi0gICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1l ID0gdGhpcy5sYXN0UGF0aENvbXBvbmVudDsKLSAgICAgICAgaWYgKCF0aGlzLl9kaXNwbGF5TmFt ZSkKLSAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLmRpc3BsYXlE b21haW4odGhpcy5ob3N0KTsKLSAgICAgICAgaWYgKCF0aGlzLl9kaXNwbGF5TmFtZSAmJiB0aGlz LnVybCkKLSAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy51cmwudHJpbVVSTChX ZWJJbnNwZWN0b3IuaW5zcGVjdGVkUGFnZURvbWFpbiA/IFdlYkluc3BlY3Rvci5pbnNwZWN0ZWRQ YWdlRG9tYWluIDogIiIpOwotICAgICAgICBpZiAodGhpcy5fZGlzcGxheU5hbWUgPT09ICIvIikK LSAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gdGhpcy51cmw7Ci0gICAgICAgIHJldHVy biB0aGlzLl9kaXNwbGF5TmFtZTsKLSAgICB9Ci19Ci0vKioKLSAqIEByZXR1cm4gez9XZWJJbnNw ZWN0b3IuUGFyc2VkVVJMfQotICovCi1TdHJpbmcucHJvdG90eXBlLmFzUGFyc2VkVVJMID0gZnVu Y3Rpb24oKQotewotICAgIHZhciBwYXJzZWRVUkwgPSBuZXcgV2ViSW5zcGVjdG9yLlBhcnNlZFVS TCh0aGlzLnRvU3RyaW5nKCkpOwotICAgIGlmIChwYXJzZWRVUkwuaXNWYWxpZCkKLSAgICAgICAg cmV0dXJuIHBhcnNlZFVSTDsKLSAgICByZXR1cm4gbnVsbDsKLX0KLQotLyoqCiAgKiBAcGFyYW0g e3N0cmluZ30gdXJsCiAgKiBAcmV0dXJuIHs/V2ViSW5zcGVjdG9yLlJlc291cmNlfQogICovCkBA IC0zNDcsNyArMjUwLDcgQEAgV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMRm9yUmVsYXRlZE5vZGUg PSBmdW5jdGlvbihub2RlLCB1cmwpCiAKICAgICBmb3IgKHZhciBmcmFtZU93bmVyQ2FuZGlkYXRl ID0gbm9kZTsgZnJhbWVPd25lckNhbmRpZGF0ZTsgZnJhbWVPd25lckNhbmRpZGF0ZSA9IGZyYW1l T3duZXJDYW5kaWRhdGUucGFyZW50Tm9kZSkgewogICAgICAgICBpZiAoZnJhbWVPd25lckNhbmRp ZGF0ZS5kb2N1bWVudFVSTCkgewotICAgICAgICAgICAgdmFyIHJlc3VsdCA9IFdlYkluc3BlY3Rv ci5jb21wbGV0ZVVSTChmcmFtZU93bmVyQ2FuZGlkYXRlLmRvY3VtZW50VVJMLCB1cmwpOworICAg ICAgICAgICAgdmFyIHJlc3VsdCA9IFdlYkluc3BlY3Rvci5QYXJzZWRVUkwuY29tcGxldGVVUkwo ZnJhbWVPd25lckNhbmRpZGF0ZS5kb2N1bWVudFVSTCwgdXJsKTsKICAgICAgICAgICAgIGlmIChy ZXN1bHQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAgICAgIGJyZWFr OwpAQCAtMzY2LDU0ICsyNjksMyBAQCBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxGb3JSZWxhdGVk Tm9kZSA9IGZ1bmN0aW9uKG5vZGUsIHVybCkKICAgICBXZWJJbnNwZWN0b3IuZm9yQWxsUmVzb3Vy Y2VzKGNhbGxiYWNrKTsKICAgICByZXR1cm4gcmVzb3VyY2VVUkw7CiB9Ci0KLS8qKgotICogQHBh cmFtIHtzdHJpbmd9IGJhc2VVUkwKLSAqIEBwYXJhbSB7c3RyaW5nfSBocmVmCi0gKiBAcmV0dXJu IHs/c3RyaW5nfQotICovCi1XZWJJbnNwZWN0b3IuY29tcGxldGVVUkwgPSBmdW5jdGlvbihiYXNl VVJMLCBocmVmKQotewotICAgIGlmIChocmVmKSB7Ci0gICAgICAgIC8vIFJldHVybiBhYnNvbHV0 ZSBVUkxzIGFzLWlzLgotICAgICAgICB2YXIgcGFyc2VkSHJlZiA9IGhyZWYuYXNQYXJzZWRVUkwo KTsKLSAgICAgICAgaWYgKHBhcnNlZEhyZWYgJiYgcGFyc2VkSHJlZi5zY2hlbWUpCi0gICAgICAg ICAgICByZXR1cm4gaHJlZjsKLQotICAgICAgICAvLyBSZXR1cm4gc3BlY2lhbCBVUkxzIGFzLWlz LgotICAgICAgICB2YXIgdHJpbW1lZEhyZWYgPSBocmVmLnRyaW0oKTsKLSAgICAgICAgaWYgKHRy aW1tZWRIcmVmLnN0YXJ0c1dpdGgoImRhdGE6IikgfHwgdHJpbW1lZEhyZWYuc3RhcnRzV2l0aCgi amF2YXNjcmlwdDoiKSB8fCB0cmltbWVkSHJlZi5zdGFydHNXaXRoKCJibG9iOiIpKQotICAgICAg ICAgICAgcmV0dXJuIGhyZWY7Ci0gICAgfQotCi0gICAgdmFyIHBhcnNlZFVSTCA9IGJhc2VVUkwu YXNQYXJzZWRVUkwoKTsKLSAgICBpZiAocGFyc2VkVVJMKSB7Ci0gICAgICAgIHZhciBwYXRoID0g aHJlZjsKLSAgICAgICAgaWYgKHBhdGguY2hhckF0KDApICE9PSAiLyIpIHsKLSAgICAgICAgICAg IHZhciBiYXNlUGF0aCA9IHBhcnNlZFVSTC5wYXRoOwotCi0gICAgICAgICAgICAvLyBUcmltIG9m ZiB0aGUgcXVlcnkgcGFydCBvZiB0aGUgYmFzZVBhdGguCi0gICAgICAgICAgICB2YXIgcXVlc3Rp b25NYXJrSW5kZXggPSBiYXNlUGF0aC5pbmRleE9mKCI/Iik7Ci0gICAgICAgICAgICBpZiAocXVl c3Rpb25NYXJrSW5kZXggPiAwKQotICAgICAgICAgICAgICAgIGJhc2VQYXRoID0gYmFzZVBhdGgu c3Vic3RyaW5nKDAsIHF1ZXN0aW9uTWFya0luZGV4KTsKLSAgICAgICAgICAgIC8vIEEgaHJlZiBv ZiAiP2Zvbz1iYXIiIGltcGxpZXMgImJhc2VQYXRoP2Zvbz1iYXIiLgotICAgICAgICAgICAgLy8g V2l0aCAiYmFzZVBhdGg/YT1iIiBhbmQgIj9mb289YmFyIiB3ZSBzaG91bGQgZ2V0ICJiYXNlUGF0 aD9mb289YmFyIi4KLSAgICAgICAgICAgIHZhciBwcmVmaXg7Ci0gICAgICAgICAgICBpZiAocGF0 aC5jaGFyQXQoMCkgPT09ICI/IikgewotICAgICAgICAgICAgICAgIHZhciBiYXNlUGF0aEN1dElu ZGV4ID0gYmFzZVBhdGguaW5kZXhPZigiPyIpOwotICAgICAgICAgICAgICAgIGlmIChiYXNlUGF0 aEN1dEluZGV4ICE9PSAtMSkKLSAgICAgICAgICAgICAgICAgICAgcHJlZml4ID0gYmFzZVBhdGgu c3Vic3RyaW5nKDAsIGJhc2VQYXRoQ3V0SW5kZXgpOwotICAgICAgICAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgICAgICAgICAgcHJlZml4ID0gYmFzZVBhdGg7Ci0gICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICBwcmVmaXggPSBiYXNlUGF0aC5zdWJzdHJpbmcoMCwgYmFzZVBhdGgu bGFzdEluZGV4T2YoIi8iKSkgKyAiLyI7Ci0KLSAgICAgICAgICAgIHBhdGggPSBwcmVmaXggKyBw YXRoOwotICAgICAgICB9IGVsc2UgaWYgKHBhdGgubGVuZ3RoID4gMSAmJiBwYXRoLmNoYXJBdCgx KSA9PT0gIi8iKSB7Ci0gICAgICAgICAgICAvLyBocmVmIHN0YXJ0cyB3aXRoICIvLyIgd2hpY2gg aXMgYSBmdWxsIFVSTCB3aXRoIHRoZSBwcm90b2NvbCBkcm9wcGVkICh1c2UgdGhlIGJhc2VVUkwg cHJvdG9jb2wpLgotICAgICAgICAgICAgcmV0dXJuIHBhcnNlZFVSTC5zY2hlbWUgKyAiOiIgKyBw YXRoOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBwYXJzZWRVUkwuc2NoZW1lICsgIjovLyIg KyBwYXJzZWRVUkwuaG9zdCArIChwYXJzZWRVUkwucG9ydCA/ICgiOiIgKyBwYXJzZWRVUkwucG9y dCkgOiAiIikgKyBwYXRoOwotICAgIH0KLSAgICByZXR1cm4gbnVsbDsKLX0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz CmluZGV4IDBiNThiNmNkOGVkNWE1OGY3MjM3YjFmM2EzOTEzZGJkZDI3YjQ5Y2EuLmYwZmJiNDgx MTFjZGFjNmM2M2YwNDc3ZjUyODdlMTYyMDIxMWNlMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtMTcx Nyw3ICsxNzE3LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdmFyIGNvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0 ZURvY3VtZW50RnJhZ21lbnQoKTsKICAgICAgICAgICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoInVybCgiKSk7CiAgICAgICAgICAgICAgICAgaWYg KHNlbGYuX3N0eWxlUnVsZS5zb3VyY2VVUkwpCi0gICAgICAgICAgICAgICAgICAgIGhyZWZVcmwg PSBXZWJJbnNwZWN0b3IuY29tcGxldGVVUkwoc2VsZi5fc3R5bGVSdWxlLnNvdXJjZVVSTCwgaHJl ZlVybCk7CisgICAgICAgICAgICAgICAgICAgIGhyZWZVcmwgPSBXZWJJbnNwZWN0b3IuUGFyc2Vk VVJMLmNvbXBsZXRlVVJMKHNlbGYuX3N0eWxlUnVsZS5zb3VyY2VVUkwsIGhyZWZVcmwpOwogICAg ICAgICAgICAgICAgIGVsc2UgaWYgKHRoaXMuX3BhcmVudFBhbmUubm9kZSkKICAgICAgICAgICAg ICAgICAgICAgaHJlZlVybCA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZVVSTEZvclJlbGF0ZWROb2Rl KHRoaXMuX3BhcmVudFBhbmUubm9kZSwgaHJlZlVybCk7CiAgICAgICAgICAgICAgICAgdmFyIGhh c1Jlc291cmNlID0gISFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoaHJlZlVybCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKaW5kZXggYzljODQ5 N2E1YzBmOTQyYzQxZDIyODJlNmRhNTgxOWM4YmZhODA3Yi4uOGQ5ZTliNzIxMWVkYTYzNTkxYTQz NzA4MjE2YjNiY2NmNmYwOTcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvV2ViS2l0LnFyYwpAQCAtMTE2LDYgKzExNiw3IEBACiAgICAgPGZpbGU+T2JqZWN0UHJv cGVydGllc1NlY3Rpb24uanM8L2ZpbGU+CiAgICAgPGZpbGU+UGFuZWwuanM8L2ZpbGU+CiAgICAg PGZpbGU+UGFuZWxFbmFibGVyVmlldy5qczwvZmlsZT4KKyAgICA8ZmlsZT5QYXJzZWRVUkwuanM8 L2ZpbGU+CiAgICAgPGZpbGU+UGxhY2FyZC5qczwvZmlsZT4KICAgICA8ZmlsZT5Qb3BvdmVyLmpz PC9maWxlPgogICAgIDxmaWxlPlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlSGVscGVyLmpzPC9m aWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y Lmh0bWwKaW5kZXggNWZkZDJiNDc3ZTc1NzFjZGM5OTY5MGMxOGI1MDY3YjQyMTE1MjdiNS4uZTc2 ZjIxYjk1ZjgxOTViYzZkZDA3MzI1N2VjZmMwMzFiNjMzODJiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC03NCw2ICs3NCw3 IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iTmV0 d29ya01hbmFnZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9Ik5ldHdvcmtMb2cuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4 dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlVHJlZU1vZGVsLmpzIj48L3NjcmlwdD4KKyAgICA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJQYXJzZWRVUkwuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlVXRpbHMu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJl c291cmNlVHlwZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iVGltZWxpbmVNYW5hZ2VyLmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLXVybC1saW5raWZ5Lmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy11cmwtbGlua2lmeS5odG1sCmluZGV4IDIwNzdm ZDY3NDAwMjZmNTU3MTdjYzkwM2VlZjQ5NGE5ZjViZGJjZDAuLjc5MzhkZTQ2ZTg4OWViMTBkNTlm YTc3YWMzNDEwMjNiMmZmYzM3ODkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvc3R5bGVzLXVybC1saW5raWZ5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3N0eWxlcy9zdHlsZXMtdXJsLWxpbmtpZnkuaHRtbApAQCAtMTAsNyArMTAsNyBAQCBmdW5jdGlv biB0ZXN0KCkKIHsKICAgICBmdW5jdGlvbiBjb21wbGV0ZVVSTChiYXNlVVJMLCBocmVmKQogICAg IHsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoV2ViSW5zcGVjdG9yLmNvbXBsZXRl VVJMKGJhc2VVUkwsIGhyZWYpKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoV2Vi SW5zcGVjdG9yLlBhcnNlZFVSTC5jb21wbGV0ZVVSTChiYXNlVVJMLCBocmVmKSk7CiAgICAgfQog CiAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlVSTHMgY29tcGxldGVkOiIpOwo=