47746 2010-10-15 15:50:43 -0700 Respect charset in handleDataURL 2011-04-26 16:26:23 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 skyul webkit-unassigned abarth commit-queue eric paroga oldest_to_newest 294971 0 skyul 2010-10-15 15:50:43 -0700 We must use TextEncoding(charset) to encode data URL again. Otherwise TextEncoding::encode() returns an empty string because encoding name is not specified. Also use "US-ASCII" as fallback charset as extractCharsetFromMediaType can be empty. 294976 1 70909 skyul 2010-10-15 15:52:48 -0700 Created attachment 70909 Patch 294981 2 70909 darin 2010-10-15 15:54:59 -0700 Comment on attachment 70909 Patch Is there a regression test that covers this? If so, where is the patch to the expected results to show the progression? 294983 3 skyul 2010-10-15 15:56:03 -0700 (In reply to comment #2) > (From update of attachment 70909 [details]) > Is there a regression test that covers this? If so, where is the patch to the expected results to show the progression? We need this patch to pass Acid 3 test 97 (data URL). 294985 4 skyul 2010-10-15 15:59:06 -0700 (In reply to comment #2) > (From update of attachment 70909 [details]) > Is there a regression test that covers this? If so, where is the patch to the expected results to show the progression? r69183 passed all LayoutTests. I think we need to add a new test case for this. 294986 5 skyul 2010-10-15 16:00:05 -0700 Adding Patrick to CC. 314156 6 74968 paroga 2010-11-27 17:29:19 -0800 Created attachment 74968 Patch I added an additonal change to the patch (we don't need to declare the default charset twice). (In reply to comment #2) > (From update of attachment 70909 [details]) > Is there a regression test that covers this? If so, where is the patch to the expected results to show the progression? The reason for this is, that none of the current ports with a buildbot uses this functionality. I've run the GTK LayoutTests on the patch which introduced DataURL.cpp. I thought GTK uses the curl backend, but this was wrong and so I didn't see the regression :-(. I did a small test and changed a port with LayoutTests to use DataURL.cpp: This patch fixed over 130 layout tests. So I don't think that we need additional tests. We only need to run the existing ones. 314900 7 paroga 2010-11-30 01:52:57 -0800 @darin: ping 320960 8 74968 eric 2010-12-13 00:37:19 -0800 Comment on attachment 74968 Patch The ChangeLog needs to mention that this fixes 130 layout tests, and for which port. Otherwise the change looks fine. (Every change requires a test, or explanation of why testing is impossible.) In this case, you have many tests, you just didn't explain that you're fixing them (which is importnat both for reviewers and folks looking back through teh svn history). 327041 9 77507 paroga 2010-12-27 07:46:15 -0800 Created attachment 77507 Patch 330325 10 77507 eric 2011-01-06 12:39:16 -0800 Comment on attachment 77507 Patch What do other ports do when extractCharsetFromMediaType returns empty? Do they already assume ASCII? If so, how? Seems like it should be possible to write a test for this which would fail on other ports as well, no? 392824 11 77507 abarth 2011-04-26 15:30:05 -0700 Comment on attachment 77507 Patch 130! Wow! 392825 12 abarth 2011-04-26 15:30:28 -0700 > Seems like it should be possible to write a test for this which would fail on other ports as well, no? Not very many folks use this file. 392998 13 77507 commit-queue 2011-04-26 16:26:18 -0700 Comment on attachment 77507 Patch Clearing flags on attachment: 77507 Committed r84976: <http://trac.webkit.org/changeset/84976> 393000 14 commit-queue 2011-04-26 16:26:23 -0700 All reviewed patches have been landed. Closing bug. 70909 2010-10-15 15:52:48 -0700 2010-11-27 17:29:19 -0800 Patch dataURL.patch text/plain 2201 skyul SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTg5MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMTAtMTUgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55 MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZXNwZWN0IGNoYXJzZXQgaW4gaGFuZGxlRGF0YVVSTAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc3NDYKKworICAgICAgICBXZSBtdXN0IHVzZSBU ZXh0RW5jb2RpbmcoY2hhcnNldCkgdG8gZW5jb2RlIGRhdGEgVVJMIGFnYWluLiBPdGhlcndpc2Ug VGV4dEVuY29kaW5nOjplbmNvZGUoKQorICAgICAgICByZXR1cm5zIGFuIGVtcHR5IHN0cmluZyBi ZWNhdXNlIGVuY29kaW5nIG5hbWUgaXMgbm90IHNwZWNpZmllZC4KKworICAgICAgICBBbHNvIHVz ZSAiVVMtQVNDSUkiIGFzIGZhbGxiYWNrIGNoYXJzZXQgYXMgZXh0cmFjdENoYXJzZXRGcm9tTWVk aWFUeXBlIGNhbiBiZSBlbXB0eS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRGF0YVVS TC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYW5kbGVEYXRhVVJMKToKKwogMjAxMC0xMC0xNSAg RGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFk ZWxlIFBldGVyc29uLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9EYXRhVVJMLmNwcAkocmV2 aXNpb24gNjk4OTEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRGF0YVVSTC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDggQEAgdm9pZCBoYW5kbGVEYXRhVVJMKFJlc291cmNl SGFuZGxlKiBoYW5kbAogCiAgICAgU3RyaW5nIG1pbWVUeXBlID0gZXh0cmFjdE1JTUVUeXBlRnJv bU1lZGlhVHlwZShtZWRpYVR5cGUpOwogICAgIFN0cmluZyBjaGFyc2V0ID0gZXh0cmFjdENoYXJz ZXRGcm9tTWVkaWFUeXBlKG1lZGlhVHlwZSk7CisgICAgaWYgKGNoYXJzZXQuaXNFbXB0eSgpKQor ICAgICAgICBjaGFyc2V0ID0gIlVTLUFTQ0lJIjsKIAogICAgIFJlc291cmNlUmVzcG9uc2UgcmVz cG9uc2U7CiAgICAgcmVzcG9uc2Uuc2V0TWltZVR5cGUobWltZVR5cGUpOwpAQCAtNzcsMTAgKzc5 LDExIEBAIHZvaWQgaGFuZGxlRGF0YVVSTChSZXNvdXJjZUhhbmRsZSogaGFuZGwKICAgICAgICAg ICAgIGhhbmRsZS0+Y2xpZW50KCktPmRpZFJlY2VpdmVEYXRhKGhhbmRsZSwgb3V0LmRhdGEoKSwg b3V0LnNpemUoKSwgMCk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgICBkYXRhID0g ZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKGRhdGEsIFRleHRFbmNvZGluZyhjaGFyc2V0KSk7Cisg ICAgICAgIFRleHRFbmNvZGluZyBlbmNvZGluZyhjaGFyc2V0KTsKKyAgICAgICAgZGF0YSA9IGRl Y29kZVVSTEVzY2FwZVNlcXVlbmNlcyhkYXRhLCBlbmNvZGluZyk7CiAgICAgICAgIGhhbmRsZS0+ Y2xpZW50KCktPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUsIHJlc3BvbnNlKTsKIAotICAgICAg ICBDU3RyaW5nIGVuY29kZWREYXRhID0gVGV4dEVuY29kaW5nKCkuZW5jb2RlKGRhdGEuY2hhcmFj dGVycygpLCBkYXRhLmxlbmd0aCgpLCBVUkxFbmNvZGVkRW50aXRpZXNGb3JVbmVuY29kYWJsZXMp OworICAgICAgICBDU3RyaW5nIGVuY29kZWREYXRhID0gZW5jb2RpbmcuZW5jb2RlKGRhdGEuY2hh cmFjdGVycygpLCBkYXRhLmxlbmd0aCgpLCBVUkxFbmNvZGVkRW50aXRpZXNGb3JVbmVuY29kYWJs ZXMpOwogICAgICAgICByZXNwb25zZS5zZXRFeHBlY3RlZENvbnRlbnRMZW5ndGgoZW5jb2RlZERh dGEubGVuZ3RoKCkpOwogICAgICAgICBpZiAoZW5jb2RlZERhdGEubGVuZ3RoKCkpCiAgICAgICAg ICAgICBoYW5kbGUtPmNsaWVudCgpLT5kaWRSZWNlaXZlRGF0YShoYW5kbGUsIGVuY29kZWREYXRh LmRhdGEoKSwgZW5jb2RlZERhdGEubGVuZ3RoKCksIDApOwo= 74968 2010-11-27 17:29:19 -0800 2010-12-27 07:46:08 -0800 Patch bug-47746.patch text/plain 2435 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmNiZWYwNC4uYjFmMGIzOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMS0yNiAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0IGNoYXJzZXQgaW4gaGFuZGxlRGF0YVVSTAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc3NDYKKworICAg ICAgICBPcmlnaW5hbCBwYXRjaCBieSBLd2FuZyBZdWwgU2VvIDxza3l1bEBjb21wYW55MTAwLm5l dD4KKworICAgICAgICBXZSBtdXN0IHVzZSBUZXh0RW5jb2RpbmcoY2hhcnNldCkgdG8gZW5jb2Rl IGRhdGEgVVJMIGFnYWluLiBPdGhlcndpc2UgVGV4dEVuY29kaW5nOjplbmNvZGUoKQorICAgICAg ICByZXR1cm5zIGFuIGVtcHR5IHN0cmluZyBiZWNhdXNlIGVuY29kaW5nIG5hbWUgaXMgbm90IHNw ZWNpZmllZC4KKworICAgICAgICBBbHNvIHVzZSAiVVMtQVNDSUkiIGFzIGZhbGxiYWNrIGNoYXJz ZXQgYXMgZXh0cmFjdENoYXJzZXRGcm9tTWVkaWFUeXBlIGNhbiBiZSBlbXB0eS4KKworICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvRGF0YVVSTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYW5k bGVEYXRhVVJMKToKKwogMjAxMC0xMS0yNiAgUm9iIEJ1aXMgIDxyd2xidWlzQGdtYWlsLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvRGF0YVVSTC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv RGF0YVVSTC5jcHAKaW5kZXggNWRlMWIzNC4uMjVhNDQzZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkwuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9EYXRhVVJMLmNwcApAQCAtNTcsMTEgKzU3LDE0IEBAIHZvaWQgaGFuZGxlRGF0YVVSTChSZXNv dXJjZUhhbmRsZSogaGFuZGxlKQogICAgICAgICBtZWRpYVR5cGUgPSBtZWRpYVR5cGUubGVmdCht ZWRpYVR5cGUubGVuZ3RoKCkgLSA3KTsKIAogICAgIGlmIChtZWRpYVR5cGUuaXNFbXB0eSgpKQot ICAgICAgICBtZWRpYVR5cGUgPSAidGV4dC9wbGFpbjtjaGFyc2V0PVVTLUFTQ0lJIjsKKyAgICAg ICAgbWVkaWFUeXBlID0gInRleHQvcGxhaW4iOwogCiAgICAgU3RyaW5nIG1pbWVUeXBlID0gZXh0 cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlwZShtZWRpYVR5cGUpOwogICAgIFN0cmluZyBjaGFyc2V0 ID0gZXh0cmFjdENoYXJzZXRGcm9tTWVkaWFUeXBlKG1lZGlhVHlwZSk7CiAKKyAgICBpZiAoY2hh cnNldC5pc0VtcHR5KCkpCisgICAgICAgIGNoYXJzZXQgPSAiVVMtQVNDSUkiOworCiAgICAgUmVz b3VyY2VSZXNwb25zZSByZXNwb25zZTsKICAgICByZXNwb25zZS5zZXRNaW1lVHlwZShtaW1lVHlw ZSk7CiAgICAgcmVzcG9uc2Uuc2V0VGV4dEVuY29kaW5nTmFtZShjaGFyc2V0KTsKQEAgLTc3LDEw ICs4MCwxMSBAQCB2b2lkIGhhbmRsZURhdGFVUkwoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAg ICAgICAgICAgIGhhbmRsZS0+Y2xpZW50KCktPmRpZFJlY2VpdmVEYXRhKGhhbmRsZSwgb3V0LmRh dGEoKSwgb3V0LnNpemUoKSwgMCk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgICBk YXRhID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKGRhdGEsIFRleHRFbmNvZGluZyhjaGFyc2V0 KSk7CisgICAgICAgIFRleHRFbmNvZGluZyBlbmNvZGluZyhjaGFyc2V0KTsKKyAgICAgICAgZGF0 YSA9IGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhkYXRhLCBlbmNvZGluZyk7CiAgICAgICAgIGhh bmRsZS0+Y2xpZW50KCktPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUsIHJlc3BvbnNlKTsKIAot ICAgICAgICBDU3RyaW5nIGVuY29kZWREYXRhID0gVGV4dEVuY29kaW5nKCkuZW5jb2RlKGRhdGEu Y2hhcmFjdGVycygpLCBkYXRhLmxlbmd0aCgpLCBVUkxFbmNvZGVkRW50aXRpZXNGb3JVbmVuY29k YWJsZXMpOworICAgICAgICBDU3RyaW5nIGVuY29kZWREYXRhID0gZW5jb2RpbmcuZW5jb2RlKGRh dGEuY2hhcmFjdGVycygpLCBkYXRhLmxlbmd0aCgpLCBVUkxFbmNvZGVkRW50aXRpZXNGb3JVbmVu Y29kYWJsZXMpOwogICAgICAgICByZXNwb25zZS5zZXRFeHBlY3RlZENvbnRlbnRMZW5ndGgoZW5j b2RlZERhdGEubGVuZ3RoKCkpOwogICAgICAgICBpZiAoZW5jb2RlZERhdGEubGVuZ3RoKCkpCiAg ICAgICAgICAgICBoYW5kbGUtPmNsaWVudCgpLT5kaWRSZWNlaXZlRGF0YShoYW5kbGUsIGVuY29k ZWREYXRhLmRhdGEoKSwgZW5jb2RlZERhdGEubGVuZ3RoKCksIDApOwo= 77507 2010-12-27 07:46:15 -0800 2011-04-26 16:26:18 -0700 Patch bug-47746-20101227164613.patch text/plain 2703 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2E5Y2NkMDllY2EyMWVhMzFlN2ZjNGNkOWEzMTY5OGE2NTc1YTEwOC4uNGZiM2EyOGI5YzczZWQ3 MzM1YWM1Y2RiMzFiZDI3YjhlZjczYTViNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0xMi0yNyAgUGF0 cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0IGNoYXJzZXQgaW4gaGFuZGxlRGF0 YVVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc3 NDYKKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBieSBLd2FuZyBZdWwgU2VvIDxza3l1bEBjb21w YW55MTAwLm5ldD4KKworICAgICAgICBXZSBtdXN0IHVzZSBUZXh0RW5jb2RpbmcoY2hhcnNldCkg dG8gZW5jb2RlIGRhdGEgVVJMIGFnYWluLiBPdGhlcndpc2UgVGV4dEVuY29kaW5nOjplbmNvZGUo KQorICAgICAgICByZXR1cm5zIGFuIGVtcHR5IHN0cmluZyBiZWNhdXNlIGVuY29kaW5nIG5hbWUg aXMgbm90IHNwZWNpZmllZC4KKworICAgICAgICBBbHNvIHVzZSAiVVMtQVNDSUkiIGFzIGZhbGxi YWNrIGNoYXJzZXQgYXMgZXh0cmFjdENoYXJzZXRGcm9tTWVkaWFUeXBlIGNhbiBiZSBlbXB0eS4K KworICAgICAgICBUaGlzIGNoYW5nZSBmaXhlcyBvdmVyIDEzMCBsYXlvdXQgdGVzdHMgd2hlbiBy dW5uaW5nIEdUSyBwb3J0IHdpdGggY1VSTCBuZXR3b3JrIGJhY2tlbmQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFuZGxlRGF0 YVVSTCk6CisKIDIwMTAtMTItMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gUmVtb3ZlZCB0cmFpbGluZyBzcGFjZXMgZnJvbSBh IGxvY2FsaXplZApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkwu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0RhdGFVUkwuY3BwCmluZGV4IDVkZTFiMzRi N2Q5MTdmZThkOTc3ZWQzMDQxYmU0ZDIzNDRiYTlhM2EuLjI1YTQ0M2U4MzViNWU2ZTA1YmM0OGFi ODY3YzZhZWYyZTlhNGJjYmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9E YXRhVVJMLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRGF0YVVSTC5jcHAKQEAg LTU3LDExICs1NywxNCBAQCB2b2lkIGhhbmRsZURhdGFVUkwoUmVzb3VyY2VIYW5kbGUqIGhhbmRs ZSkKICAgICAgICAgbWVkaWFUeXBlID0gbWVkaWFUeXBlLmxlZnQobWVkaWFUeXBlLmxlbmd0aCgp IC0gNyk7CiAKICAgICBpZiAobWVkaWFUeXBlLmlzRW1wdHkoKSkKLSAgICAgICAgbWVkaWFUeXBl ID0gInRleHQvcGxhaW47Y2hhcnNldD1VUy1BU0NJSSI7CisgICAgICAgIG1lZGlhVHlwZSA9ICJ0 ZXh0L3BsYWluIjsKIAogICAgIFN0cmluZyBtaW1lVHlwZSA9IGV4dHJhY3RNSU1FVHlwZUZyb21N ZWRpYVR5cGUobWVkaWFUeXBlKTsKICAgICBTdHJpbmcgY2hhcnNldCA9IGV4dHJhY3RDaGFyc2V0 RnJvbU1lZGlhVHlwZShtZWRpYVR5cGUpOwogCisgICAgaWYgKGNoYXJzZXQuaXNFbXB0eSgpKQor ICAgICAgICBjaGFyc2V0ID0gIlVTLUFTQ0lJIjsKKwogICAgIFJlc291cmNlUmVzcG9uc2UgcmVz cG9uc2U7CiAgICAgcmVzcG9uc2Uuc2V0TWltZVR5cGUobWltZVR5cGUpOwogICAgIHJlc3BvbnNl LnNldFRleHRFbmNvZGluZ05hbWUoY2hhcnNldCk7CkBAIC03NywxMCArODAsMTEgQEAgdm9pZCBo YW5kbGVEYXRhVVJMKFJlc291cmNlSGFuZGxlKiBoYW5kbGUpCiAgICAgICAgICAgICBoYW5kbGUt PmNsaWVudCgpLT5kaWRSZWNlaXZlRGF0YShoYW5kbGUsIG91dC5kYXRhKCksIG91dC5zaXplKCks IDApOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKLSAgICAgICAgZGF0YSA9IGRlY29kZVVSTEVz Y2FwZVNlcXVlbmNlcyhkYXRhLCBUZXh0RW5jb2RpbmcoY2hhcnNldCkpOworICAgICAgICBUZXh0 RW5jb2RpbmcgZW5jb2RpbmcoY2hhcnNldCk7CisgICAgICAgIGRhdGEgPSBkZWNvZGVVUkxFc2Nh cGVTZXF1ZW5jZXMoZGF0YSwgZW5jb2RpbmcpOwogICAgICAgICBoYW5kbGUtPmNsaWVudCgpLT5k aWRSZWNlaXZlUmVzcG9uc2UoaGFuZGxlLCByZXNwb25zZSk7CiAKLSAgICAgICAgQ1N0cmluZyBl bmNvZGVkRGF0YSA9IFRleHRFbmNvZGluZygpLmVuY29kZShkYXRhLmNoYXJhY3RlcnMoKSwgZGF0 YS5sZW5ndGgoKSwgVVJMRW5jb2RlZEVudGl0aWVzRm9yVW5lbmNvZGFibGVzKTsKKyAgICAgICAg Q1N0cmluZyBlbmNvZGVkRGF0YSA9IGVuY29kaW5nLmVuY29kZShkYXRhLmNoYXJhY3RlcnMoKSwg ZGF0YS5sZW5ndGgoKSwgVVJMRW5jb2RlZEVudGl0aWVzRm9yVW5lbmNvZGFibGVzKTsKICAgICAg ICAgcmVzcG9uc2Uuc2V0RXhwZWN0ZWRDb250ZW50TGVuZ3RoKGVuY29kZWREYXRhLmxlbmd0aCgp KTsKICAgICAgICAgaWYgKGVuY29kZWREYXRhLmxlbmd0aCgpKQogICAgICAgICAgICAgaGFuZGxl LT5jbGllbnQoKS0+ZGlkUmVjZWl2ZURhdGEoaGFuZGxlLCBlbmNvZGVkRGF0YS5kYXRhKCksIGVu Y29kZWREYXRhLmxlbmd0aCgpLCAwKTsK