27217 2009-07-13 08:44:52 -0700 Straight quotes should match fancy quotes in in-page search 2009-07-14 09:51:50 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 1 darin darin oldest_to_newest 131323 0 darin 2009-07-13 08:44:52 -0700 If a web page contains the text "it’s" and I search for "it's" (note the different quotes), the text isn't found. * STEPS TO REPRODUCE 1. Open Safari. 2. Navigate to <http://www.nytimes.com/2009/07/08/world/asia/08china.html?partner=rss&emc=rss&pagewanted=all>. 3. Hit command-F and type "china's" into the search box. Note that there's no match. 4. Hit command-F again and type "china’s" into the search box, this time using option-shift-] (in the US layout) for the quote mark. Note that it now matches. <rdar://problem/7036451> 131340 1 32663 darin 2009-07-13 09:57:52 -0700 Created attachment 32663 patch 131342 2 32663 mitz 2009-07-13 10:02:55 -0700 Comment on attachment 32663 patch Should this also fold hebrewPunctuationGershayim to " and (the still-nonexistent) hebrewPunctuationGeresh to ' ? 131349 3 darin 2009-07-13 10:45:05 -0700 (In reply to comment #2) > Should this also fold hebrewPunctuationGershayim to " and (the > still-nonexistent) hebrewPunctuationGeresh to ' ? Sure, I think it could. We could also fold a lot of other characters; for example there are similar quote marks with slightly different vertical positions. I decided to stick with the ones I knew would be a big deal. We can work together to make a longer list. 131478 4 32663 mitz 2009-07-13 20:12:14 -0700 Comment on attachment 32663 patch r=me if you add a mapping from hebrewPunctuationGershayim to " and from hebrewPunctuationGeresh (U+05F3, still not in CharacterNames.h) to ' 131597 5 darin 2009-07-14 09:51:50 -0700 http://trac.webkit.org/changeset/45858 32663 2009-07-13 09:57:52 -0700 2009-07-13 20:12:14 -0700 patch FindQuotePatch.txt text/plain 14893 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTgyNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDctMTMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0cmFp Z2h0IHF1b3RlcyBzaG91bGQgbWF0Y2ggZmFuY3kgcXVvdGVzIGluIGluLXBhZ2Ugc2VhcmNoCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzIxNworCisg ICAgICAgIFRlc3RzOiBmYXN0L3RleHQvZmluZC1xdW90ZXMuaHRtbAorCisgICAgICAgICogZWRp dGluZy9UZXh0SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9sZFF1b3RlTWFyayk6 IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6Zm9sZFF1b3RlTWFya3MpOiBBZGRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OlNlYXJjaEJ1ZmZlcjo6U2VhcmNoQnVmZmVyKTogQ2FsbCBmb2xkUXVvdGVN YXJrcyBvbiB0aGUgdGFyZ2V0IHN0cmluZy4KKyAgICAgICAgKFdlYkNvcmU6OlNlYXJjaEJ1ZmZl cjo6YXBwZW5kKTogQ2FsbCBmb2xkUXVvdGVNYXJrcyBvbiBjaGFyYWN0ZXJzIGFzIHRoZXkgYXJl CisgICAgICAgIGFkZGVkIHRvIHRoZSBzZWFyY2ggYnVmZmVyLgorCisgICAgICAgICogcGxhdGZv cm0vdGV4dC9DaGFyYWN0ZXJOYW1lcy5oOiBBZGRlZCBtb3JlIHF1b3RhdGlvbiBtYXJrIGNoYXJh Y3RlciBuYW1lcy4KKyAgICAgICAgU29ydGVkIGNoYXJhY3RlciBuYW1lcyB3aXRoIHRoZSBzb3J0 IHRvb2wuCisKIDIwMDktMDctMTMgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9y b25oYUBjb2xsYWJvcmEuY28udWs+CiAKICAgICAgICAgVW5yZXZpZXdlZCBtYWtlIGRpc3QgYnVp bGQgZml4LgpJbmRleDogV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAJKHJldmlzaW9uIDQ1ODI0KQor KysgV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEz OTMsOCArMTM5MywzNiBAQCBjb25zdCBVQ2hhciogV29yZEF3YXJlSXRlcmF0b3I6OmNoYXJhY3Rl CiAKIC8vIC0tLS0tLS0tCiAKK3N0YXRpYyBpbmxpbmUgVUNoYXIgZm9sZFF1b3RlTWFyayhVQ2hh ciBjKQoreworICAgIHN3aXRjaCAoYykgeworICAgICAgICBjYXNlIGxlZnREb3VibGVRdW90YXRp b25NYXJrOgorICAgICAgICBjYXNlIHJpZ2h0RG91YmxlUXVvdGF0aW9uTWFyazoKKyAgICAgICAg ICAgIHJldHVybiAnIic7CisgICAgICAgIGNhc2UgbGVmdFNpbmdsZVF1b3RhdGlvbk1hcms6Cisg ICAgICAgIGNhc2UgcmlnaHRTaW5nbGVRdW90YXRpb25NYXJrOgorICAgICAgICAgICAgcmV0dXJu ICdcJyc7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gYzsKKyAgICB9Cit9 CisKK3N0YXRpYyBpbmxpbmUgdm9pZCBmb2xkUXVvdGVNYXJrcyhTdHJpbmcmIHMpCit7CisgICAg cy5yZXBsYWNlKGxlZnREb3VibGVRdW90YXRpb25NYXJrLCAnIicpOworICAgIHMucmVwbGFjZShs ZWZ0U2luZ2xlUXVvdGF0aW9uTWFyaywgJ1wnJyk7CisgICAgcy5yZXBsYWNlKHJpZ2h0RG91Ymxl UXVvdGF0aW9uTWFyaywgJyInKTsKKyAgICBzLnJlcGxhY2UocmlnaHRTaW5nbGVRdW90YXRpb25N YXJrLCAnXCcnKTsKK30KKwogI2lmIFVTRShJQ1VfVU5JQ09ERSkgJiYgIVVDT05GSUdfTk9fQ09M TEFUSU9OCiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBmb2xkUXVvdGVNYXJrcyhVQ2hhciogZGF0YSwg c2l6ZV90IGxlbmd0aCkKK3sKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxlbmd0aDsgKytp KQorICAgICAgICBkYXRhW2ldID0gZm9sZFF1b3RlTWFyayhkYXRhW2ldKTsKK30KKwogc3RhdGlj IGNvbnN0IHNpemVfdCBtaW5pbXVtU2VhcmNoQnVmZmVyU2l6ZSA9IDgxOTI7CiAKICNpZm5kZWYg TkRFQlVHCkBAIC0xNDQwLDcgKzE0NjgsMTIgQEAgaW5saW5lIFNlYXJjaEJ1ZmZlcjo6U2VhcmNo QnVmZmVyKGNvbnN0IAogewogICAgIEFTU0VSVCghbV90YXJnZXQuaXNFbXB0eSgpKTsKIAotICAg IHNpemVfdCB0YXJnZXRMZW5ndGggPSB0YXJnZXQubGVuZ3RoKCk7CisgICAgLy8gRklYTUU6IFdl J2QgbGlrZSB0byB0YWlsb3IgdGhlIHNlYXJjaGVyIHRvIGZvbGQgcXVvdGUgbWFya3MgZm9yIHVz IGluc3RlYWQKKyAgICAvLyBvZiBkb2luZyBpdCBvdXJzZWx2ZXMsIGJ1dCBJQ1UgZG9lc24ndCBv ZmZlciBhIHdheSB0byBhZGQgdGFpbG9yaW5nIG9uIHRvcAorICAgIC8vIG9mIHRoZSBsb2NhbGUt c3BlY2lmaWMgdGFpbG9yaW5nIGFzIG9mIHRoaXMgd3JpdGluZy4KKyAgICBmb2xkUXVvdGVNYXJr cyhtX3RhcmdldCk7CisKKyAgICBzaXplX3QgdGFyZ2V0TGVuZ3RoID0gbV90YXJnZXQubGVuZ3Ro KCk7CiAgICAgbV9idWZmZXIucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShtYXgodGFyZ2V0TGVuZ3Ro ICogOCwgbWluaW11bVNlYXJjaEJ1ZmZlclNpemUpKTsKICAgICBtX292ZXJsYXAgPSBtX2J1ZmZl ci5jYXBhY2l0eSgpIC8gNDsKIApAQCAtMTQ4MCw5ICsxNTEzLDExIEBAIGlubGluZSBzaXplX3Qg U2VhcmNoQnVmZmVyOjphcHBlbmQoY29uc3QKICAgICAgICAgbV9idWZmZXIuc2hyaW5rKG1fb3Zl cmxhcCk7CiAgICAgfQogCi0gICAgc2l6ZV90IHVzYWJsZUxlbmd0aCA9IG1pbihtX2J1ZmZlci5j YXBhY2l0eSgpIC0gbV9idWZmZXIuc2l6ZSgpLCBsZW5ndGgpOworICAgIHNpemVfdCBvbGRMZW5n dGggPSBtX2J1ZmZlci5zaXplKCk7CisgICAgc2l6ZV90IHVzYWJsZUxlbmd0aCA9IG1pbihtX2J1 ZmZlci5jYXBhY2l0eSgpIC0gb2xkTGVuZ3RoLCBsZW5ndGgpOwogICAgIEFTU0VSVCh1c2FibGVM ZW5ndGgpOwogICAgIG1fYnVmZmVyLmFwcGVuZChjaGFyYWN0ZXJzLCB1c2FibGVMZW5ndGgpOwor ICAgIGZvbGRRdW90ZU1hcmtzKG1fYnVmZmVyLmRhdGEoKSArIG9sZExlbmd0aCwgdXNhYmxlTGVu Z3RoKTsKICAgICByZXR1cm4gdXNhYmxlTGVuZ3RoOwogfQogCkBAIC0xNTQ5LDYgKzE1ODQsNyBA QCBpbmxpbmUgU2VhcmNoQnVmZmVyOjpTZWFyY2hCdWZmZXIoY29uc3QgCiB7CiAgICAgQVNTRVJU KCFtX3RhcmdldC5pc0VtcHR5KCkpOwogICAgIG1fdGFyZ2V0LnJlcGxhY2Uobm9CcmVha1NwYWNl LCAnICcpOworICAgIGZvbGRRdW90ZU1hcmtzKG1fdGFyZ2V0KTsKIH0KIAogaW5saW5lIFNlYXJj aEJ1ZmZlcjo6flNlYXJjaEJ1ZmZlcigpCkBAIC0xNTY4LDcgKzE2MDQsNyBAQCBpbmxpbmUgYm9v bCBTZWFyY2hCdWZmZXI6OmF0QnJlYWsoKSBjb25zCiAKIGlubGluZSB2b2lkIFNlYXJjaEJ1ZmZl cjo6YXBwZW5kKFVDaGFyIGMsIGJvb2wgaXNTdGFydCkKIHsKLSAgICBtX2J1ZmZlclttX2N1cnNv cl0gPSBjID09IG5vQnJlYWtTcGFjZSA/ICcgJyA6IGM7CisgICAgbV9idWZmZXJbbV9jdXJzb3Jd ID0gYyA9PSBub0JyZWFrU3BhY2UgPyAnICcgOiBmb2xkUXVvdGVNYXJrKGMpOwogICAgIG1faXND aGFyYWN0ZXJTdGFydEJ1ZmZlclttX2N1cnNvcl0gPSBpc1N0YXJ0OwogICAgIGlmICgrK21fY3Vy c29yID09IG1fdGFyZ2V0Lmxlbmd0aCgpKSB7CiAgICAgICAgIG1fY3Vyc29yID0gMDsKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9DaGFyYWN0ZXJOYW1lcy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vdGV4dC9DaGFyYWN0ZXJOYW1lcy5oCShyZXZpc2lvbiA0NTgyNCkKKysr IFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9DaGFyYWN0ZXJOYW1lcy5oCSh3b3JraW5nIGNvcHkpCkBA IC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNyBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0z OSwyMCArMzksMjMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNvbnN0IFVDaGFyIGJ1bGxl dCA9IDB4MjAyMjsKICAgICBjb25zdCBVQ2hhciBoZWJyZXdQdW5jdHVhdGlvbkdlcnNoYXlpbSA9 IDB4MDVGNDsKICAgICBjb25zdCBVQ2hhciBob3Jpem9udGFsRWxsaXBzaXMgPSAweDIwMjY7Ci0g ICAgY29uc3QgVUNoYXIgaWRlb2dyYXBoaWNTcGFjZSA9IDB4MzAwMDsKICAgICBjb25zdCBVQ2hh ciBpZGVvZ3JhcGhpY0NvbW1hID0gMHgzMDAxOwogICAgIGNvbnN0IFVDaGFyIGlkZW9ncmFwaGlj RnVsbFN0b3AgPSAweDMwMDI7Ci0gICAgY29uc3QgVUNoYXIgbGVmdFRvUmlnaHRNYXJrID0gMHgy MDBFOworICAgIGNvbnN0IFVDaGFyIGlkZW9ncmFwaGljU3BhY2UgPSAweDMwMDA7CisgICAgY29u c3QgVUNoYXIgbGVmdERvdWJsZVF1b3RhdGlvbk1hcmsgPSAweDIwMUM7CisgICAgY29uc3QgVUNo YXIgbGVmdFNpbmdsZVF1b3RhdGlvbk1hcmsgPSAweDIwMTg7CiAgICAgY29uc3QgVUNoYXIgbGVm dFRvUmlnaHRFbWJlZCA9IDB4MjAyQTsKKyAgICBjb25zdCBVQ2hhciBsZWZ0VG9SaWdodE1hcmsg PSAweDIwMEU7CiAgICAgY29uc3QgVUNoYXIgbGVmdFRvUmlnaHRPdmVycmlkZSA9IDB4MjAyRDsK ICAgICBjb25zdCBVQ2hhciBuZXdsaW5lQ2hhcmFjdGVyID0gMHgwMDBBOwogICAgIGNvbnN0IFVD aGFyIG5vQnJlYWtTcGFjZSA9IDB4MDBBMDsKICAgICBjb25zdCBVQ2hhciBvYmplY3RSZXBsYWNl bWVudENoYXJhY3RlciA9IDB4RkZGQzsKICAgICBjb25zdCBVQ2hhciBwb3BEaXJlY3Rpb25hbEZv cm1hdHRpbmcgPSAweDIwMkM7CiAgICAgY29uc3QgVUNoYXIgcmVwbGFjZW1lbnRDaGFyYWN0ZXIg PSAweEZGRkQ7CisgICAgY29uc3QgVUNoYXIgcmlnaHREb3VibGVRdW90YXRpb25NYXJrID0gMHgy MDFEOwogICAgIGNvbnN0IFVDaGFyIHJpZ2h0U2luZ2xlUXVvdGF0aW9uTWFyayA9IDB4MjAxOTsK LSAgICBjb25zdCBVQ2hhciByaWdodFRvTGVmdE1hcmsgPSAweDIwMEY7CiAgICAgY29uc3QgVUNo YXIgcmlnaHRUb0xlZnRFbWJlZCA9IDB4MjAyQjsKKyAgICBjb25zdCBVQ2hhciByaWdodFRvTGVm dE1hcmsgPSAweDIwMEY7CiAgICAgY29uc3QgVUNoYXIgcmlnaHRUb0xlZnRPdmVycmlkZSA9IDB4 MjAyRTsKICAgICBjb25zdCBVQ2hhciBzb2Z0SHlwaGVuID0gMHgwMEFEOwogICAgIGNvbnN0IFVD aGFyIHdoaXRlQnVsbGV0ID0gMHgyNUU2OwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDU4MjQpCisrKyBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAw OS0wNy0xMyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RyYWlnaHQgcXVvdGVzIHNob3VsZCBt YXRjaCBmYW5jeSBxdW90ZXMgaW4gaW4tcGFnZSBzZWFyY2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MjE3CisKKyAgICAgICAgKiBmYXN0L3RleHQv ZmluZC1xdW90ZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvZmlu ZC1xdW90ZXMuaHRtbDogQ29waWVkIGZyb20gTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ZpbmQtY2Fz ZS1mb2xkaW5nLmh0bWwuCisKIDIwMDktMDctMTMgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1 c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFyaXlhIEhpZGF5 YXQuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvZmluZC1xdW90ZXMtZXhwZWN0ZWQudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC9maW5kLXF1b3Rlcy1leHBlY3Rl ZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3RleHQvZmluZC1xdW90ZXMt ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBACitTVUNDRVNTOiBGb3VuZCBh bGwgdGhlIHF1b3RlcyBhcyBleHBlY3RlZC4KClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRl c3RzL2Zhc3QvdGV4dC9maW5kLXF1b3Rlcy1leHBlY3RlZC50eHQKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBz dm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2Zp bmQtcXVvdGVzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ZpbmQt cXVvdGVzLmh0bWwJKHJldmlzaW9uIDQ1NzYxKQkoZnJvbSBMYXlvdXRUZXN0cy9mYXN0L3RleHQv ZmluZC1jYXNlLWZvbGRpbmcuaHRtbDo0NTc2MSkKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC9m aW5kLXF1b3Rlcy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNTUgQEAKKzxodG1sPgor PGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgZnVuY3Rpb24gY2FuRmluZCh0YXJnZXQsIHNw ZWNpbWVuKQorICAgICAgICB7CisgICAgICAgICAgICBnZXRTZWxlY3Rpb24oKS5lbXB0eSgpOwor ICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSBzcGVjaW1lbjsKKyAgICAgICAg ICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJGaW5kU3RyaW5nIiwgZmFsc2UsIHRhcmdldCk7Cisg ICAgICAgICAgICB2YXIgcmVzdWx0ID0gZ2V0U2VsZWN0aW9uKCkucmFuZ2VDb3VudCAhPSAwOwor ICAgICAgICAgICAgZ2V0U2VsZWN0aW9uKCkuZW1wdHkoKTsKKyAgICAgICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBydW5UZXN0cygpCisgICAgICAg IHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAg ICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgICAg ICB2YXIgc21hbGxTaGFycFMgPSBTdHJpbmcuZnJvbUNoYXJDb2RlKDB4REYpOworCisgICAgICAg ICAgICB2YXIgc3VjY2VzcyA9IHRydWU7CisKKyAgICAgICAgICAgIHZhciBtZXNzYWdlID0gIkZB SUxVUkU6IjsKKworICAgICAgICAgICAgaWYgKCFjYW5GaW5kKCJTdHJhIiArIHNtYWxsU2hhcnBT ICsgImUiLCAiU3RyYSIgKyBzbWFsbFNoYXJwUyArICJlIikpIHsKKyAgICAgICAgICAgICAgICBz dWNjZXNzID0gZmFsc2U7CisgICAgICAgICAgICAgICAgbWVzc2FnZSArPSAiIENhbm5vdCBmaW5k IHNtYWxsIHNoYXJwIHMgd2hlbiBzZWFyY2hpbmcgZm9yIHNtYWxsIHNoYXJwIHMuIjsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgLy8gQWRkZWQgYW4gIngiIHRvIHRoZSBzdGFydCBvZiB0 aGUgdGFyZ2V0IHN0cmluZyB0byB3b3JrIGFyb3VuZCBhbiBJQ1UgYnVnLgorICAgICAgICAgICAg Ly8gU2VlIDxodHRwOi8vYnVncy5pY3UtcHJvamVjdC5vcmcvdHJhYy90aWNrZXQvNjY3MT4gZm9y IGRldGFpbHMuCisgICAgICAgICAgICBpZiAoIWNhbkZpbmQoIlN0cmFzc2UiLCAieFN0cmEiICsg c21hbGxTaGFycFMgKyAiZSIpKSB7CisgICAgICAgICAgICAgICAgc3VjY2VzcyA9IGZhbHNlOwor ICAgICAgICAgICAgICAgIG1lc3NhZ2UgKz0gIiBDYW5ub3QgZmluZCBzbWFsbCBzaGFycCBzIHdo ZW4gc2VhcmNoaW5nIGZvciBzcy4iOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAo IWNhbkZpbmQoIlN0cmEiICsgc21hbGxTaGFycFMgKyAiZSIsICJTdHJhc3NlIikpIHsKKyAgICAg ICAgICAgICAgICBzdWNjZXNzID0gZmFsc2U7CisgICAgICAgICAgICAgICAgbWVzc2FnZSArPSAi IENhbm5vdCBmaW5kIHNzIHdoZW4gc2VhcmNoaW5nIGZvciBzbWFsbCBzaGFycCBzLiI7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghY2FuRmluZCgiU3RyYXNzZSIsICJTdHJhc3Nl IikpIHsKKyAgICAgICAgICAgICAgICBzdWNjZXNzID0gZmFsc2U7CisgICAgICAgICAgICAgICAg bWVzc2FnZSArPSAiIENhbm5vdCBmaW5kIHNzIHdoZW4gc2VhcmNoaW5nIGZvciBzcy4gIjsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKHN1Y2Nlc3MpCisgICAgICAgICAgICAgICAg bWVzc2FnZSA9ICJTVUNDRVNTOiBGb3VuZCBhbGwgdGhlIHZhcmlhbnRzIG9mIFN0cmFzc2UuIjsK KworICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSBtZXNzYWdlOworICAgICAg ICB9CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3RzKCkiPjwv Ym9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvdGV4dC9maW5kLXF1b3Rlcy5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC9maW5kLXF1b3Rlcy5odG1s CShyZXZpc2lvbiA0NTc2MSkKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC9maW5kLXF1b3Rlcy5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMSw0MSArMTEsODEgQEAKICAgICAgICAgICAgIHJldHVy biByZXN1bHQ7CiAgICAgICAgIH0KIAorICAgICAgICB2YXIgcXVvdGF0aW9uTWFyayA9ICciJzsK KyAgICAgICAgdmFyIGFwb3N0cm9waGUgPSAiJyI7CisgICAgICAgIHZhciBsZWZ0RG91YmxlUXVv dGF0aW9uTWFyayA9IFN0cmluZy5mcm9tQ2hhckNvZGUoMHgyMDFDKTsKKyAgICAgICAgdmFyIGxl ZnRTaW5nbGVRdW90YXRpb25NYXJrID0gU3RyaW5nLmZyb21DaGFyQ29kZSgweDIwMTgpOworICAg ICAgICB2YXIgcmlnaHREb3VibGVRdW90YXRpb25NYXJrID0gU3RyaW5nLmZyb21DaGFyQ29kZSgw eDIwMUQpOworICAgICAgICB2YXIgcmlnaHRTaW5nbGVRdW90YXRpb25NYXJrID0gU3RyaW5nLmZy b21DaGFyQ29kZSgweDIwMTkpOworCisgICAgICAgIHZhciBzdWNjZXNzID0gdHJ1ZTsKKworICAg ICAgICB2YXIgbWVzc2FnZSA9ICJGQUlMVVJFOiI7CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdEZp bmRFeHBlY3RpbmdTdWNjZXNzKHRhcmdldE5hbWUsIHNwZWNpbWVuTmFtZSkKKyAgICAgICAgewor ICAgICAgICAgICAgdmFyIHRhcmdldCA9IGV2YWwodGFyZ2V0TmFtZSk7CisgICAgICAgICAgICB2 YXIgc3BlY2ltZW4gPSBldmFsKHNwZWNpbWVuTmFtZSk7CisgICAgICAgICAgICBpZiAoY2FuRmlu ZCh0YXJnZXQsIHNwZWNpbWVuKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICBzdWNjZXNzID0gZmFsc2U7CisgICAgICAgICAgICBtZXNzYWdlICs9ICIgQ2Fubm90IGZpbmQg IiArIHNwZWNpbWVuTmFtZSArICIgd2hlbiBzZWFyY2hpbmcgZm9yICIgKyB0YXJnZXROYW1lICsg Ii4iOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdEZpbmRFeHBlY3RpbmdGYWls dXJlKHRhcmdldE5hbWUsIHNwZWNpbWVuTmFtZSkKKyAgICAgICAgeworICAgICAgICAgICAgdmFy IHRhcmdldCA9IGV2YWwodGFyZ2V0TmFtZSk7CisgICAgICAgICAgICB2YXIgc3BlY2ltZW4gPSBl dmFsKHNwZWNpbWVuTmFtZSk7CisgICAgICAgICAgICBpZiAoIWNhbkZpbmQodGFyZ2V0LCBzcGVj aW1lbikpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgc3VjY2VzcyA9IGZh bHNlOworICAgICAgICAgICAgbWVzc2FnZSArPSAiIEZvdW5kICIgKyBzcGVjaW1lbk5hbWUgKyAi IHdoZW4gc2VhcmNoaW5nIGZvciAiICsgdGFyZ2V0TmFtZSArICIuIjsKKyAgICAgICAgfQorCiAg ICAgICAgIGZ1bmN0aW9uIHJ1blRlc3RzKCkKICAgICAgICAgewogICAgICAgICAgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAgICAgICAgICAgICAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5kdW1wQXNUZXh0KCk7CiAKLSAgICAgICAgICAgIHZhciBzbWFsbFNoYXJwUyA9IFN0 cmluZy5mcm9tQ2hhckNvZGUoMHhERik7Ci0KLSAgICAgICAgICAgIHZhciBzdWNjZXNzID0gdHJ1 ZTsKLQotICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSAiRkFJTFVSRToiOwotCi0gICAgICAgICAg ICBpZiAoIWNhbkZpbmQoIlN0cmEiICsgc21hbGxTaGFycFMgKyAiZSIsICJTdHJhIiArIHNtYWxs U2hhcnBTICsgImUiKSkgewotICAgICAgICAgICAgICAgIHN1Y2Nlc3MgPSBmYWxzZTsKLSAgICAg ICAgICAgICAgICBtZXNzYWdlICs9ICIgQ2Fubm90IGZpbmQgc21hbGwgc2hhcnAgcyB3aGVuIHNl YXJjaGluZyBmb3Igc21hbGwgc2hhcnAgcy4iOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAg ICAvLyBBZGRlZCBhbiAieCIgdG8gdGhlIHN0YXJ0IG9mIHRoZSB0YXJnZXQgc3RyaW5nIHRvIHdv cmsgYXJvdW5kIGFuIElDVSBidWcuCi0gICAgICAgICAgICAvLyBTZWUgPGh0dHA6Ly9idWdzLmlj dS1wcm9qZWN0Lm9yZy90cmFjL3RpY2tldC82NjcxPiBmb3IgZGV0YWlscy4KLSAgICAgICAgICAg IGlmICghY2FuRmluZCgiU3RyYXNzZSIsICJ4U3RyYSIgKyBzbWFsbFNoYXJwUyArICJlIikpIHsK LSAgICAgICAgICAgICAgICBzdWNjZXNzID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgbWVzc2Fn ZSArPSAiIENhbm5vdCBmaW5kIHNtYWxsIHNoYXJwIHMgd2hlbiBzZWFyY2hpbmcgZm9yIHNzLiI7 Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmICghY2FuRmluZCgiU3RyYSIgKyBzbWFs bFNoYXJwUyArICJlIiwgIlN0cmFzc2UiKSkgewotICAgICAgICAgICAgICAgIHN1Y2Nlc3MgPSBm YWxzZTsKLSAgICAgICAgICAgICAgICBtZXNzYWdlICs9ICIgQ2Fubm90IGZpbmQgc3Mgd2hlbiBz ZWFyY2hpbmcgZm9yIHNtYWxsIHNoYXJwIHMuIjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAg ICAgaWYgKCFjYW5GaW5kKCJTdHJhc3NlIiwgIlN0cmFzc2UiKSkgewotICAgICAgICAgICAgICAg IHN1Y2Nlc3MgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBtZXNzYWdlICs9ICIgQ2Fubm90IGZp bmQgc3Mgd2hlbiBzZWFyY2hpbmcgZm9yIHNzLiAiOwotICAgICAgICAgICAgfQorICAgICAgICAg ICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJhcG9zdHJvcGhlIiwgImxlZnREb3VibGVRdW90 YXRpb25NYXJrIik7CisgICAgICAgICAgICB0ZXN0RmluZEV4cGVjdGluZ0ZhaWx1cmUoImFwb3N0 cm9waGUiLCAicXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdG YWlsdXJlKCJhcG9zdHJvcGhlIiwgInJpZ2h0RG91YmxlUXVvdGF0aW9uTWFyayIpOworICAgICAg ICAgICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJsZWZ0RG91YmxlUXVvdGF0aW9uTWFyayIs ICJhcG9zdHJvcGhlIik7CisgICAgICAgICAgICB0ZXN0RmluZEV4cGVjdGluZ0ZhaWx1cmUoImxl ZnREb3VibGVRdW90YXRpb25NYXJrIiwgImxlZnRTaW5nbGVRdW90YXRpb25NYXJrIik7CisgICAg ICAgICAgICB0ZXN0RmluZEV4cGVjdGluZ0ZhaWx1cmUoImxlZnREb3VibGVRdW90YXRpb25NYXJr IiwgInJpZ2h0U2luZ2xlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBl Y3RpbmdGYWlsdXJlKCJsZWZ0U2luZ2xlUXVvdGF0aW9uTWFyayIsICJsZWZ0RG91YmxlUXVvdGF0 aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJsZWZ0U2lu Z2xlUXVvdGF0aW9uTWFyayIsICJxdW90YXRpb25NYXJrIik7CisgICAgICAgICAgICB0ZXN0Rmlu ZEV4cGVjdGluZ0ZhaWx1cmUoImxlZnRTaW5nbGVRdW90YXRpb25NYXJrIiwgInJpZ2h0RG91Ymxl UXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJx dW90YXRpb25NYXJrIiwgImFwb3N0cm9waGUiKTsKKyAgICAgICAgICAgIHRlc3RGaW5kRXhwZWN0 aW5nRmFpbHVyZSgicXVvdGF0aW9uTWFyayIsICJsZWZ0U2luZ2xlUXVvdGF0aW9uTWFyayIpOwor ICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJxdW90YXRpb25NYXJrIiwgInJp Z2h0U2luZ2xlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdG YWlsdXJlKCJyaWdodERvdWJsZVF1b3RhdGlvbk1hcmsiLCAiYXBvc3Ryb3BoZSIpOworICAgICAg ICAgICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJyaWdodERvdWJsZVF1b3RhdGlvbk1hcmsi LCAibGVmdFNpbmdsZVF1b3RhdGlvbk1hcmsiKTsKKyAgICAgICAgICAgIHRlc3RGaW5kRXhwZWN0 aW5nRmFpbHVyZSgicmlnaHREb3VibGVRdW90YXRpb25NYXJrIiwgInJpZ2h0U2luZ2xlUXVvdGF0 aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdGYWlsdXJlKCJyaWdodFNp bmdsZVF1b3RhdGlvbk1hcmsiLCAibGVmdERvdWJsZVF1b3RhdGlvbk1hcmsiKTsKKyAgICAgICAg ICAgIHRlc3RGaW5kRXhwZWN0aW5nRmFpbHVyZSgicmlnaHRTaW5nbGVRdW90YXRpb25NYXJrIiwg InF1b3RhdGlvbk1hcmsiKTsKKyAgICAgICAgICAgIHRlc3RGaW5kRXhwZWN0aW5nRmFpbHVyZSgi cmlnaHRTaW5nbGVRdW90YXRpb25NYXJrIiwgInJpZ2h0RG91YmxlUXVvdGF0aW9uTWFyayIpOwor ICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdTdWNjZXNzKCJhcG9zdHJvcGhlIiwgImFwb3N0 cm9waGUiKTsKKyAgICAgICAgICAgIHRlc3RGaW5kRXhwZWN0aW5nU3VjY2VzcygiYXBvc3Ryb3Bo ZSIsICJsZWZ0U2luZ2xlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBl Y3RpbmdTdWNjZXNzKCJhcG9zdHJvcGhlIiwgInJpZ2h0U2luZ2xlUXVvdGF0aW9uTWFyayIpOwor ICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdTdWNjZXNzKCJsZWZ0RG91YmxlUXVvdGF0aW9u TWFyayIsICJsZWZ0RG91YmxlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRF eHBlY3RpbmdTdWNjZXNzKCJsZWZ0RG91YmxlUXVvdGF0aW9uTWFyayIsICJxdW90YXRpb25NYXJr Iik7CisgICAgICAgICAgICB0ZXN0RmluZEV4cGVjdGluZ1N1Y2Nlc3MoImxlZnREb3VibGVRdW90 YXRpb25NYXJrIiwgInJpZ2h0RG91YmxlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVz dEZpbmRFeHBlY3RpbmdTdWNjZXNzKCJsZWZ0U2luZ2xlUXVvdGF0aW9uTWFyayIsICJhcG9zdHJv cGhlIik7CisgICAgICAgICAgICB0ZXN0RmluZEV4cGVjdGluZ1N1Y2Nlc3MoImxlZnRTaW5nbGVR dW90YXRpb25NYXJrIiwgImxlZnRTaW5nbGVRdW90YXRpb25NYXJrIik7CisgICAgICAgICAgICB0 ZXN0RmluZEV4cGVjdGluZ1N1Y2Nlc3MoImxlZnRTaW5nbGVRdW90YXRpb25NYXJrIiwgInJpZ2h0 U2luZ2xlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdTdWNj ZXNzKCJxdW90YXRpb25NYXJrIiwgImxlZnREb3VibGVRdW90YXRpb25NYXJrIik7CisgICAgICAg ICAgICB0ZXN0RmluZEV4cGVjdGluZ1N1Y2Nlc3MoInF1b3RhdGlvbk1hcmsiLCAicXVvdGF0aW9u TWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdTdWNjZXNzKCJxdW90YXRpb25N YXJrIiwgInJpZ2h0RG91YmxlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRF eHBlY3RpbmdTdWNjZXNzKCJyaWdodERvdWJsZVF1b3RhdGlvbk1hcmsiLCAibGVmdERvdWJsZVF1 b3RhdGlvbk1hcmsiKTsKKyAgICAgICAgICAgIHRlc3RGaW5kRXhwZWN0aW5nU3VjY2Vzcygicmln aHREb3VibGVRdW90YXRpb25NYXJrIiwgInF1b3RhdGlvbk1hcmsiKTsKKyAgICAgICAgICAgIHRl c3RGaW5kRXhwZWN0aW5nU3VjY2VzcygicmlnaHREb3VibGVRdW90YXRpb25NYXJrIiwgInJpZ2h0 RG91YmxlUXVvdGF0aW9uTWFyayIpOworICAgICAgICAgICAgdGVzdEZpbmRFeHBlY3RpbmdTdWNj ZXNzKCJyaWdodFNpbmdsZVF1b3RhdGlvbk1hcmsiLCAiYXBvc3Ryb3BoZSIpOworICAgICAgICAg ICAgdGVzdEZpbmRFeHBlY3RpbmdTdWNjZXNzKCJyaWdodFNpbmdsZVF1b3RhdGlvbk1hcmsiLCAi bGVmdFNpbmdsZVF1b3RhdGlvbk1hcmsiKTsKKyAgICAgICAgICAgIHRlc3RGaW5kRXhwZWN0aW5n U3VjY2VzcygicmlnaHRTaW5nbGVRdW90YXRpb25NYXJrIiwgInJpZ2h0U2luZ2xlUXVvdGF0aW9u TWFyayIpOwogCiAgICAgICAgICAgICBpZiAoc3VjY2VzcykKLSAgICAgICAgICAgICAgICBtZXNz YWdlID0gIlNVQ0NFU1M6IEZvdW5kIGFsbCB0aGUgdmFyaWFudHMgb2YgU3RyYXNzZS4iOworICAg ICAgICAgICAgICAgIG1lc3NhZ2UgPSAiU1VDQ0VTUzogRm91bmQgYWxsIHRoZSBxdW90ZXMgYXMg ZXhwZWN0ZWQuIjsKIAogICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSBtZXNz YWdlOwogICAgICAgICB9Cg==