21593 2008-10-14 11:50:20 -0700 add multiple-file support to HTMLFormElement 2008-10-14 12:19:48 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin adele sam oldest_to_newest 95322 0 darin 2008-10-14 11:50:20 -0700 Change the form-submission code in HTMLFormElement to support multiple files. There's no way to test this yet since the HTMLInputElement doesn't yet support selecting multiple files, but I will test that it doesn't cause any regressions or problems for the 0 file or 1 file case. 95324 1 24344 darin 2008-10-14 12:00:06 -0700 Created attachment 24344 patch 95325 2 darin 2008-10-14 12:00:43 -0700 (In reply to comment #0) > I will test that it doesn't cause any regressions or problems for the 0 file or 1 file case. I ran the entire regression test suite and that worked fine. I'll do some manual testing now. 95326 3 24344 sam 2008-10-14 12:08:13 -0700 Comment on attachment 24344 patch Awesome patch. I am a little concerned about the removal of copyright though. How did you verify that those contributors that were removed had no edits to the contents of the files? r=me if you have a good reason for doing so. 95327 4 darin 2008-10-14 12:12:55 -0700 (In reply to comment #3) > How did you verify that those contributors that were removed had no edits to > the contents of the files? 1) I wrote all the code for those classes myself. 2) You can easily see by the ChangeLog that code was added in 2005; the other copyrights were from long before 2005. 95329 5 darin 2008-10-14 12:19:48 -0700 http://trac.webkit.org/changeset/37589 24344 2008-10-14 12:00:06 -0700 2008-10-14 12:08:13 -0700 patch FormPatch.txt text/plain 12033 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNzU4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDgtMTAtMTQgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTkzCisgICAgICAgICAgQnVn IDIxNTkzOiBhZGQgbXVsdGlwbGUtZmlsZSBzdXBwb3J0IHRvIEhUTUxGb3JtRWxlbWVudAorCisg ICAgICAgICogaHRtbC9Gb3JtRGF0YUxpc3QuY3BwOiBSZW1vdmVkIGFwcGVuZEZpbGUgc2luY2Ug aXQncyBub3cgaW5saW5lLgorICAgICAgICBBbHNvIHRvb2sgaW5jb3JyZWN0IG9sZCBjb3B5cmln aHRzIG9mZiBvZiB0aGlzIGZpbGUgdGhhdCBhcmUgbGVmdAorICAgICAgICBvdmVyIGZyb20gd2hl biBpdCB3YXMgc3BsaXQuCisgICAgICAgICogaHRtbC9Gb3JtRGF0YUxpc3QuaDogRGl0dG8uIENo YW5nZWQgRm9ybURhdGFMaXN0SXRlbSB0byBob2xkCisgICAgICAgIGEgRmlsZSBvYmplY3QgaW5z dGVhZCBvZiBhIHBhdGguIEFuZCBtYWRlIGl0cyBkYXRhIG1lbWJlcnMgcHJpdmF0ZS4KKyAgICAg ICAgQ2hhbmdlZCBGb3JtRGF0YUxpc3Q6OmFwcGVuZEZpbGUgYWNjb3JkaW5nbHkuCisKKyAgICAg ICAgKiBodG1sL0hUTUxGb3JtRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRm9y bUVsZW1lbnQ6OmZvcm1EYXRhKTogVXBkYXRlZCBmb3IgYWJvdmUgY2hhbmdlcy4KKyAgICAgICAg UmVtb3ZlZCB0aGUgY29kZSB0aGF0IHNwZWNpYWwtY2FzZXMgSFRNTElucHV0RWxlbWVudCwgYmVj YXVzZSBub3cKKyAgICAgICAgdGhlIEZvcm1EYXRhTGlzdEl0ZW0gaGFzIGV2ZXJ5dGhpbmcgd2Ug bmVlZC4gQW5kIGlmIHRoZXJlIGFyZQorICAgICAgICBtdWx0aXBsZSBmaWxlcywgd2UnbGwgZ2V0 IG11bHRpcGxlIGxpc3QgaXRlbXMgZm9yIHRoZW0uCisKKyAgICAgICAgKiBodG1sL0hUTUxJbnB1 dEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6YXBwZW5k Rm9ybURhdGEpOiBDaGFuZ2VkIHRoZSBjb2RlIGZvcgorICAgICAgICA8aW5wdXQgdHlwZT1maWxl PiB0byB1c2UgRmlsZSBvYmplY3RzIGluc3RlYWQgb2YgcGF0aCBzdHJpbmdzIGFuZAorICAgICAg ICBhbHNvIHRvIGFwcGVuZCBtdWx0aXBsZSBmaWxlcyBpZiB0aGUgZmlsZSBsaXN0IGhhcyB0aGVt LgorCiAyMDA4LTEwLTE0ICBUb3IgQXJuZSBWZXN0YsO4ICA8dGF2ZXN0Ym9AdHJvbGx0ZWNoLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbi4KSW5kZXg6IFdlYkNvcmUvaHRtbC9Gb3Jt RGF0YUxpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9Gb3JtRGF0YUxpc3QuY3Bw CShyZXZpc2lvbiAzNzU4NykKKysrIFdlYkNvcmUvaHRtbC9Gb3JtRGF0YUxpc3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDExICsxLDUgQEAKIC8qCi0gKiBUaGlzIGZpbGUgaXMgcGFydCBvZiB0 aGUgRE9NIGltcGxlbWVudGF0aW9uIGZvciBLREUuCi0gKgotICogQ29weXJpZ2h0IChDKSAxOTk5 IExhcnMgS25vbGwgKGtub2xsQGtkZS5vcmcpCi0gKiAgICAgICAgICAgKEMpIDE5OTkgQW50dGkg S29pdmlzdG8gKGtvaXZpc3RvQGtkZS5vcmcpCi0gKiAgICAgICAgICAgKEMpIDIwMDEgRGlyayBN dWVsbGVyIChtdWVsbGVyQGtkZS5vcmcpCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIw MDYgQXBwbGUgQ29tcHV0ZXIsIEluYy4KLSAqICAgICAgICAgICAoQykgMjAwNiBBbGV4ZXkgUHJv c2t1cnlha292IChhcEBueXBvcC5jb20pCisgKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDUsIDIw MDYsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGli cmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAq IG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVi bGljCkBAIC05NCwxMCArODgsNCBAQCB2b2lkIEZvcm1EYXRhTGlzdDo6YXBwZW5kU3RyaW5nKGNv bnN0IFN0CiAgICAgbV9saXN0LmFwcGVuZChjc3RyKTsKIH0KIAotdm9pZCBGb3JtRGF0YUxpc3Q6 OmFwcGVuZEZpbGUoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgZmlsZW5hbWUpCi17 Ci0gICAgYXBwZW5kU3RyaW5nKGtleSk7Ci0gICAgbV9saXN0LmFwcGVuZChmaWxlbmFtZSk7Ci19 Ci0KIH0gLy8gbmFtZXNwYWNlCkluZGV4OiBXZWJDb3JlL2h0bWwvRm9ybURhdGFMaXN0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0Zvcm1EYXRhTGlzdC5oCShyZXZpc2lvbiAzNzU4NykK KysrIFdlYkNvcmUvaHRtbC9Gb3JtRGF0YUxpc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMSwxMSAr MSw1IEBACiAvKgotICogVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhlIERPTSBpbXBsZW1lbnRhdGlv biBmb3IgS0RFLgotICoKLSAqIENvcHlyaWdodCAoQykgMTk5OSBMYXJzIEtub2xsIChrbm9sbEBr ZGUub3JnKQotICogICAgICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChrb2l2aXN0b0Br ZGUub3JnKQotICogICAgICAgICAgIChDKSAyMDAxIERpcmsgTXVlbGxlciAobXVlbGxlckBrZGUu b3JnKQotICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAyMDA2IEFwcGxlIENvbXB1dGVyLCBJ bmMuCi0gKiAgICAgICAgICAgKEMpIDIwMDYgQWxleGV5IFByb3NrdXJ5YWtvdiAoYXBAbnlwb3Au Y29tKQorICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAyMDA2LCAyMDA4IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhl IHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtMjgsMTkgKzIyLDIz IEBACiAjZGVmaW5lIEZvcm1EYXRhTGlzdF9oCiAKICNpbmNsdWRlICJDU3RyaW5nLmgiCi0jaW5j bHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJGaWxlLmgiCiAjaW5jbHVkZSAiVGV4 dEVuY29kaW5nLmgiCi0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLXN0cnVjdCBGb3JtRGF0YUxpc3RJdGVtIHsKK2NsYXNzIEZvcm1EYXRhTGlzdEl0ZW0g eworcHVibGljOgogICAgIEZvcm1EYXRhTGlzdEl0ZW0oKSB7IH0KICAgICBGb3JtRGF0YUxpc3RJ dGVtKGNvbnN0IENTdHJpbmcmIGRhdGEpIDogbV9kYXRhKGRhdGEpIHsgfQotICAgIEZvcm1EYXRh TGlzdEl0ZW0oY29uc3QgU3RyaW5nJiBwYXRoKSA6IG1fcGF0aChwYXRoKSB7IH0KKyAgICBGb3Jt RGF0YUxpc3RJdGVtKFBhc3NSZWZQdHI8RmlsZT4gZmlsZSkgOiBtX2ZpbGUoZmlsZSkgeyB9CiAK LSAgICBTdHJpbmcgbV9wYXRoOworICAgIGNvbnN0IENTdHJpbmcmIGRhdGEoKSBjb25zdCB7IHJl dHVybiBtX2RhdGE7IH0KKyAgICBGaWxlKiBmaWxlKCkgY29uc3QgeyByZXR1cm4gbV9maWxlLmdl dCgpOyB9CisKK3ByaXZhdGU6CiAgICAgQ1N0cmluZyBtX2RhdGE7CisgICAgUmVmUHRyPEZpbGU+ IG1fZmlsZTsKIH07CiAKIGNsYXNzIEZvcm1EYXRhTGlzdCB7CkBAIC01Myw3ICs1MSw4IEBAIHB1 YmxpYzoKICAgICAgICAgeyBhcHBlbmRTdHJpbmcoa2V5KTsgYXBwZW5kU3RyaW5nKHZhbHVlKTsg fQogICAgIHZvaWQgYXBwZW5kRGF0YShjb25zdCBTdHJpbmcmIGtleSwgaW50IHZhbHVlKQogICAg ICAgICB7IGFwcGVuZFN0cmluZyhrZXkpOyBhcHBlbmRTdHJpbmcoU3RyaW5nOjpudW1iZXIodmFs dWUpKTsgfQotICAgIHZvaWQgYXBwZW5kRmlsZShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3Ry aW5nJiBmaWxlbmFtZSk7CisgICAgdm9pZCBhcHBlbmRGaWxlKGNvbnN0IFN0cmluZyYga2V5LCBQ YXNzUmVmUHRyPEZpbGU+IGZpbGUpCisgICAgICAgIHsgYXBwZW5kU3RyaW5nKGtleSk7IG1fbGlz dC5hcHBlbmQoZmlsZSk7IH0KIAogICAgIGNvbnN0IFZlY3RvcjxGb3JtRGF0YUxpc3RJdGVtPiYg bGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlzdDsgfQogCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRN TEZvcm1FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTEZvcm1FbGVt ZW50LmNwcAkocmV2aXNpb24gMzc1ODcpCisrKyBXZWJDb3JlL2h0bWwvSFRNTEZvcm1FbGVtZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjUyLDE0ICsyNTIsMTQgQEAgUGFzc1JlZlB0cjxGb3Jt RGF0YT4gSFRNTEZvcm1FbGVtZW50OjpmbwogICAgICAgICAgICAgICAgIGlmICghbV9tdWx0aXBh cnQpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gT21pdCB0aGUgbmFtZSAiaXNpbmRleCIgaWYg aXQncyB0aGUgZmlyc3QgZm9ybSBkYXRhIGVsZW1lbnQuCiAgICAgICAgICAgICAgICAgICAgIC8v IEZJWE1FOiBXaHkgaXMgdGhpcyBhIGdvb2QgcnVsZT8gSXMgdGhpcyBvYnNvbGV0ZSBub3c/Ci0g ICAgICAgICAgICAgICAgICAgIGlmIChlbmNvZGVkRGF0YS5pc0VtcHR5KCkgJiYgaXRlbS5tX2Rh dGEgPT0gImlzaW5kZXgiKQotICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kRW5jb2RlZFN0 cmluZyhlbmNvZGVkRGF0YSwgbGlzdC5saXN0KClbKytqXS5tX2RhdGEpOworICAgICAgICAgICAg ICAgICAgICBpZiAoZW5jb2RlZERhdGEuaXNFbXB0eSgpICYmIGl0ZW0uZGF0YSgpID09ICJpc2lu ZGV4IikKKyAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZEVuY29kZWRTdHJpbmcoZW5jb2Rl ZERhdGEsIGxpc3QubGlzdCgpWysral0uZGF0YSgpKTsKICAgICAgICAgICAgICAgICAgICAgZWxz ZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIWVuY29kZWREYXRhLmlzRW1wdHkoKSkK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbmNvZGVkRGF0YS5hcHBlbmQoJyYnKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZEVuY29kZWRTdHJpbmcoZW5jb2RlZERhdGEsIGl0 ZW0ubV9kYXRhKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZEVuY29kZWRTdHJpbmco ZW5jb2RlZERhdGEsIGl0ZW0uZGF0YSgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGVuY29k ZWREYXRhLmFwcGVuZCgnPScpOwotICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kRW5jb2Rl ZFN0cmluZyhlbmNvZGVkRGF0YSwgbGlzdC5saXN0KClbKytqXS5tX2RhdGEpOworICAgICAgICAg ICAgICAgICAgICAgICAgYXBwZW5kRW5jb2RlZFN0cmluZyhlbmNvZGVkRGF0YSwgbGlzdC5saXN0 KClbKytqXS5kYXRhKCkpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgVmVjdG9yPGNoYXI+IGhlYWRlcjsKQEAgLTI2 NywzMCArMjY3LDI0IEBAIFBhc3NSZWZQdHI8Rm9ybURhdGE+IEhUTUxGb3JtRWxlbWVudDo6Zm8K ICAgICAgICAgICAgICAgICAgICAgYXBwZW5kU3RyaW5nKGhlYWRlciwgYm91bmRhcnkpOwogICAg ICAgICAgICAgICAgICAgICBhcHBlbmRTdHJpbmcoaGVhZGVyLCAiXHJcbiIpOwogICAgICAgICAg ICAgICAgICAgICBhcHBlbmRTdHJpbmcoaGVhZGVyLCAiQ29udGVudC1EaXNwb3NpdGlvbjogZm9y bS1kYXRhOyBuYW1lPVwiIik7Ci0gICAgICAgICAgICAgICAgICAgIGhlYWRlci5hcHBlbmQoaXRl bS5tX2RhdGEuZGF0YSgpLCBpdGVtLm1fZGF0YS5sZW5ndGgoKSk7CisgICAgICAgICAgICAgICAg ICAgIGhlYWRlci5hcHBlbmQoaXRlbS5kYXRhKCkuZGF0YSgpLCBpdGVtLmRhdGEoKS5sZW5ndGgo KSk7CiAgICAgICAgICAgICAgICAgICAgIGhlYWRlci5hcHBlbmQoJyInKTsKIAogICAgICAgICAg ICAgICAgICAgICBib29sIHNob3VsZEdlbmVyYXRlRmlsZSA9IGZhbHNlOwogICAgICAgICAgICAg ICAgICAgICAvLyBpZiB0aGUgY3VycmVudCB0eXBlIGlzIEZJTEUsIHRoZW4gd2UgYWxzbyBuZWVk IHRvCiAgICAgICAgICAgICAgICAgICAgIC8vIGluY2x1ZGUgdGhlIGZpbGVuYW1lCi0gICAgICAg ICAgICAgICAgICAgIGlmIChjb250cm9sLT5oYXNMb2NhbE5hbWUoaW5wdXRUYWcpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgJiYgc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KGNv bnRyb2wpLT5pbnB1dFR5cGUoKSA9PSBIVE1MSW5wdXRFbGVtZW50OjpGSUxFKSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBTdHJpbmcgcGF0aDsKLSAgICAgICAgICAgICAgICAgICAgICAgIFN0 cmluZyBmaWxlbmFtZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZpbGVMaXN0KiBm aWxlcyA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihjb250cm9sKS0+ZmlsZXMoKTsK LSAgICAgICAgICAgICAgICAgICAgICAgIGlmICghZmlsZXMtPmlzRW1wdHkoKSkgewotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIE5PVEU6IFdlIGN1cnJlbnRseSBvbmx5IGhhbmRsZSBv bmUgZmlsZTsgc29tZSBkYXkgd2UnbGwgYWRkIG11bHRpcGxlIGZpbGUgc3VwcG9ydC4KLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBGaWxlKiBmaWxlID0gZmlsZXMtPml0ZW0oMCk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcGF0aCA9IGZpbGUtPnBhdGgoKTsKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICBmaWxlbmFtZSA9IGZpbGUtPmZpbGVOYW1lKCk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmIChpdGVtLmZpbGUo KSkgeworICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiBwYXRoID0gaXRlbS5m aWxlKCktPnBhdGgoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFN0cmluZyBmaWxlbmFtZSA9 IGl0ZW0uZmlsZSgpLT5maWxlTmFtZSgpOwogCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBM ZXQgdGhlIGFwcGxpY2F0aW9uIHNwZWNpZnkgYSBmaWxlbmFtZSBpZiBpdCdzIGdvaW5nIHRvIGdl bmVyYXRlIGEgcmVwbGFjZW1lbnQgZmlsZSBmb3IgdGhlIHVwbG9hZC4KLSAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQoKS0+cGFnZSgpKSB7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGdlbmVyYXRlZEZpbGVuYW1lOwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNob3VsZEdlbmVyYXRlRmlsZSA9IHBhZ2UtPmNocm9tZSgpLT5j bGllbnQoKS0+c2hvdWxkUmVwbGFjZVdpdGhHZW5lcmF0ZWRGaWxlRm9yVXBsb2FkKHBhdGgsIGdl bmVyYXRlZEZpbGVuYW1lKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2hvdWxk R2VuZXJhdGVGaWxlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlbmFtZSA9 IGdlbmVyYXRlZEZpbGVuYW1lOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFwYXRoLmlz RW1wdHkoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0g ZG9jdW1lbnQoKS0+cGFnZSgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFN0 cmluZyBnZW5lcmF0ZWRGaWxlbmFtZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2hvdWxkR2VuZXJhdGVGaWxlID0gcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5zaG91bGRSZXBs YWNlV2l0aEdlbmVyYXRlZEZpbGVGb3JVcGxvYWQocGF0aCwgZ2VuZXJhdGVkRmlsZW5hbWUpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2hvdWxkR2VuZXJhdGVGaWxlKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZW5hbWUgPSBnZW5lcmF0ZWRG aWxlbmFtZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIHdvbid0 IHdvcmsgaWYgdGhlIGZpbGVuYW1lIGluY2x1ZGVzIGEgIiBtYXJrLApAQCAtMzAyLDkgKzI5Niwx MCBAQCBQYXNzUmVmUHRyPEZvcm1EYXRhPiBIVE1MRm9ybUVsZW1lbnQ6OmZvCiAgICAgICAgICAg ICAgICAgICAgICAgICBoZWFkZXIuYXBwZW5kKCciJyk7CiAKICAgICAgICAgICAgICAgICAgICAg ICAgIGlmICghZmlsZW5hbWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24ncyBuYW1lIG1ha2VzIGl0IHNvdW5kIGxpa2UgaXQg dGFrZXMgYSBwYXRoLCBub3QganVzdCBhIGJhc2VuYW1lLgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIEJ1dCBmaWxlbmFtZSBpcyBub3QgdGhlIHBhdGguIEJ1dCBub3RlLCB0aGF0IGl0 J3Mgbm90IHNhZmUgdG8ganVzdCB1c2UgcGF0aCwgaW5zdGVhZAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIHNpbmNlIGluIHRoZSBnZW5lcmF0ZWQtZmlsZSBjYXNlIGl0IHdpbGwgbm90 IHJlZmxlY3QgdGhlIE1JTUUgdHlwZSBvZiB0aGUgZ2VuZXJhdGVkIGZpbGUuCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBNSU1FVHlwZVJlZ2lzdHJ5IGZ1bmN0aW9u J3MgbmFtZSBtYWtlcyBpdCBzb3VuZCBsaWtlIGl0IHRha2VzIGEgcGF0aCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBub3QganVzdCBhIGJhc2VuYW1lLiBCdXQgZmlsZW5hbWUgaXMg bm90IHRoZSBwYXRoLiBCdXQgbm90ZSB0aGF0IGl0J3Mgbm90IHNhZmUgdG8KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBqdXN0IHVzZSBwYXRoIGluc3RlYWQgc2luY2UgaW4gdGhlIGdl bmVyYXRlZC1maWxlIGNhc2UgaXQgd2lsbCBub3QgcmVmbGVjdCB0aGUKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvLyBNSU1FIHR5cGUgb2YgdGhlIGdlbmVyYXRlZCBmaWxlLgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFN0cmluZyBtaW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6 OmdldE1JTUVUeXBlRm9yUGF0aChmaWxlbmFtZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKCFtaW1lVHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYXBwZW5kU3RyaW5nKGhlYWRlciwgIlxyXG5Db250ZW50LVR5cGU6ICIpOwpAQCAtMzE4 LDEwICszMTMsMTAgQEAgUGFzc1JlZlB0cjxGb3JtRGF0YT4gSFRNTEZvcm1FbGVtZW50Ojpmbwog ICAgICAgICAgICAgICAgICAgICAvLyBhcHBlbmQgYm9keQogICAgICAgICAgICAgICAgICAgICBy ZXN1bHQtPmFwcGVuZERhdGEoaGVhZGVyLmRhdGEoKSwgaGVhZGVyLnNpemUoKSk7CiAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IEZvcm1EYXRhTGlzdEl0ZW0mIGl0ZW0gPSBsaXN0Lmxpc3QoKVtq ICsgMV07Ci0gICAgICAgICAgICAgICAgICAgIGlmIChzaXplX3QgZGF0YVNpemUgPSBpdGVtLm1f ZGF0YS5sZW5ndGgoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC0+YXBwZW5kRGF0 YShpdGVtLm1fZGF0YS5kYXRhKCksIGRhdGFTaXplKTsKLSAgICAgICAgICAgICAgICAgICAgZWxz ZSBpZiAoIWl0ZW0ubV9wYXRoLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHJl c3VsdC0+YXBwZW5kRmlsZShpdGVtLm1fcGF0aCwgc2hvdWxkR2VuZXJhdGVGaWxlKTsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKHNpemVfdCBkYXRhU2l6ZSA9IGl0ZW0uZGF0YSgpLmxlbmd0aCgp KQorICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0LT5hcHBlbmREYXRhKGl0ZW0uZGF0YSgp LmRhdGEoKSwgZGF0YVNpemUpOworICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChpdGVtLmZp bGUoKSAmJiAhaXRlbS5maWxlKCktPnBhdGgoKS5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAg ICAgICAgICByZXN1bHQtPmFwcGVuZEZpbGUoaXRlbS5maWxlKCktPnBhdGgoKSwgc2hvdWxkR2Vu ZXJhdGVGaWxlKTsKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0LT5hcHBlbmREYXRhKCJcclxu IiwgMik7CiAKICAgICAgICAgICAgICAgICAgICAgKytqOwpJbmRleDogV2ViQ29yZS9odG1sL0hU TUxJbnB1dEVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MSW5wdXRF bGVtZW50LmNwcAkocmV2aXNpb24gMzc1ODcpCisrKyBXZWJDb3JlL2h0bWwvSFRNTElucHV0RWxl bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIsNyArMiw3IEBACiAgKiBDb3B5cmlnaHQgKEMp IDE5OTkgTGFycyBLbm9sbCAoa25vbGxAa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMTk5OSBB bnR0aSBLb2l2aXN0byAoa29pdmlzdG9Aa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMjAwMSBE aXJrIE11ZWxsZXIgKG11ZWxsZXJAa2RlLm9yZykKLSAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAw NSwgMjAwNiwgMjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMDQsIDIwMDUsIDIwMDYsIDIwMDcsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICogICAgICAgICAgIChDKSAyMDA2IEFsZXhleSBQcm9za3VyeWFrb3YgKGFw QG55cG9wLmNvbSkKICAqIENvcHlyaWdodCAoQykgMjAwNyBTYW11ZWwgV2VpbmlnIChzYW1Ad2Vi a2l0Lm9yZykKICAqCkBAIC04NjgsMjAgKzg2OCwyMyBAQCBib29sIEhUTUxJbnB1dEVsZW1lbnQ6 OmFwcGVuZEZvcm1EYXRhKEZvCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKIAot ICAgICAgICBjYXNlIEZJTEU6CisgICAgICAgIGNhc2UgRklMRTogewogICAgICAgICAgICAgLy8g Q2FuJ3Qgc3VibWl0IGZpbGUgb24gR0VULgogICAgICAgICAgICAgaWYgKCFtdWx0aXBhcnQpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAvLyBJZiBubyBmaWxl bmFtZSBhdCBhbGwgaXMgZW50ZXJlZCwgcmV0dXJuIHN1Y2Nlc3NmdWwgYnV0IGVtcHR5LgogICAg ICAgICAgICAgLy8gTnVsbCB3b3VsZCBiZSBtb3JlIGxvZ2ljYWwsIGJ1dCBOZXRzY2FwZSBwb3N0 cyBhbiBlbXB0eSBmaWxlLiBBcmdoLgotICAgICAgICAgICAgaWYgKG1fZmlsZUxpc3QtPmlzRW1w dHkoKSkgewotICAgICAgICAgICAgICAgIGVuY29kaW5nLmFwcGVuZERhdGEobmFtZSgpLCBTdHJp bmcoIiIpKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIG51bUZpbGVzID0gbV9maWxlTGlzdC0+bGVu Z3RoKCk7CisgICAgICAgICAgICBpZiAoIW51bUZpbGVzKSB7CisgICAgICAgICAgICAgICAgZW5j b2RpbmcuYXBwZW5kRmlsZShuYW1lKCksIEZpbGU6OmNyZWF0ZSgiIikpOwogICAgICAgICAgICAg ICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBlbmNvZGluZy5h cHBlbmRGaWxlKG5hbWUoKSwgbV9maWxlTGlzdC0+aXRlbSgwKS0+cGF0aCgpKTsKKyAgICAgICAg ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1GaWxlczsgKytpKQorICAgICAgICAgICAg ICAgIGVuY29kaW5nLmFwcGVuZEZpbGUobmFtZSgpLCBtX2ZpbGVMaXN0LT5pdGVtKGkpKTsKICAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiBmYWxz ZTsKIH0K