63701 2011-06-30 04:24:22 -0700 Web Inspector: Resources loaded to Resources Panel from InspectorPageAgent do not have mime type set. 2011-07-04 07:10:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 430319 0 vsevik 2011-06-30 04:24:22 -0700 Resources loaded to Resources Panel from InspectorPageAgent do not have mime type set. Open any site with images, open web inspector, open resources panel. Image resources should have correct mime type, but they have undefined instead. 430359 1 99286 vsevik 2011-06-30 06:26:16 -0700 Created attachment 99286 Patch 431842 2 99286 yurys 2011-07-04 01:45:19 -0700 Comment on attachment 99286 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99286&action=review > LayoutTests/ChangeLog:7 > + Please add a brief description of the change. > LayoutTests/http/tests/inspector/resource-tree/resource-tree-mimetype.html:28 > +<p>Tests that resources panel correctly shows mime type when it loads data from memory cache.</p> Please include a link to the bug. 431917 3 vsevik 2011-07-04 07:10:29 -0700 Committed r90364: <http://trac.webkit.org/changeset/90364> 99286 2011-06-30 06:26:16 -0700 2011-07-04 01:45:19 -0700 Patch bug-63701-20110630172614.patch text/plain 8902 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTAxMDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwM2MwN2VkM2MyYjVmOTY1MTM3ZDk5 MGVkNWZjMDg5NWE5NTAxYmUwLi44NDhlOTZlZTJhYTU3MjYyNjBkN2I1ZGQ0YjVkZTdkNjVkNmM5 ZDc3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDYtMzAgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVzb3VyY2VzIGxvYWRlZCB0byBSZXNvdXJj ZXMgUGFuZWwgZnJvbSBJbnNwZWN0b3JQYWdlQWdlbnQgZG8gbm90IGhhdmUgbWltZSB0eXBlIHNl dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYzNzAx CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNl LXRyZWUtbWltZXR5cGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz L2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUtbWltZXR5cGUuaHRtbDogQWRk ZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJj ZXMvZW1wdHkucG5nOiBBZGRlZC4KKwogMjAxMS0wNi0zMCAgWXV0YSBLaXRhbXVyYSAgPHl1dGFr QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXRyZWUvcmVz b3VyY2UtdHJlZS1taW1ldHlwZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUtbWltZXR5cGUtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmYxOTU0ODBkYzlmYTNmMTJlZDAxZTg0MTU5OGFlMWUxZjdhNmJkMDEK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNv dXJjZS10cmVlL3Jlc291cmNlLXRyZWUtbWltZXR5cGUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs OSBAQAorVGVzdHMgdGhhdCByZXNvdXJjZXMgcGFuZWwgY29ycmVjdGx5IHNob3dzIG1pbWUgdHlw ZSB3aGVuIGl0IGxvYWRzIGRhdGEgZnJvbSBtZW1vcnkgY2FjaGUuCisKKworc2NyaXB0IGFwcGxp Y2F0aW9uL3gtamF2YXNjcmlwdCBodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL2luc3Bl Y3Rvci10ZXN0LmpzCitkb2N1bWVudCB0ZXh0L2h0bWwgaHR0cDovLzEyNy4wLjAuMTo4MDAwL2lu c3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUtbWltZXR5cGUuaHRtbAorc2NyaXB0 IGFwcGxpY2F0aW9uL3gtamF2YXNjcmlwdCBodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9y L3Jlc291cmNlLXRyZWUvcmVzb3VyY2UtdHJlZS10ZXN0LmpzCitpbWFnZSBpbWFnZS9wbmcgaHR0 cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlcy9lbXB0 eS5wbmcKK3N0eWxlc2hlZXQgdGV4dC9jc3MgaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rv ci9yZXNvdXJjZS10cmVlL3Jlc291cmNlcy9zdHlsZXMtaW5pdGlhbC5jc3MKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJj ZS10cmVlLW1pbWV0eXBlLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9y ZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUtbWltZXR5cGUuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOTQ2 Y2JiZjBlNTg2ZjEzZmY1NTE3YWY3MWUxODg3Mzk3ZTdmYmQyCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJjZS10 cmVlLW1pbWV0eXBlLmh0bWwKQEAgLTAsMCArMSwzMSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3Jp cHQgc3JjPSIuLi9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVz b3VyY2UtdHJlZS10ZXN0LmpzIj48L3NjcmlwdD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl Zj0icmVzb3VyY2VzL3N0eWxlcy1pbml0aWFsLmNzcyI+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVz dCgpCit7CisgICAgaWYgKFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yaykKKyAgICAgICAgV2Vi SW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLl9yZXNldCgpOworICAgIFdlYkluc3BlY3Rvci5yZXNv dXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVN b2RlbC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCwgc3RlcDIpOworICAgIFdlYklu c3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5mcm9udGVuZFJldXNlZCgpOworCisgICAgZnVuY3Rp b24gc3RlcDIoKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gZm9ybWF0KHJlc291cmNlKQorICAg ICAgICB7CisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUudG9T dHJpbmcocmVzb3VyY2UudHlwZSkgKyAiICIgKyByZXNvdXJjZS5taW1lVHlwZSArICIgIiArIHJl c291cmNlLnVybDsKKyAgICAgICAgfQorCisgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcFJlc291 cmNlcyhmb3JtYXQpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAg IH0KK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPHA+ VGVzdHMgdGhhdCByZXNvdXJjZXMgcGFuZWwgY29ycmVjdGx5IHNob3dzIG1pbWUgdHlwZSB3aGVu IGl0IGxvYWRzIGRhdGEgZnJvbSBtZW1vcnkgY2FjaGUuPC9wPgorPGltZyBzcmM9InJlc291cmNl cy9lbXB0eS5wbmciPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJjZXMvZW1wdHkucG5nIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJjZXMv ZW1wdHkucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZkNWI5MWVhMDdiOTQ3MzkxNzE0MDg1ZWE5Yzc2M2QzYTc4 NjhkNjgKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDI2MAp6Y21lQVNATj8ob2xIeWB1VkJxIWlh MHZwXmozQ1NiQnA5c2ZXYF9iUHJqajdQVjFAJjR6dz52MWN1QyZ3RSh7RS0KemRYPGZVSmtBMS0k WUxQdjBtZzE4dithUDRtSi0qOWw5MUhtNShYUFo3a31yRiROKlBgakZRfE9JfnlwT253Vmx8CnpR PDdQZGxXT1BZPTs+cGw0YEpLclhNa21yQD40NDlZem0tcTEkSCpZJHdpcTNDM1hkZ01YN2x1ZFVe UkpuUTRfOAp6Tn55VThDNiMmd2RGZWA7SHVfS3tIdUAwRmBlMio3ZSNISSp4YClmdCNXOTVBZGE/ ek9lVGQ9VWp8PXw3S28qMGkKTHREbm17ci1VV3wlZjNxTgoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAx CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IGM0NDFkZjMwMzljODM3YjJkZDQyMmI0NDQxN2YyZjNjMGVkOTBmYjku LjFjNWRiOTYwMWY3OGI3ZjBhMzA3OGYwZTVjMWQyYzY2Yzc4YTBhNzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMCBAQAorMjAxMS0wNi0zMCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBSZXNvdXJjZXMgbG9hZGVkIHRvIFJlc291cmNlcyBQYW5lbCBmcm9t IEluc3BlY3RvclBhZ2VBZ2VudCBkbyBub3QgaGF2ZSBtaW1lIHR5cGUgc2V0LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM3MDEKKworICAgICAgICBU ZXN0OiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUtbWlt ZXR5cGUuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUGFnZUFnZW50OjpidWlsZE9iamVjdEZvckZyYW1lKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6YnVpbGRPYmplY3RGb3JGcmFtZVRyZWUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlLl9hZGRGcmFtZXNSZWN1cnNp dmVseSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBl Ll9jcmVhdGVSZXNvdXJjZSk6CisKIDIwMTEtMDYtMzAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNWE2MmU0OTdlNGVmNTA2YTdlYmQwYjA3 NWM4MDc5N2VlMDU0N2VlOC4uNjJiNDEyODQ5YTE0M2I5NDI4MTRjZjk1MzU4YjlkNzUwODFjNDFm OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtNzUsNyArNzUs OCBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBhcmVudElkIiwgInR5cGUiOiAi c3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSwgImRlc2NyaXB0aW9uIjogIlBhcmVudCBmcmFtZSBp ZGVudGlmaWVyLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJsb2FkZXJJZCIs ICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSBsb2Fk ZXIgYXNzb2NpYXRlZCB3aXRoIHRoaXMgZnJhbWUuIiB9LAogICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVz Y3JpcHRpb24iOiAiRnJhbWUncyBuYW1lIGFzIHNwZWNpZmllZCBpbiB0aGUgdGFnLiIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVz Y3JpcHRpb24iOiAiRnJhbWUgZG9jdW1lbnQncyBVUkwuIiB9CisgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkZyYW1l IGRvY3VtZW50J3MgVVJMLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtaW1l VHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJGcmFtZSBkb2N1bWVudCdz IG1pbWVUeXBlIGFzIGRldGVybWluZWQgYnkgdGhlIGJyb3dzZXIuIiB9CiAgICAgICAgICAgICAg ICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIHsKQEAgLTkwLDcgKzkxLDggQEAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6 ICJSZXNvdXJjZSBVUkwuIiB9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInR5cGUiLCAiJHJlZiI6ICJSZXNvdXJjZVR5cGUiLCAiZGVzY3JpcHRpb24iOiAiVHlw ZSBvZiB0aGlzIHJlc291cmNlLiIgfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogInR5cGUiLCAiJHJlZiI6ICJSZXNvdXJjZVR5cGUiLCAiZGVzY3JpcHRpb24iOiAi VHlwZSBvZiB0aGlzIHJlc291cmNlLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJtaW1lVHlwZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6 ICJSZXNvdXJjZSBtaW1lVHlwZSBhcyBkZXRlcm1pbmVkIGJ5IHRoZSBicm93c2VyLiIgfQogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgICAgICAgICAgICAgIH0sCiAg ICAgICAgICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiSW5mb3JtYXRpb24gYWJvdXQg ZnJhbWUgcmVzb3VyY2VzLiIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clBhZ2VBZ2VudC5jcHAKaW5kZXggZGY2YzAyOGIxYmIyMzc4YzdjOGExNzEwNmJjMzE4YzdiYzg4 MTQ0Ni4uNjhiMzE4YzQ3MTlmZDUwM2JmNmMyNmQwZWZhN2YxMDRhODhjNjAzMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTYxNiw2 ICs2MTYsNyBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yUGFnZUFnZW50 OjpidWlsZE9iamVjdEZvckZyYW1lKEZyYW1lKiBmcmFtZQogICAgIH0KICAgICBmcmFtZU9iamVj dC0+c2V0U3RyaW5nKCJ1cmwiLCBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkpOwog ICAgIGZyYW1lT2JqZWN0LT5zZXRTdHJpbmcoImxvYWRlcklkIiwgbG9hZGVySWQoZnJhbWUtPmxv YWRlcigpLT5kb2N1bWVudExvYWRlcigpKSk7CisgICAgZnJhbWVPYmplY3QtPnNldFN0cmluZygi bWltZVR5cGUiLCBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlTUlN RVR5cGUoKSk7CiAKICAgICByZXR1cm4gZnJhbWVPYmplY3Q7CiB9CkBAIC02MzUsNiArNjM2LDcg QEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvclBhZ2VBZ2VudDo6YnVpbGRP YmplY3RGb3JGcmFtZVRyZWUoRnJhbWUqIGYKICAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gcmVzb3VyY2VPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwogICAgICAgICBy ZXNvdXJjZU9iamVjdC0+c2V0U3RyaW5nKCJ1cmwiLCBjYWNoZWRSZXNvdXJjZS0+dXJsKCkpOwog ICAgICAgICByZXNvdXJjZU9iamVjdC0+c2V0U3RyaW5nKCJ0eXBlIiwgY2FjaGVkUmVzb3VyY2VU eXBlU3RyaW5nKCpjYWNoZWRSZXNvdXJjZSkpOworICAgICAgICByZXNvdXJjZU9iamVjdC0+c2V0 U3RyaW5nKCJtaW1lVHlwZSIsIGNhY2hlZFJlc291cmNlLT5yZXNwb25zZSgpLm1pbWVUeXBlKCkp OwogICAgICAgICBzdWJyZXNvdXJjZXMtPnB1c2hWYWx1ZShyZXNvdXJjZU9iamVjdCk7CiAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlVHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZVRyZWVNb2RlbC5qcwppbmRleCA3MDVmNTRkYjZlYWI3NDQ5OTc4ZTE5ZWZlM2RhZDFhNWU3 YjQ4YTAxLi44OWU0ZmY2YWYwZWYxNjMwNTliNGQ0M2JiMzA0ODliMDM5MjcwNTBhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVl TW9kZWwuanMKQEAgLTMzOSw2ICszMzksNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9k ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHN1YnJlc291cmNlID0gZnJhbWVUcmVl UGF5bG9hZC5yZXNvdXJjZXNbaV07CiAgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9j cmVhdGVSZXNvdXJjZShmcmFtZVBheWxvYWQsIHN1YnJlc291cmNlLnVybCk7CiAgICAgICAgICAg ICByZXNvdXJjZS50eXBlID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGVbc3VicmVzb3VyY2Uu dHlwZV07CisgICAgICAgICAgICByZXNvdXJjZS5taW1lVHlwZSA9IHN1YnJlc291cmNlLm1pbWVU eXBlOwogICAgICAgICAgICAgcmVzb3VyY2UuZmluaXNoZWQgPSB0cnVlOwogICAgICAgICAgICAg dGhpcy5fYWRkUmVzb3VyY2VUb0ZyYW1lKHJlc291cmNlKTsKICAgICAgICAgfQpAQCAtMzQ5LDYg KzM1MCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHZhciByZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2UobnVsbCwgdXJs LCBmcmFtZS5sb2FkZXJJZCk7CiAgICAgICAgIHJlc291cmNlLmZyYW1lSWQgPSBmcmFtZS5pZDsK ICAgICAgICAgcmVzb3VyY2UuZG9jdW1lbnRVUkwgPSBmcmFtZS51cmw7CisgICAgICAgIHJlc291 cmNlLm1pbWVUeXBlID0gZnJhbWUubWltZVR5cGU7CiAgICAgICAgIHJldHVybiByZXNvdXJjZTsK ICAgICB9CiB9Cg==