44444 2010-08-23 11:39:44 -0700 Set the ResourceResponse HTTP headers in RessourceHandleWin 2010-08-23 20:26:38 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 43712 0 paroga webkit-unassigned aroben commit-queue oldest_to_newest 268025 0 paroga 2010-08-23 11:39:44 -0700 see patch 268030 1 65144 paroga 2010-08-23 11:46:10 -0700 Created attachment 65144 Patch 268035 2 65144 aroben 2010-08-23 11:54:18 -0700 Comment on attachment 65144 Patch > - client()->didReceiveData(this, buffer, buffers.dwBufferLength, 0); > + > + if (ResourceHandleClient* resourceHandleClient = client()) > + resourceHandleClient->didReceiveData(this, buffer, buffers.dwBufferLength, 0); > buffers.dwBufferLength = bufferSize; > } > > @@ -272,8 +293,24 @@ void ResourceHandle::onRequestComplete(L > InternetCloseHandle(d->m_secondaryHandle); > InternetCloseHandle(d->m_resourceHandle); > > - client()->didFinishLoading(this); > - delete this; > + if (ResourceHandleClient* resourceHandleClient = client()) > + resourceHandleClient->didFinishLoading(this); > + > + deref(); // balances ref in start > +} These changes seem completely separate from what the bug claims to be fixing. I think you should split them into a separate bug/patch. > +String ResourceHandle::queryHTTPHeader(DWORD infoLevel) > +{ > + DWORD bufferSize = 0; > + HttpQueryInfoW(d->m_requestHandle, infoLevel, 0, &bufferSize, 0); > + > + UChar* characters; > + String result = String::createUninitialized(bufferSize / sizeof(UChar), characters); > + > + if (HttpQueryInfoW(d->m_requestHandle, infoLevel, characters, &bufferSize, 0)) > + return result.left(result.length() - 1); // Remove NullTermination. I think using a Vector<UChar> and String::adopt would be more efficient, since you won't have to copy the whole string at the end. It would be clearer to have an early return if the second call to HttpQueryInfoW fails. It might be nicer for this function to be a non-member function with internal linkage. 268051 3 65150 paroga 2010-08-23 12:21:25 -0700 Created attachment 65150 Patch 268056 4 65150 aroben 2010-08-23 12:31:30 -0700 Comment on attachment 65150 Patch r=me 268283 5 65150 commit-queue 2010-08-23 20:26:33 -0700 Comment on attachment 65150 Patch Clearing flags on attachment: 65150 Committed r65859: <http://trac.webkit.org/changeset/65859> 268284 6 commit-queue 2010-08-23 20:26:38 -0700 All reviewed patches have been landed. Closing bug. 65144 2010-08-23 11:46:10 -0700 2010-08-23 12:21:25 -0700 Patch bug-44444.patch text/plain 4480 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgyMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDgtMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBh cm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2V0IHRoZSBSZXNvdXJjZVJlc3BvbnNlIEhUVFAgaGVhZGVycyBpbiBSZXNzb3VyY2VIYW5k bGVXaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0 NDQ0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmg6CisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay93aW4vUmVzb3VyY2VIYW5kbGVXaW4uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6Om9uUmVxdWVzdENvbXBsZXRlKToKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpxdWVyeUhUVFBIZWFkZXIpOgorCiAyMDEwLTA4LTIz ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5k bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5k bGUuaAkocmV2aXNpb24gNjU4MTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VIYW5kbGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTcwLDYgKzE3MCw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldEhhc1JlY2VpdmVkUmVzcG9uc2UoYm9vbCA9IHRydWUpOwogICAgIGJvb2wgaGFz UmVjZWl2ZWRSZXNwb25zZSgpIGNvbnN0OwogICAgIHZvaWQgZmlsZUxvYWRUaW1lcihUaW1lcjxS ZXNvdXJjZUhhbmRsZT4qKTsKKyAgICBTdHJpbmcgcXVlcnlIVFRQSGVhZGVyKERXT1JEIGluZm9M ZXZlbCk7CiAgICAgdm9pZCBvbkhhbmRsZUNyZWF0ZWQoTFBBUkFNKTsKICAgICB2b2lkIG9uUmVx dWVzdFJlZGlyZWN0ZWQoTFBBUkFNKTsKICAgICB2b2lkIG9uUmVxdWVzdENvbXBsZXRlKExQQVJB TSk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2lu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNl SGFuZGxlV2luLmNwcAkocmV2aXNpb24gNjU4MTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI1LDcgKzIy NSw2IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6Om9uUmVxdWVzdENvbXBsZXRlKEwKICAgICB9CiAK ICAgICBISU5URVJORVQgaGFuZGxlID0gKHJlcXVlc3QoKS5odHRwTWV0aG9kKCkgPT0gIlBPU1Qi KSA/IGQtPm1fc2Vjb25kYXJ5SGFuZGxlIDogZC0+bV9yZXNvdXJjZUhhbmRsZTsKLSAgICBCT09M IG9rID0gRkFMU0U7CiAKICAgICBzdGF0aWMgY29uc3QgaW50IGJ1ZmZlclNpemUgPSAzMjc2ODsK ICAgICBjaGFyIGJ1ZmZlcltidWZmZXJTaXplXTsKQEAgLTIzNCwxNCArMjMzLDM2IEBAIHZvaWQg UmVzb3VyY2VIYW5kbGU6Om9uUmVxdWVzdENvbXBsZXRlKEwKICAgICBidWZmZXJzLmxwdkJ1ZmZl ciA9IGJ1ZmZlcjsKICAgICBidWZmZXJzLmR3QnVmZmVyTGVuZ3RoID0gYnVmZmVyU2l6ZTsKIAot ICAgIGJvb2wgcmVjZWl2ZWRBbnlEYXRhID0gZmFsc2U7CisgICAgQk9PTCBvayA9IEZBTFNFOwog ICAgIHdoaWxlICgob2sgPSBJbnRlcm5ldFJlYWRGaWxlRXhBKGhhbmRsZSwgJmJ1ZmZlcnMsIElS Rl9OT19XQUlULCAoRFdPUkRfUFRSKXRoaXMpKSAmJiBidWZmZXJzLmR3QnVmZmVyTGVuZ3RoKSB7 CiAgICAgICAgIGlmICghaGFzUmVjZWl2ZWRSZXNwb25zZSgpKSB7CiAgICAgICAgICAgICBzZXRI YXNSZWNlaXZlZFJlc3BvbnNlKCk7CiAgICAgICAgICAgICBSZXNvdXJjZVJlc3BvbnNlIHJlc3Bv bnNlOworICAgICAgICAgICAgcmVzcG9uc2Uuc2V0VVJMKGZpcnN0UmVxdWVzdCgpLnVybCgpKTsK KworICAgICAgICAgICAgU3RyaW5nIGh0dHBTdGF0dXNUZXh0ID0gcXVlcnlIVFRQSGVhZGVyKEhU VFBfUVVFUllfU1RBVFVTX1RFWFQpOworICAgICAgICAgICAgaWYgKCFodHRwU3RhdHVzVGV4dC5p c051bGwoKSkKKyAgICAgICAgICAgICAgICByZXNwb25zZS5zZXRIVFRQU3RhdHVzVGV4dChodHRw U3RhdHVzVGV4dCk7CisKKyAgICAgICAgICAgIFN0cmluZyBodHRwU3RhdHVzQ29kZSA9IHF1ZXJ5 SFRUUEhlYWRlcihIVFRQX1FVRVJZX1NUQVRVU19DT0RFKTsKKyAgICAgICAgICAgIGlmICghaHR0 cFN0YXR1c0NvZGUuaXNOdWxsKCkpCisgICAgICAgICAgICAgICAgcmVzcG9uc2Uuc2V0SFRUUFN0 YXR1c0NvZGUoaHR0cFN0YXR1c0NvZGUudG9JbnQoKSk7CisKKyAgICAgICAgICAgIFN0cmluZyBo dHRwQ29udGVudExlbmd0aCA9IHF1ZXJ5SFRUUEhlYWRlcihIVFRQX1FVRVJZX0NPTlRFTlRfTEVO R1RIKTsKKyAgICAgICAgICAgIGlmICghaHR0cENvbnRlbnRMZW5ndGguaXNOdWxsKCkpCisgICAg ICAgICAgICAgICAgcmVzcG9uc2Uuc2V0RXhwZWN0ZWRDb250ZW50TGVuZ3RoKGh0dHBDb250ZW50 TGVuZ3RoLnRvSW50KCkpOworCisgICAgICAgICAgICBTdHJpbmcgaHR0cENvbnRlbnRUeXBlID0g cXVlcnlIVFRQSGVhZGVyKEhUVFBfUVVFUllfQ09OVEVOVF9UWVBFKTsKKyAgICAgICAgICAgIGlm ICghaHR0cENvbnRlbnRUeXBlLmlzTnVsbCgpKSB7CisgICAgICAgICAgICAgICAgcmVzcG9uc2Uu c2V0TWltZVR5cGUoZXh0cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlwZShodHRwQ29udGVudFR5cGUp KTsKKyAgICAgICAgICAgICAgICByZXNwb25zZS5zZXRUZXh0RW5jb2RpbmdOYW1lKGV4dHJhY3RD aGFyc2V0RnJvbU1lZGlhVHlwZShodHRwQ29udGVudFR5cGUpKTsKKyAgICAgICAgICAgIH0KKwog ICAgICAgICAgICAgY2xpZW50KCktPmRpZFJlY2VpdmVSZXNwb25zZSh0aGlzLCByZXNwb25zZSk7 CiAgICAgICAgIH0KLSAgICAgICAgY2xpZW50KCktPmRpZFJlY2VpdmVEYXRhKHRoaXMsIGJ1ZmZl ciwgYnVmZmVycy5kd0J1ZmZlckxlbmd0aCwgMCk7CisKKyAgICAgICAgaWYgKFJlc291cmNlSGFu ZGxlQ2xpZW50KiByZXNvdXJjZUhhbmRsZUNsaWVudCA9IGNsaWVudCgpKQorICAgICAgICAgICAg cmVzb3VyY2VIYW5kbGVDbGllbnQtPmRpZFJlY2VpdmVEYXRhKHRoaXMsIGJ1ZmZlciwgYnVmZmVy cy5kd0J1ZmZlckxlbmd0aCwgMCk7CiAgICAgICAgIGJ1ZmZlcnMuZHdCdWZmZXJMZW5ndGggPSBi dWZmZXJTaXplOwogICAgIH0KIApAQCAtMjcyLDggKzI5MywyNCBAQCB2b2lkIFJlc291cmNlSGFu ZGxlOjpvblJlcXVlc3RDb21wbGV0ZShMCiAgICAgICAgIEludGVybmV0Q2xvc2VIYW5kbGUoZC0+ bV9zZWNvbmRhcnlIYW5kbGUpOwogICAgIEludGVybmV0Q2xvc2VIYW5kbGUoZC0+bV9yZXNvdXJj ZUhhbmRsZSk7CiAKLSAgICBjbGllbnQoKS0+ZGlkRmluaXNoTG9hZGluZyh0aGlzKTsKLSAgICBk ZWxldGUgdGhpczsKKyAgICBpZiAoUmVzb3VyY2VIYW5kbGVDbGllbnQqIHJlc291cmNlSGFuZGxl Q2xpZW50ID0gY2xpZW50KCkpCisgICAgICAgIHJlc291cmNlSGFuZGxlQ2xpZW50LT5kaWRGaW5p c2hMb2FkaW5nKHRoaXMpOworCisgICAgZGVyZWYoKTsgLy8gYmFsYW5jZXMgcmVmIGluIHN0YXJ0 Cit9CisKK1N0cmluZyBSZXNvdXJjZUhhbmRsZTo6cXVlcnlIVFRQSGVhZGVyKERXT1JEIGluZm9M ZXZlbCkKK3sKKyAgICBEV09SRCBidWZmZXJTaXplID0gMDsKKyAgICBIdHRwUXVlcnlJbmZvVyhk LT5tX3JlcXVlc3RIYW5kbGUsIGluZm9MZXZlbCwgMCwgJmJ1ZmZlclNpemUsIDApOworCisgICAg VUNoYXIqIGNoYXJhY3RlcnM7CisgICAgU3RyaW5nIHJlc3VsdCA9IFN0cmluZzo6Y3JlYXRlVW5p bml0aWFsaXplZChidWZmZXJTaXplIC8gc2l6ZW9mKFVDaGFyKSwgY2hhcmFjdGVycyk7CisKKyAg ICBpZiAoSHR0cFF1ZXJ5SW5mb1coZC0+bV9yZXF1ZXN0SGFuZGxlLCBpbmZvTGV2ZWwsIGNoYXJh Y3RlcnMsICZidWZmZXJTaXplLCAwKSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdC5sZWZ0KHJlc3Vs dC5sZW5ndGgoKSAtIDEpOyAvLyBSZW1vdmUgTnVsbFRlcm1pbmF0aW9uLgorCisgICAgcmV0dXJu IFN0cmluZygpOwogfQogCiBzdGF0aWMgdm9pZCBfX3N0ZGNhbGwgdHJhbnNmZXJKb2JTdGF0dXND YWxsYmFjayhISU5URVJORVQgaW50ZXJuZXRIYW5kbGUsCg== 65150 2010-08-23 12:21:25 -0700 2010-08-23 20:26:33 -0700 Patch bug-44444b.patch text/plain 3424 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgyMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBh cm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2V0IHRoZSBSZXNvdXJjZVJlc3BvbnNlIEhUVFAgaGVhZGVycyBpbiBSZXNzb3VyY2VIYW5k bGVXaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0 NDQ0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpxdWVyeUhUVFBIZWFkZXIpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGU6Om9uUmVxdWVzdENvbXBsZXRlKToKKwogMjAxMC0wOC0yMyAgSmlh biBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg TGV2aW4uCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxl V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291 cmNlSGFuZGxlV2luLmNwcAkocmV2aXNpb24gNjU4MTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiAr NjMsMjAgQEAgc3RhdGljIGNvbnN0IFJlc291cmNlSGFuZGxlRXZlbnRIYW5kbGVyIAogICAgICZS ZXNvdXJjZUhhbmRsZTo6b25SZXF1ZXN0Q29tcGxldGUKIH07CiAKK3N0YXRpYyBTdHJpbmcgcXVl cnlIVFRQSGVhZGVyKEhJTlRFUk5FVCByZXF1ZXN0SGFuZGxlLCBEV09SRCBpbmZvTGV2ZWwpCit7 CisgICAgRFdPUkQgYnVmZmVyU2l6ZSA9IDA7CisgICAgSHR0cFF1ZXJ5SW5mb1cocmVxdWVzdEhh bmRsZSwgaW5mb0xldmVsLCAwLCAmYnVmZmVyU2l6ZSwgMCk7CisKKyAgICBWZWN0b3I8VUNoYXI+ IGNoYXJhY3RlcnMoYnVmZmVyU2l6ZSAvIHNpemVvZihVQ2hhcikpOworCisgICAgaWYgKCFIdHRw UXVlcnlJbmZvVyhyZXF1ZXN0SGFuZGxlLCBpbmZvTGV2ZWwsIGNoYXJhY3RlcnMuZGF0YSgpLCAm YnVmZmVyU2l6ZSwgMCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIGNoYXJhY3Rl cnMucmVtb3ZlTGFzdCgpOyAvLyBSZW1vdmUgTnVsbFRlcm1pbmF0aW9uLgorICAgIHJldHVybiBT dHJpbmc6OmFkb3B0KGNoYXJhY3RlcnMpOworfQorCiBzdGF0aWMgaW50IGFkZFRvT3V0c3RhbmRp bmdKb2JzKFJlc291cmNlSGFuZGxlKiBqb2IpCiB7CiAgICAgaWYgKCFqb2JJZE1hcCkKQEAgLTIy NSw3ICsyMzksNiBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpvblJlcXVlc3RDb21wbGV0ZShMCiAg ICAgfQogCiAgICAgSElOVEVSTkVUIGhhbmRsZSA9IChyZXF1ZXN0KCkuaHR0cE1ldGhvZCgpID09 ICJQT1NUIikgPyBkLT5tX3NlY29uZGFyeUhhbmRsZSA6IGQtPm1fcmVzb3VyY2VIYW5kbGU7Ci0g ICAgQk9PTCBvayA9IEZBTFNFOwogCiAgICAgc3RhdGljIGNvbnN0IGludCBidWZmZXJTaXplID0g MzI3Njg7CiAgICAgY2hhciBidWZmZXJbYnVmZmVyU2l6ZV07CkBAIC0yMzQsMTEgKzI0NywzMSBA QCB2b2lkIFJlc291cmNlSGFuZGxlOjpvblJlcXVlc3RDb21wbGV0ZShMCiAgICAgYnVmZmVycy5s cHZCdWZmZXIgPSBidWZmZXI7CiAgICAgYnVmZmVycy5kd0J1ZmZlckxlbmd0aCA9IGJ1ZmZlclNp emU7CiAKLSAgICBib29sIHJlY2VpdmVkQW55RGF0YSA9IGZhbHNlOworICAgIEJPT0wgb2sgPSBG QUxTRTsKICAgICB3aGlsZSAoKG9rID0gSW50ZXJuZXRSZWFkRmlsZUV4QShoYW5kbGUsICZidWZm ZXJzLCBJUkZfTk9fV0FJVCwgKERXT1JEX1BUUil0aGlzKSkgJiYgYnVmZmVycy5kd0J1ZmZlckxl bmd0aCkgewogICAgICAgICBpZiAoIWhhc1JlY2VpdmVkUmVzcG9uc2UoKSkgewogICAgICAgICAg ICAgc2V0SGFzUmVjZWl2ZWRSZXNwb25zZSgpOwogICAgICAgICAgICAgUmVzb3VyY2VSZXNwb25z ZSByZXNwb25zZTsKKyAgICAgICAgICAgIHJlc3BvbnNlLnNldFVSTChmaXJzdFJlcXVlc3QoKS51 cmwoKSk7CisKKyAgICAgICAgICAgIFN0cmluZyBodHRwU3RhdHVzVGV4dCA9IHF1ZXJ5SFRUUEhl YWRlcihkLT5tX3JlcXVlc3RIYW5kbGUsIEhUVFBfUVVFUllfU1RBVFVTX1RFWFQpOworICAgICAg ICAgICAgaWYgKCFodHRwU3RhdHVzVGV4dC5pc051bGwoKSkKKyAgICAgICAgICAgICAgICByZXNw b25zZS5zZXRIVFRQU3RhdHVzVGV4dChodHRwU3RhdHVzVGV4dCk7CisKKyAgICAgICAgICAgIFN0 cmluZyBodHRwU3RhdHVzQ29kZSA9IHF1ZXJ5SFRUUEhlYWRlcihkLT5tX3JlcXVlc3RIYW5kbGUs IEhUVFBfUVVFUllfU1RBVFVTX0NPREUpOworICAgICAgICAgICAgaWYgKCFodHRwU3RhdHVzQ29k ZS5pc051bGwoKSkKKyAgICAgICAgICAgICAgICByZXNwb25zZS5zZXRIVFRQU3RhdHVzQ29kZSho dHRwU3RhdHVzQ29kZS50b0ludCgpKTsKKworICAgICAgICAgICAgU3RyaW5nIGh0dHBDb250ZW50 TGVuZ3RoID0gcXVlcnlIVFRQSGVhZGVyKGQtPm1fcmVxdWVzdEhhbmRsZSwgSFRUUF9RVUVSWV9D T05URU5UX0xFTkdUSCk7CisgICAgICAgICAgICBpZiAoIWh0dHBDb250ZW50TGVuZ3RoLmlzTnVs bCgpKQorICAgICAgICAgICAgICAgIHJlc3BvbnNlLnNldEV4cGVjdGVkQ29udGVudExlbmd0aCho dHRwQ29udGVudExlbmd0aC50b0ludCgpKTsKKworICAgICAgICAgICAgU3RyaW5nIGh0dHBDb250 ZW50VHlwZSA9IHF1ZXJ5SFRUUEhlYWRlcihkLT5tX3JlcXVlc3RIYW5kbGUsIEhUVFBfUVVFUllf Q09OVEVOVF9UWVBFKTsKKyAgICAgICAgICAgIGlmICghaHR0cENvbnRlbnRUeXBlLmlzTnVsbCgp KSB7CisgICAgICAgICAgICAgICAgcmVzcG9uc2Uuc2V0TWltZVR5cGUoZXh0cmFjdE1JTUVUeXBl RnJvbU1lZGlhVHlwZShodHRwQ29udGVudFR5cGUpKTsKKyAgICAgICAgICAgICAgICByZXNwb25z ZS5zZXRUZXh0RW5jb2RpbmdOYW1lKGV4dHJhY3RDaGFyc2V0RnJvbU1lZGlhVHlwZShodHRwQ29u dGVudFR5cGUpKTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgY2xpZW50KCktPmRpZFJl Y2VpdmVSZXNwb25zZSh0aGlzLCByZXNwb25zZSk7CiAgICAgICAgIH0KICAgICAgICAgY2xpZW50 KCktPmRpZFJlY2VpdmVEYXRhKHRoaXMsIGJ1ZmZlciwgYnVmZmVycy5kd0J1ZmZlckxlbmd0aCwg MCk7Cg==