75968 2012-01-10 09:05:00 -0800 Web Inspector: make source urls relative to source map url. 2012-01-12 03:55:11 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 533124 0 podivilov 2012-01-10 09:05:00 -0800 Web Inspector: make source urls relative to source map url. 533125 1 121858 podivilov 2012-01-10 09:06:37 -0800 Created attachment 121858 Patch 533855 2 121858 yurys 2012-01-11 06:34:44 -0800 Comment on attachment 121858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121858&action=review > Source/WebCore/inspector/front-end/CompilerSourceMapping.js:273 > + _canonicalizeURL: function(url, baseURL) This is second definition of _canonicalizeURL in this prototype. Please remove the one above. > LayoutTests/http/tests/inspector/resources/source-map.json:4 > +"sourceRoot": "", Why did this line change? 533871 3 122016 podivilov 2012-01-11 07:07:43 -0800 Created attachment 122016 Patch 533873 4 podivilov 2012-01-11 07:10:34 -0800 (In reply to comment #2) > (From update of attachment 121858 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121858&action=review > > > Source/WebCore/inspector/front-end/CompilerSourceMapping.js:273 > > + _canonicalizeURL: function(url, baseURL) > > This is second definition of _canonicalizeURL in this prototype. Please remove the one above. Done. > > > LayoutTests/http/tests/inspector/resources/source-map.json:4 > > +"sourceRoot": "", > > Why did this line change? Sources are now relative to source map. In this test source map and sources are in the same directory, so sourceRoot could be empty. 534724 5 podivilov 2012-01-12 03:55:11 -0800 Committed r104808: <http://trac.webkit.org/changeset/104808> 121858 2012-01-10 09:06:37 -0800 2012-01-11 07:07:34 -0800 Patch bug-75968-20120110210634.patch text/plain 6337 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFjMWIzZDU4MDA5ZDFj NTU4MGUxMDkxMzVlNDg3ZGExZTM0ZDEyNS4uY2NhOThiZmQ1MDVkZWFmYzk4YzI0ZDU5ODc5ZjBl OGFiYWM0ZWI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTEwICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IG1ha2Ugc291cmNlIHVybHMgcmVsYXRpdmUgdG8gc291cmNlIG1hcCB1cmwuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTk2OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db21waWxlclNvdXJjZU1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2xv c3VyZUNvbXBpbGVyU291cmNlTWFwcGluZy5wcm90b3R5cGUuX3BhcnNlTWFwKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5fY2Fu b25pY2FsaXplVVJMKToKKwogMjAxMi0wMS0xMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdv b2dsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZml4IERlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWw6OnVpU291cmNlQ29kZXMgLSBkbyBub3QgaXRlcmF0ZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNvdXJjZU1hcHBpbmcuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGlu Zy5qcwppbmRleCBkNzg2N2RiYTJlODMzMTc3OGQ2ODRlYTQyOTZmMTNiNTdiM2I4MDJhLi42MmIx NjVkYTVlODE0ZmY4ZmVkNjIzZTM0ZmQ5ZDkzZjdiYTNlZDlkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGluZy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGlu Zy5qcwpAQCAtODMsNyArODMsNyBAQCBXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNl TWFwcGluZyA9IGZ1bmN0aW9uKHNvdXJjZU1hcHBpbmdVUkwsIHNjcmlwdFNvdQogICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcucHJvdG90eXBlLl9i YXNlNjRNYXBbYmFzZTY0RGlnaXRzLmNoYXJBdChpKV0gPSBpOwogICAgIH0KIAotICAgIHRoaXMu X3NvdXJjZU1hcHBpbmdVUkwgPSB0aGlzLl9yZXNvbHZlU291cmNlTWFwVVJMKHNvdXJjZU1hcHBp bmdVUkwsIHNjcmlwdFNvdXJjZU9yaWdpbik7CisgICAgdGhpcy5fc291cmNlTWFwcGluZ1VSTCA9 IHRoaXMuX2Nhbm9uaWNhbGl6ZVVSTChzb3VyY2VNYXBwaW5nVVJMLCBzY3JpcHRTb3VyY2VPcmln aW4pOwogICAgIHRoaXMuX21hcHBpbmdzID0gW107CiAgICAgdGhpcy5fcmV2ZXJzZU1hcHBpbmdz QnlTb3VyY2VVUkwgPSB7fTsKIH0KQEAgLTE5Nyw3ICsxOTcsMTAgQEAgV2ViSW5zcGVjdG9yLkNs b3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBz b3VyY2VzID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWFwLnNvdXJjZXMubGVu Z3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciB1cmwgPSB0aGlzLl9jYW5vbmljYWxpemVVUkwo bWFwLnNvdXJjZVJvb3QsIG1hcC5zb3VyY2VzW2ldKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VV UkwgPSBtYXAuc291cmNlc1tpXTsKKyAgICAgICAgICAgIGlmIChtYXAuc291cmNlUm9vdCkKKyAg ICAgICAgICAgICAgICBzb3VyY2VVUkwgPSBtYXAuc291cmNlUm9vdCArICIvIiArIHNvdXJjZVVS TDsKKyAgICAgICAgICAgIHZhciB1cmwgPSB0aGlzLl9jYW5vbmljYWxpemVVUkwoc291cmNlVVJM LCB0aGlzLl9zb3VyY2VNYXBwaW5nVVJMKTsKICAgICAgICAgICAgIHNvdXJjZXMucHVzaCh1cmwp OwogICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXZlcnNlTWFwcGluZ3NCeVNvdXJjZVVSTFt1cmxd KQogICAgICAgICAgICAgICAgIHRoaXMuX3JldmVyc2VNYXBwaW5nc0J5U291cmNlVVJMW3VybF0g PSBbXTsKQEAgLTI2NywxOSArMjcwLDE5IEBAIFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJT b3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHNvdXJjZVJvb3QgPyBz b3VyY2VSb290ICsgIi8iICsgc291cmNlVVJMIDogc291cmNlVVJMOwogICAgIH0sCiAKLSAgICBf cmVzb2x2ZVNvdXJjZU1hcFVSTDogZnVuY3Rpb24oc291cmNlTWFwcGluZ1VSTCwgc2NyaXB0U291 cmNlT3JpZ2luKQorICAgIF9jYW5vbmljYWxpemVVUkw6IGZ1bmN0aW9uKHVybCwgYmFzZVVSTCkK ICAgICB7Ci0gICAgICAgIGlmICghc291cmNlTWFwcGluZ1VSTCB8fCAhc2NyaXB0U291cmNlT3Jp Z2luKQotICAgICAgICAgICAgcmV0dXJuIHNvdXJjZU1hcHBpbmdVUkw7CisgICAgICAgIGlmICgh dXJsIHx8ICFiYXNlVVJMKQorICAgICAgICAgICAgcmV0dXJuIHVybDsKIAotICAgICAgICBpZiAo c291cmNlTWFwcGluZ1VSTC5hc1BhcnNlZFVSTCgpKQotICAgICAgICAgICAgcmV0dXJuIHNvdXJj ZU1hcHBpbmdVUkw7CisgICAgICAgIGlmICh1cmwuYXNQYXJzZWRVUkwoKSkKKyAgICAgICAgICAg IHJldHVybiB1cmw7CiAKLSAgICAgICAgdmFyIG9yaWdpbiA9IHNjcmlwdFNvdXJjZU9yaWdpbi5h c1BhcnNlZFVSTCgpOwotICAgICAgICB2YXIgYmFzZVVSTCA9IG9yaWdpbi5zY2hlbWUgKyAiOi8v IiArIG9yaWdpbi5ob3N0ICsgKG9yaWdpbi5wb3J0ID8gIjoiICsgb3JpZ2luLnBvcnQgOiAiIik7 Ci0gICAgICAgIGlmIChzb3VyY2VNYXBwaW5nVVJMWzBdID09PSAiLyIpCi0gICAgICAgICAgICBy ZXR1cm4gYmFzZVVSTCArIHNvdXJjZU1hcHBpbmdVUkw7Ci0gICAgICAgIHJldHVybiBiYXNlVVJM ICsgb3JpZ2luLmZpcnN0UGF0aENvbXBvbmVudHMgKyBzb3VyY2VNYXBwaW5nVVJMOworICAgICAg ICB2YXIgYmFzZSA9IGJhc2VVUkwuYXNQYXJzZWRVUkwoKTsKKyAgICAgICAgdmFyIGJhc2VIb3N0 ID0gYmFzZS5zY2hlbWUgKyAiOi8vIiArIGJhc2UuaG9zdCArIChiYXNlLnBvcnQgPyAiOiIgKyBi YXNlLnBvcnQgOiAiIik7CisgICAgICAgIGlmICh1cmxbMF0gPT09ICIvIikKKyAgICAgICAgICAg IHJldHVybiBiYXNlSG9zdCArIHVybDsKKyAgICAgICAgcmV0dXJuIGJhc2VIb3N0ICsgYmFzZS5m aXJzdFBhdGhDb21wb25lbnRzICsgdXJsOwogICAgIH0sCiAKICAgICBfVkxRX0JBU0VfU0hJRlQ6 IDUsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggYzYxZWUxMWJmZTFkODUzNzNjNzFlODMxNTQ4ZDQwNmQ3YmRmMWI0NS4uZmRi MTRhYzQxMWY0M2Y3ZjgwODdlNDg3YzNmNTI2NTEyZDUwMmIzYyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEyLTAxLTEwICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2Ugc291cmNlIHVybHMgcmVsYXRpdmUgdG8g c291cmNlIG1hcCB1cmwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc291cmNlLW1hcHBpbmcuaHRt bDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvc291cmNlLW1hcC5q c29uOgorCiAyMDEyLTAxLTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc291cmNlLW1hcHBpbmcuaHRt bAppbmRleCAzOGI0NTRiZWFhOWY1ODRmOTc5OGQwN2M3NjFmNDk1NWY4M2E4N2FjLi40MjQ1YzMx NzlmNjYwZjlhMWEyZTE0NDE2MWVmYWQ4MzBlMDY0MGNlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbXBpbGVyLXNvdXJjZS1tYXBwaW5n Lmh0bWwKQEAgLTExOSw3ICsxMTksNyBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgICAgICBmdW5j dGlvbiB0ZXN0UmVzb2x2ZVNvdXJjZU1hcHBpbmdVUkwobmV4dCkKICAgICAgICAgewotICAgICAg ICAgICAgdmFyIGZ1bmMgPSBXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGlu Zy5wcm90b3R5cGUuX3Jlc29sdmVTb3VyY2VNYXBVUkw7CisgICAgICAgICAgICB2YXIgZnVuYyA9 IFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5fY2Fu b25pY2FsaXplVVJMOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImh0 dHA6Ly9leGFtcGxlLmNvbS9tYXAuanNvbiIsIGZ1bmMoImh0dHA6Ly9leGFtcGxlLmNvbS9tYXAu anNvbiIsICJodHRwOi8vZXhhbXBsZS5jb20vc2NyaXB0LmpzIikpOwogICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImh0dHA6Ly9leGFtcGxlLmNvbS9tYXAuanNvbiIsIGZ1 bmMoIi9tYXAuanNvbiIsICJodHRwOi8vZXhhbXBsZS5jb20vc2NyaXB0LmpzIikpOwogICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImh0dHA6Ly9leGFtcGxlLmNvbS9zY3Jp cHRzLy4uL21hcHMvbWFwLmpzb24iLCBmdW5jKCIuLi9tYXBzL21hcC5qc29uIiwgImh0dHA6Ly9l eGFtcGxlLmNvbS9zY3JpcHRzL3NjcmlwdC5qcyIpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9zb3VyY2UtbWFwLmpzb24gYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvc291cmNlLW1hcC5qc29uCmluZGV4 IDIxNGVjZmZkOTkzMzg5OWVlMmY3YTkwNjdkNjU2YzA1YWZjMTc3ZmMuLmY3ZjRkMTBkZWY2YTU0 ZGJiZWEwMzM5MTkzMmE5YzJmZjNlYWIxYWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9zb3VyY2UtbWFwLmpzb24KKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL3NvdXJjZS1tYXAuanNvbgpAQCAtMSw3 ICsxLDcgQEAKIHsKICJ2ZXJzaW9uIjozLAogImZpbGUiOiJjb21waWxlZC5qcyIsCi0ic291cmNl Um9vdCI6ICJodHRwOi8vbG9jYWxob3N0OjgwMDAvaW5zcGVjdG9yL3Jlc291cmNlcyIsCisic291 cmNlUm9vdCI6ICIiLAogImxpbmVDb3VudCI6MiwKICJtYXBwaW5ncyI6IkFBQ0FBLE1BQUFDLGlC QUF1QixDQUFDLE1BQUQsQ0FBUyxRQUFRLEVBQ3hDLENBQ0ksSUFBSUMsRUFBU0MsUUFBQUMsY0FB c0IsQ0FBQyxRQUFELENBQ25DRixFQUFBRyxHQUFBLENBQVksTUFDWkgsRUFBQUQsaUJBQXVCLENB QUMsT0FBRCxDQUFVSyxXQUFWLENBQXVCLENBQUEsQ0FBdkIsQ0FDdkJILFNBQUFJLEtBQUFDLFlB QXlCLENBQUNOLENBQUQsQ0FFckJPLEVBQUFBLENBQU1OLFFBQUFDLGNBQXNCLENBQUMsS0FBRCxD QUNoQ0ssRUFBQUosR0FBQSxDQUFTLG9jQUNURjtRQUFBSSxLQUFBQyxZQUF5QixDQUFDQyxDQUFE LENBUjdCLENBRHVCLENBWXZCSCxTQUFTQSxZQUFXLENBQUNJLENBQUQsQ0FDcEIsQ0FFSUMsQ0FE OEJDLElBQVpDLFlBQ2xCRixRQUFjLENBQUNELENBQUQsQ0FGbEIsQyxDQ2JBRyxRQUFTQSxhQUFZ LEVBQ3JCLEVBR0FBLFlBQUFDLFVBQUFILE9BQUEsQ0FBZ0NJLFFBQVEsRUFDeEMsQ0FDSUMsT0FB QUMsSUFBVyxDQUFDLGlCQUFELENBRGY7IiwKICJzb3VyY2VzIjpbInNvdXJjZTEuanMiLCJzb3Vy Y2UyLmpzIl0sCg== 122016 2012-01-11 07:07:43 -0800 2012-01-11 10:31:24 -0800 Patch bug-75968-20120111190740.patch text/plain 6463 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFjMWIzZDU4MDA5ZDFj NTU4MGUxMDkxMzVlNDg3ZGExZTM0ZDEyNS4uY2NhOThiZmQ1MDVkZWFmYzk4YzI0ZDU5ODc5ZjBl OGFiYWM0ZWI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTEwICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IG1ha2Ugc291cmNlIHVybHMgcmVsYXRpdmUgdG8gc291cmNlIG1hcCB1cmwuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTk2OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Db21waWxlclNvdXJjZU1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2xv c3VyZUNvbXBpbGVyU291cmNlTWFwcGluZy5wcm90b3R5cGUuX3BhcnNlTWFwKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5fY2Fu b25pY2FsaXplVVJMKToKKwogMjAxMi0wMS0xMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdv b2dsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZml4IERlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWw6OnVpU291cmNlQ29kZXMgLSBkbyBub3QgaXRlcmF0ZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNvdXJjZU1hcHBpbmcuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGlu Zy5qcwppbmRleCBkNzg2N2RiYTJlODMzMTc3OGQ2ODRlYTQyOTZmMTNiNTdiM2I4MDJhLi5iN2Qw ZGRjMjAzZDZlYTQxNTkxNTlhMTRjNjc0MjVjN2NiOTRmNzcxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGluZy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGlu Zy5qcwpAQCAtODMsNyArODMsNyBAQCBXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNl TWFwcGluZyA9IGZ1bmN0aW9uKHNvdXJjZU1hcHBpbmdVUkwsIHNjcmlwdFNvdQogICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcucHJvdG90eXBlLl9i YXNlNjRNYXBbYmFzZTY0RGlnaXRzLmNoYXJBdChpKV0gPSBpOwogICAgIH0KIAotICAgIHRoaXMu X3NvdXJjZU1hcHBpbmdVUkwgPSB0aGlzLl9yZXNvbHZlU291cmNlTWFwVVJMKHNvdXJjZU1hcHBp bmdVUkwsIHNjcmlwdFNvdXJjZU9yaWdpbik7CisgICAgdGhpcy5fc291cmNlTWFwcGluZ1VSTCA9 IHRoaXMuX2Nhbm9uaWNhbGl6ZVVSTChzb3VyY2VNYXBwaW5nVVJMLCBzY3JpcHRTb3VyY2VPcmln aW4pOwogICAgIHRoaXMuX21hcHBpbmdzID0gW107CiAgICAgdGhpcy5fcmV2ZXJzZU1hcHBpbmdz QnlTb3VyY2VVUkwgPSB7fTsKIH0KQEAgLTE5Nyw3ICsxOTcsMTAgQEAgV2ViSW5zcGVjdG9yLkNs b3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBz b3VyY2VzID0gW107CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWFwLnNvdXJjZXMubGVu Z3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciB1cmwgPSB0aGlzLl9jYW5vbmljYWxpemVVUkwo bWFwLnNvdXJjZVJvb3QsIG1hcC5zb3VyY2VzW2ldKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VV UkwgPSBtYXAuc291cmNlc1tpXTsKKyAgICAgICAgICAgIGlmIChtYXAuc291cmNlUm9vdCkKKyAg ICAgICAgICAgICAgICBzb3VyY2VVUkwgPSBtYXAuc291cmNlUm9vdCArICIvIiArIHNvdXJjZVVS TDsKKyAgICAgICAgICAgIHZhciB1cmwgPSB0aGlzLl9jYW5vbmljYWxpemVVUkwoc291cmNlVVJM LCB0aGlzLl9zb3VyY2VNYXBwaW5nVVJMKTsKICAgICAgICAgICAgIHNvdXJjZXMucHVzaCh1cmwp OwogICAgICAgICAgICAgaWYgKCF0aGlzLl9yZXZlcnNlTWFwcGluZ3NCeVNvdXJjZVVSTFt1cmxd KQogICAgICAgICAgICAgICAgIHRoaXMuX3JldmVyc2VNYXBwaW5nc0J5U291cmNlVVJMW3VybF0g PSBbXTsKQEAgLTI2MiwyNCArMjY1LDE5IEBAIFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJT b3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG5lZ2F0aXZlID8gLXJl c3VsdCA6IHJlc3VsdDsKICAgICB9LAogCi0gICAgX2Nhbm9uaWNhbGl6ZVVSTDogZnVuY3Rpb24o c291cmNlUm9vdCwgc291cmNlVVJMKQorICAgIF9jYW5vbmljYWxpemVVUkw6IGZ1bmN0aW9uKHVy bCwgYmFzZVVSTCkKICAgICB7Ci0gICAgICAgIHJldHVybiBzb3VyY2VSb290ID8gc291cmNlUm9v dCArICIvIiArIHNvdXJjZVVSTCA6IHNvdXJjZVVSTDsKLSAgICB9LAotCi0gICAgX3Jlc29sdmVT b3VyY2VNYXBVUkw6IGZ1bmN0aW9uKHNvdXJjZU1hcHBpbmdVUkwsIHNjcmlwdFNvdXJjZU9yaWdp bikKLSAgICB7Ci0gICAgICAgIGlmICghc291cmNlTWFwcGluZ1VSTCB8fCAhc2NyaXB0U291cmNl T3JpZ2luKQotICAgICAgICAgICAgcmV0dXJuIHNvdXJjZU1hcHBpbmdVUkw7CisgICAgICAgIGlm ICghdXJsIHx8ICFiYXNlVVJMIHx8IHVybC5hc1BhcnNlZFVSTCgpKQorICAgICAgICAgICAgcmV0 dXJuIHVybDsKIAotICAgICAgICBpZiAoc291cmNlTWFwcGluZ1VSTC5hc1BhcnNlZFVSTCgpKQot ICAgICAgICAgICAgcmV0dXJuIHNvdXJjZU1hcHBpbmdVUkw7CisgICAgICAgIHZhciBiYXNlID0g YmFzZVVSTC5hc1BhcnNlZFVSTCgpOworICAgICAgICBpZiAoIWJhc2UpCisgICAgICAgICAgICBy ZXR1cm4gdXJsOwogCi0gICAgICAgIHZhciBvcmlnaW4gPSBzY3JpcHRTb3VyY2VPcmlnaW4uYXNQ YXJzZWRVUkwoKTsKLSAgICAgICAgdmFyIGJhc2VVUkwgPSBvcmlnaW4uc2NoZW1lICsgIjovLyIg KyBvcmlnaW4uaG9zdCArIChvcmlnaW4ucG9ydCA/ICI6IiArIG9yaWdpbi5wb3J0IDogIiIpOwot ICAgICAgICBpZiAoc291cmNlTWFwcGluZ1VSTFswXSA9PT0gIi8iKQotICAgICAgICAgICAgcmV0 dXJuIGJhc2VVUkwgKyBzb3VyY2VNYXBwaW5nVVJMOwotICAgICAgICByZXR1cm4gYmFzZVVSTCAr IG9yaWdpbi5maXJzdFBhdGhDb21wb25lbnRzICsgc291cmNlTWFwcGluZ1VSTDsKKyAgICAgICAg dmFyIGJhc2VIb3N0ID0gYmFzZS5zY2hlbWUgKyAiOi8vIiArIGJhc2UuaG9zdCArIChiYXNlLnBv cnQgPyAiOiIgKyBiYXNlLnBvcnQgOiAiIik7CisgICAgICAgIGlmICh1cmxbMF0gPT09ICIvIikK KyAgICAgICAgICAgIHJldHVybiBiYXNlSG9zdCArIHVybDsKKyAgICAgICAgcmV0dXJuIGJhc2VI b3N0ICsgYmFzZS5maXJzdFBhdGhDb21wb25lbnRzICsgdXJsOwogICAgIH0sCiAKICAgICBfVkxR X0JBU0VfU0hJRlQ6IDUsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzYxZWUxMWJmZTFkODUzNzNjNzFlODMxNTQ4ZDQwNmQ3 YmRmMWI0NS4uZmRiMTRhYzQxMWY0M2Y3ZjgwODdlNDg3YzNmNTI2NTEyZDUwMmIzYyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDEyLTAxLTEwICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2Ugc291cmNlIHVybHMg cmVsYXRpdmUgdG8gc291cmNlIG1hcCB1cmwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03NTk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc291cmNl LW1hcHBpbmcuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMv c291cmNlLW1hcC5qc29uOgorCiAyMDEyLTAxLTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zb3VyY2UtbWFwcGlu Zy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvY29tcGlsZXItc291cmNl LW1hcHBpbmcuaHRtbAppbmRleCAzOGI0NTRiZWFhOWY1ODRmOTc5OGQwN2M3NjFmNDk1NWY4M2E4 N2FjLi40MjQ1YzMxNzlmNjYwZjlhMWEyZTE0NDE2MWVmYWQ4MzBlMDY0MGNlIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9jb21waWxlci1zb3VyY2UtbWFwcGlu Zy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbXBpbGVyLXNv dXJjZS1tYXBwaW5nLmh0bWwKQEAgLTExOSw3ICsxMTksNyBAQCBmdW5jdGlvbiB0ZXN0KCkKIAog ICAgICAgICBmdW5jdGlvbiB0ZXN0UmVzb2x2ZVNvdXJjZU1hcHBpbmdVUkwobmV4dCkKICAgICAg ICAgewotICAgICAgICAgICAgdmFyIGZ1bmMgPSBXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVy U291cmNlTWFwcGluZy5wcm90b3R5cGUuX3Jlc29sdmVTb3VyY2VNYXBVUkw7CisgICAgICAgICAg ICB2YXIgZnVuYyA9IFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nLnBy b3RvdHlwZS5fY2Fub25pY2FsaXplVVJMOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3Nl cnRFcXVhbHMoImh0dHA6Ly9leGFtcGxlLmNvbS9tYXAuanNvbiIsIGZ1bmMoImh0dHA6Ly9leGFt cGxlLmNvbS9tYXAuanNvbiIsICJodHRwOi8vZXhhbXBsZS5jb20vc2NyaXB0LmpzIikpOwogICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImh0dHA6Ly9leGFtcGxlLmNvbS9t YXAuanNvbiIsIGZ1bmMoIi9tYXAuanNvbiIsICJodHRwOi8vZXhhbXBsZS5jb20vc2NyaXB0Lmpz IikpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoImh0dHA6Ly9leGFt cGxlLmNvbS9zY3JpcHRzLy4uL21hcHMvbWFwLmpzb24iLCBmdW5jKCIuLi9tYXBzL21hcC5qc29u IiwgImh0dHA6Ly9leGFtcGxlLmNvbS9zY3JpcHRzL3NjcmlwdC5qcyIpKTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9zb3VyY2UtbWFwLmpz b24gYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvc291cmNlLW1h cC5qc29uCmluZGV4IDIxNGVjZmZkOTkzMzg5OWVlMmY3YTkwNjdkNjU2YzA1YWZjMTc3ZmMuLmY3 ZjRkMTBkZWY2YTU0ZGJiZWEwMzM5MTkzMmE5YzJmZjNlYWIxYWIgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9zb3VyY2UtbWFwLmpzb24KKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL3NvdXJjZS1tYXAu anNvbgpAQCAtMSw3ICsxLDcgQEAKIHsKICJ2ZXJzaW9uIjozLAogImZpbGUiOiJjb21waWxlZC5q cyIsCi0ic291cmNlUm9vdCI6ICJodHRwOi8vbG9jYWxob3N0OjgwMDAvaW5zcGVjdG9yL3Jlc291 cmNlcyIsCisic291cmNlUm9vdCI6ICIiLAogImxpbmVDb3VudCI6MiwKICJtYXBwaW5ncyI6IkFB Q0FBLE1BQUFDLGlCQUF1QixDQUFDLE1BQUQsQ0FBUyxRQUFRLEVBQ3hDLENBQ0ksSUFBSUMsRUFB U0MsUUFBQUMsY0FBc0IsQ0FBQyxRQUFELENBQ25DRixFQUFBRyxHQUFBLENBQVksTUFDWkgsRUFB QUQsaUJBQXVCLENBQUMsT0FBRCxDQUFVSyxXQUFWLENBQXVCLENBQUEsQ0FBdkIsQ0FDdkJILFNB QUFJLEtBQUFDLFlBQXlCLENBQUNOLENBQUQsQ0FFckJPLEVBQUFBLENBQU1OLFFBQUFDLGNBQXNC LENBQUMsS0FBRCxDQUNoQ0ssRUFBQUosR0FBQSxDQUFTLG9jQUNURjtRQUFBSSxLQUFBQyxZQUF5 QixDQUFDQyxDQUFELENBUjdCLENBRHVCLENBWXZCSCxTQUFTQSxZQUFXLENBQUNJLENBQUQsQ0FD cEIsQ0FFSUMsQ0FEOEJDLElBQVpDLFlBQ2xCRixRQUFjLENBQUNELENBQUQsQ0FGbEIsQyxDQ2JB RyxRQUFTQSxhQUFZLEVBQ3JCLEVBR0FBLFlBQUFDLFVBQUFILE9BQUEsQ0FBZ0NJLFFBQVEsRUFD eEMsQ0FDSUMsT0FBQUMsSUFBVyxDQUFDLGlCQUFELENBRGY7IiwKICJzb3VyY2VzIjpbInNvdXJj ZTEuanMiLCJzb3VyY2UyLmpzIl0sCg==