19978 2008-07-10 14:21:31 -0700 GTK port always ends up with # at the end of resource URLs (and hence can't load files) 2008-07-11 15:31:00 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Blocker --- 1 jacob.refstrup webkit-unassigned a.renevier mrowe oldest_to_newest 85645 0 jacob.refstrup 2008-07-10 14:21:31 -0700 r35040 changed KURL.cpp in setRef() (line 708) testing for isNull() rather than isEmpty() caused a problem on GTK where called setRef("") which ends up being not being null (but would have been empty). This currently causes all file:// references to have added a '#' at the end of the URL -- which means file:// URLs won't load. 85646 1 22205 jacob.refstrup 2008-07-10 14:22:24 -0700 Created attachment 22205 KURL::clearRef added and used to fix situation Per Darin's suggestion added a clearRef() to KURL and called this from WebCore/platform/network/curl/ResourceHandleManager.cpp:558. 85647 2 22206 jacob.refstrup 2008-07-10 14:27:15 -0700 Created attachment 22206 KURL::clearRef added and used to fix situation Per Darin's suggestion added a clearRef() to KURL and called this from WebCore/platform/network/curl/ResourceHandleManager.cpp:558. (this time with a request for a review) 85690 3 22206 darin 2008-07-10 15:45:06 -0700 Comment on attachment 22206 KURL::clearRef added and used to fix situation The ChangeLog has tab characters in it. That will make it impossible to check in as is. Otherwise, this looks good. We should take a look at other callers of setRef and see if any should be changed to use this new function. Perhaps the function should be called removeRef instead of clearRef. I think this patch is good enough as-is that I will say r=me 85710 4 22229 jacob.refstrup 2008-07-10 16:30:56 -0700 Created attachment 22229 Final patch. Renamed to removeRef(); removed tabs. Will need to follow up on AccessibilityRenderObject.cpp seperately. 85712 5 mrowe 2008-07-10 16:32:44 -0700 *** Bug 19993 has been marked as a duplicate of this bug. *** 85743 6 mrowe 2008-07-10 21:16:53 -0700 Can you please refresh the patch against TOT. A change in <http://trac.webkit.org/changeset/35111> added a removeRef method to KURL to address a similar issue inside AccessibilityRenderObject. 85746 7 22243 jacob.refstrup 2008-07-10 21:56:28 -0700 Created attachment 22243 Final patch (fixed against TOT) Patched fixed against merge conflict caused by another person adding removeRef(); resolved duplicate and chose to use more streamlined version of removeRef(). 85747 8 jacob.refstrup 2008-07-10 21:57:30 -0700 Fixed against TOT. 85748 9 22243 darin 2008-07-10 22:15:54 -0700 Comment on attachment 22243 Final patch (fixed against TOT) r=me 85810 10 jacob.refstrup 2008-07-11 14:28:18 -0700 Updated severity to "blocker" as gtk depends on this fix. 85813 11 jmalonzo 2008-07-11 15:31:00 -0700 Thanks for the patch (and Darin for the review). Landed in r35137 22205 2008-07-10 14:22:24 -0700 2008-07-10 14:27:15 -0700 KURL::clearRef added and used to fix situation clearRef.patch text/plain 2192 jacob.refstrup SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTEwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDctMTAgIEphY29iIFJlZnN0cnVwICA8amFjb2IucmVmc3Ry dXBAaHAuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRCRC4KKworCS0gQWRkZWQgS1VSTDo6 Y2xlYXJSZWYoKSBhbmQgdXNlZCBpdCByYXRoZXIgdGhhbiBzZXRSZWYoIiIpCisJICB3aGljaCBh ZnRlciByMzUwNDAgZG9lcyB0aGUgd3JvbmcgdGhpbmcuCisJCisgICAgICAgICogcGxhdGZvcm0v S1VSTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjpjbGVhclJlZik6CisgICAgICAgICog cGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJj ZUhhbmRsZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5h Z2VyOjppbml0aWFsaXplSGFuZGxlKToKKwogMjAwOC0wNy0xMCAgS2V2aW4gTWNDdWxsb3VnaCAg PGttY2N1bGxvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4KSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vS1VSTC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMLmNwcAkocmV2aXNpb24gMzUwOTUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL0tVUkwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MDgsNiArNzA4LDEzIEBAIHZvaWQgS1VSTDo6c2V0UmVm KGNvbnN0IFN0cmluZyYgcykKICAgICBwYXJzZShtX3N0cmluZy5sZWZ0KG1fcXVlcnlFbmQpICsg KHMuaXNOdWxsKCkgPyAiIiA6ICIjIiArIHMpKTsKIH0KIAordm9pZCBLVVJMOjpjbGVhclJlZigp Cit7CisgICAgaWYgKCFtX2lzVmFsaWQpCisgICAgICAgIHJldHVybjsKKyAgICBwYXJzZShtX3N0 cmluZy5sZWZ0KG1fcXVlcnlFbmQpKTsKK30KKwogdm9pZCBLVVJMOjpzZXRRdWVyeShjb25zdCBT dHJpbmcmIHF1ZXJ5KQogewogICAgIGlmICghbV9pc1ZhbGlkKQpJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgJKHJldmlz aW9uIDM1MDk1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgJKHdvcmtpbmcgY29weSkKQEAg LTE0NCw2ICsxNDQsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFJlZihjb25zdCBTdHJpbmcm KTsKIAorICAgIHZvaWQgY2xlYXJSZWYoKTsKKwogICAgIGZyaWVuZCBib29sIGVxdWFsSWdub3Jp bmdSZWYoY29uc3QgS1VSTCYsIGNvbnN0IEtVUkwmKTsKIAogICAgIGZyaWVuZCBib29sIHByb3Rv Y29sSG9zdEFuZFBvcnRBcmVFcXVhbChjb25zdCBLVVJMJiwgY29uc3QgS1VSTCYpOwpJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRs ZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAzNTA5NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU1NSw3 ICs1NTUsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhCiAgICAg S1VSTCBrdXJsID0gam9iLT5yZXF1ZXN0KCkudXJsKCk7CiAKICAgICAvLyBSZW1vdmUgYW55IGZy YWdtZW50IHBhcnQsIG90aGVyd2lzZSBjdXJsIHdpbGwgc2VuZCBpdCBhcyBwYXJ0IG9mIHRoZSBy ZXF1ZXN0LgotICAgIGt1cmwuc2V0UmVmKCIiKTsKKyAgICBrdXJsLmNsZWFyUmVmKCk7CiAKICAg ICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5hbCgpOwogICAgIFN0 cmluZyB1cmwgPSBrdXJsLnN0cmluZygpOwo= 22206 2008-07-10 14:27:15 -0700 2008-07-10 16:30:56 -0700 KURL::clearRef added and used to fix situation clearRef.patch text/plain 2192 jacob.refstrup SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTEwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDctMTAgIEphY29iIFJlZnN0cnVwICA8amFjb2IucmVmc3Ry dXBAaHAuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRCRC4KKworCS0gQWRkZWQgS1VSTDo6 Y2xlYXJSZWYoKSBhbmQgdXNlZCBpdCByYXRoZXIgdGhhbiBzZXRSZWYoIiIpCisJICB3aGljaCBh ZnRlciByMzUwNDAgZG9lcyB0aGUgd3JvbmcgdGhpbmcuCisJCisgICAgICAgICogcGxhdGZvcm0v S1VSTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjpjbGVhclJlZik6CisgICAgICAgICog cGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJj ZUhhbmRsZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5h Z2VyOjppbml0aWFsaXplSGFuZGxlKToKKwogMjAwOC0wNy0xMCAgS2V2aW4gTWNDdWxsb3VnaCAg PGttY2N1bGxvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4KSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vS1VSTC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMLmNwcAkocmV2aXNpb24gMzUwOTUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL0tVUkwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MDgsNiArNzA4LDEzIEBAIHZvaWQgS1VSTDo6c2V0UmVm KGNvbnN0IFN0cmluZyYgcykKICAgICBwYXJzZShtX3N0cmluZy5sZWZ0KG1fcXVlcnlFbmQpICsg KHMuaXNOdWxsKCkgPyAiIiA6ICIjIiArIHMpKTsKIH0KIAordm9pZCBLVVJMOjpjbGVhclJlZigp Cit7CisgICAgaWYgKCFtX2lzVmFsaWQpCisgICAgICAgIHJldHVybjsKKyAgICBwYXJzZShtX3N0 cmluZy5sZWZ0KG1fcXVlcnlFbmQpKTsKK30KKwogdm9pZCBLVVJMOjpzZXRRdWVyeShjb25zdCBT dHJpbmcmIHF1ZXJ5KQogewogICAgIGlmICghbV9pc1ZhbGlkKQpJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgJKHJldmlz aW9uIDM1MDk1KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgJKHdvcmtpbmcgY29weSkKQEAg LTE0NCw2ICsxNDQsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFJlZihjb25zdCBTdHJpbmcm KTsKIAorICAgIHZvaWQgY2xlYXJSZWYoKTsKKwogICAgIGZyaWVuZCBib29sIGVxdWFsSWdub3Jp bmdSZWYoY29uc3QgS1VSTCYsIGNvbnN0IEtVUkwmKTsKIAogICAgIGZyaWVuZCBib29sIHByb3Rv Y29sSG9zdEFuZFBvcnRBcmVFcXVhbChjb25zdCBLVVJMJiwgY29uc3QgS1VSTCYpOwpJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRs ZU1hbmFnZXIuY3BwCShyZXZpc2lvbiAzNTA5NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU1NSw3 ICs1NTUsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhCiAgICAg S1VSTCBrdXJsID0gam9iLT5yZXF1ZXN0KCkudXJsKCk7CiAKICAgICAvLyBSZW1vdmUgYW55IGZy YWdtZW50IHBhcnQsIG90aGVyd2lzZSBjdXJsIHdpbGwgc2VuZCBpdCBhcyBwYXJ0IG9mIHRoZSBy ZXF1ZXN0LgotICAgIGt1cmwuc2V0UmVmKCIiKTsKKyAgICBrdXJsLmNsZWFyUmVmKCk7CiAKICAg ICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5hbCgpOwogICAgIFN0 cmluZyB1cmwgPSBrdXJsLnN0cmluZygpOwo= 22229 2008-07-10 16:30:56 -0700 2008-07-10 21:56:28 -0700 Final patch. removeRef.patch text/plain 2216 jacob.refstrup SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTEwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDctMTAgIEphY29iIFJlZnN0cnVwICA8amFjb2IucmVmc3Ry dXBAaHAuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAg LSBBZGRlZCBLVVJMOjpyZW1vdmVSZWYoKSBhbmQgdXNlZCBpdCByYXRoZXIgdGhhbiBzZXRSZWYo IiIpCisgICAgICAgICB3aGljaCBhZnRlciByMzUwNDAgZG9lcyB0aGUgd3JvbmcgdGhpbmcuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9LVVJMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktVUkw6OnJl bW92ZVJlZik6CisgICAgICAgICogcGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFsaXplSGFuZGxlKToKKwogMjAwOC0wNy0x MCAgS2V2aW4gTWNDdWxsb3VnaCAgPGttY2N1bGxvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vS1VSTC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmNwcAkocmV2aXNpb24gMzUwOTUpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL0tVUkwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MDgsNiArNzA4LDEz IEBAIHZvaWQgS1VSTDo6c2V0UmVmKGNvbnN0IFN0cmluZyYgcykKICAgICBwYXJzZShtX3N0cmlu Zy5sZWZ0KG1fcXVlcnlFbmQpICsgKHMuaXNOdWxsKCkgPyAiIiA6ICIjIiArIHMpKTsKIH0KIAor dm9pZCBLVVJMOjpyZW1vdmVSZWYoKQoreworICAgIGlmICghbV9pc1ZhbGlkKQorICAgICAgICBy ZXR1cm47CisgICAgcGFyc2UobV9zdHJpbmcubGVmdChtX3F1ZXJ5RW5kKSk7Cit9CisKIHZvaWQg S1VSTDo6c2V0UXVlcnkoY29uc3QgU3RyaW5nJiBxdWVyeSkKIHsKICAgICBpZiAoIW1faXNWYWxp ZCkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vS1VSTC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vS1VSTC5oCShyZXZpc2lvbiAzNTA5NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vS1VS TC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDQsNiArMTQ0LDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBzZXRSZWYoY29uc3QgU3RyaW5nJik7CiAKKyAgICB2b2lkIHJlbW92ZVJlZigpOworCiAgICAg ZnJpZW5kIGJvb2wgZXF1YWxJZ25vcmluZ1JlZihjb25zdCBLVVJMJiwgY29uc3QgS1VSTCYpOwog CiAgICAgZnJpZW5kIGJvb2wgcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKGNvbnN0IEtVUkwm LCBjb25zdCBLVVJMJik7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNv dXJjZUhhbmRsZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHJldmlzaW9uIDM1MDk1KQorKysg V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTU1LDcgKzU1NSw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVNYW5h Z2VyOjppbml0aWFsaXplSGEKICAgICBLVVJMIGt1cmwgPSBqb2ItPnJlcXVlc3QoKS51cmwoKTsK IAogICAgIC8vIFJlbW92ZSBhbnkgZnJhZ21lbnQgcGFydCwgb3RoZXJ3aXNlIGN1cmwgd2lsbCBz ZW5kIGl0IGFzIHBhcnQgb2YgdGhlIHJlcXVlc3QuCi0gICAga3VybC5zZXRSZWYoIiIpOworICAg IGt1cmwucmVtb3ZlUmVmKCk7CiAKICAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gam9i LT5nZXRJbnRlcm5hbCgpOwogICAgIFN0cmluZyB1cmwgPSBrdXJsLnN0cmluZygpOwo= 22243 2008-07-10 21:56:28 -0700 2008-07-10 22:15:54 -0700 Final patch (fixed against TOT) removeRef2.patch text/plain 1721 jacob.refstrup SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTExNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMDctMTAgIEphY29iIFJlZnN0cnVwICA8c2V0IEVNQUlMX0FE RFJFU1MgZW52aXJvbm1lbnQgdmFyaWFibGU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIKKworICAgICAgIC0gT3B0aW1pemVkIEtVUkw6OnJlbW92ZVJlZigpIGFuZCB1c2VkIGl0 IHJhdGhlciB0aGFuIHNldFJlZigiIikKKyAgICAgICAgIHdoaWNoIGFmdGVyIHIzNTA0MCBkb2Vz IHRoZSB3cm9uZyB0aGluZy4KKworICAgICAgICAqIHBsYXRmb3JtL0tVUkwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6S1VSTDo6cmVtb3ZlUmVmKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhbmRsZSk6CisKIDIwMDgtMDctMTAgIERhbiBC ZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJv YmVuLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL0tVUkwuY3BwCShyZXZpc2lvbiAzNTExNikKKysrIFdlYkNvcmUvcGxhdGZv cm0vS1VSTC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxMCw3ICs3MTAsOSBAQCB2b2lkIEtVUkw6 OnNldFJlZihjb25zdCBTdHJpbmcmIHMpCiAKIHZvaWQgS1VSTDo6cmVtb3ZlUmVmKCkKIHsKLSAg ICBzZXRSZWYoU3RyaW5nKCkpOworICAgIGlmICghbV9pc1ZhbGlkKQorICAgICAgICByZXR1cm47 CisgICAgcGFyc2UobV9zdHJpbmcubGVmdChtX3F1ZXJ5RW5kKSk7CiB9CiAgICAgCiB2b2lkIEtV Ukw6OnNldFF1ZXJ5KGNvbnN0IFN0cmluZyYgcXVlcnkpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHJl dmlzaW9uIDM1MTE2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VI YW5kbGVNYW5hZ2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTU1LDcgKzU1NSw3IEBAIHZvaWQg UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjppbml0aWFsaXplSGEKICAgICBLVVJMIGt1cmwgPSBqb2It PnJlcXVlc3QoKS51cmwoKTsKIAogICAgIC8vIFJlbW92ZSBhbnkgZnJhZ21lbnQgcGFydCwgb3Ro ZXJ3aXNlIGN1cmwgd2lsbCBzZW5kIGl0IGFzIHBhcnQgb2YgdGhlIHJlcXVlc3QuCi0gICAga3Vy bC5zZXRSZWYoIiIpOworICAgIGt1cmwucmVtb3ZlUmVmKCk7CiAKICAgICBSZXNvdXJjZUhhbmRs ZUludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5hbCgpOwogICAgIFN0cmluZyB1cmwgPSBrdXJs LnN0cmluZygpOwo=