159693 2016-07-12 15:37:21 -0700 platformUserPreferredLanguages on Mac should not try to put the region into the language 2016-07-12 17:10:18 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 156993 90906 1 fpizlo fpizlo ap benjamin cdumez cmarcelo commit-queue ggaren webkit-bug-importer oldest_to_newest 1210207 0 fpizlo 2016-07-12 15:37:21 -0700 Currently, navigator.language is the thing that we use as the BCP-47 tag in our Intl code when certain APIs are called without a locale argument. That mostly based sense, and is deeply wired into our engine. In bug 156993, we made Intl aware of the region as a separate thing from the language by having platformUserPreferredLanguages() return something like a BCP-47 tag that was <language>-<region>. For example, if I told System Preferences that I want to speak English in Poland then we'd get "en-pl". This had the effect of making Intl APIs format dates using Polish formatting, for example. But this is an odd change, since that same function also feeds into navigator.language. "en-pl" isn't what we want there, since my System Preferences settings did not mean to imply that I want to speak Polish-style English. I don't think there is such a thing as Polish-style English (except in funny jokes, maybe). It may be worthwhile to wire the region settings more elegantly into Intl, but if we do that, it should be via a mechanism that is separate from navigator.language. 1210208 1 283463 fpizlo 2016-07-12 15:40:47 -0700 Created attachment 283463 the patch 1210209 2 283463 ap 2016-07-12 15:43:10 -0700 Comment on attachment 283463 the patch rs=me We don't need to revert API tests, do we? 1210210 3 fpizlo 2016-07-12 15:43:55 -0700 (In reply to comment #2) > Comment on attachment 283463 [details] > the patch > > rs=me > > We don't need to revert API tests, do we? We may have to. I will run them and see! 1210213 4 fpizlo 2016-07-12 15:44:33 -0700 (In reply to comment #3) > (In reply to comment #2) > > Comment on attachment 283463 [details] > > the patch > > > > rs=me > > > > We don't need to revert API tests, do we? > > We may have to. I will run them and see! Yeah we have to. I will revert https://trac.webkit.org/changeset/200105/trunk/Tools/TestWebKitAPI/Tests/mac/NavigatorLanguage.mm. 1210216 5 283465 fpizlo 2016-07-12 15:50:43 -0700 Created attachment 283465 patch for landing Also reverted the API test. 1210260 6 fpizlo 2016-07-12 17:09:53 -0700 Landed in https://trac.webkit.org/changeset/203141 1210261 7 webkit-bug-importer 2016-07-12 17:10:18 -0700 <rdar://problem/27313190> 283463 2016-07-12 15:40:47 -0700 2016-07-12 15:50:43 -0700 the patch blah.patch text/plain 6140 fpizlo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMDMxMzIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE2LTA3LTEyICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CisKKyAgICAgICAgcGxhdGZvcm1Vc2VyUHJlZmVycmVkTGFuZ3VhZ2VzIG9u IE1hYyBzaG91bGQgbm90IHRyeSB0byBwdXQgdGhlIHJlZ2lvbiBpbnRvIHRoZSBsYW5ndWFnZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5NjkzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBD dXJyZW50bHksIG5hdmlnYXRvci5sYW5ndWFnZSBpcyB0aGUgdGhpbmcgdGhhdCB3ZSB1c2UgYXMg dGhlIEJDUC00NyB0YWcgaW4gb3VyIEludGwgY29kZQorICAgICAgICB3aGVuIGNlcnRhaW4gQVBJ cyBhcmUgY2FsbGVkIHdpdGhvdXQgYSBsb2NhbGUgYXJndW1lbnQuICBUaGF0IG1vc3RseSBtYWtl cyBzZW5zZSwgYW5kIGlzCisgICAgICAgIGRlZXBseSB3aXJlZCBpbnRvIG91ciBlbmdpbmUuCisK KyAgICAgICAgSW4gcjIwMDEwNSwgd2UgbWFkZSBJbnRsIGF3YXJlIG9mIHRoZSByZWdpb24gYXMg YSBzZXBhcmF0ZSB0aGluZyBmcm9tIHRoZSBsYW5ndWFnZSBieSBoYXZpbmcKKyAgICAgICAgcGxh dGZvcm1Vc2VyUHJlZmVycmVkTGFuZ3VhZ2VzKCkgcmV0dXJuIHNvbWV0aGluZyBsaWtlIGEgQkNQ LTQ3IHRhZyB0aGF0IHdhcworICAgICAgICA8bGFuZ3VhZ2U+LTxyZWdpb24+LiAgRm9yIGV4YW1w bGUsIGlmIEkgdG9sZCBTeXN0ZW0gUHJlZmVyZW5jZXMgdGhhdCBJIHdhbnQgdG8gc3BlYWsgRW5n bGlzaAorICAgICAgICBidXQgbGl2ZSBpbiBQb2xhbmQgdGhlbiB3ZSdkIGdldCAiZW4tcGwiLiAg VGhpcyBoYWQgdGhlIGVmZmVjdCBvZiBtYWtpbmcgSW50bCBBUElzIGZvcm1hdAorICAgICAgICBk YXRlcyB1c2luZyBQb2xpc2ggZm9ybWF0dGluZywgZm9yIGV4YW1wbGUuCisKKyAgICAgICAgQnV0 IHRoaXMgaXMgYW4gb2RkIGNoYW5nZSwgc2luY2UgdGhhdCBzYW1lIGZ1bmN0aW9uIGFsc28gZmVl ZHMgaW50byBuYXZpZ2F0b3IubGFuZ3VhZ2UuCisgICAgICAgICJlbi1wbCIgaXNuJ3Qgd2hhdCB3 ZSB3YW50IHRoZXJlLCBzaW5jZSBteSBTeXN0ZW0gUHJlZmVyZW5jZXMgc2V0dGluZ3MgYXJlbid0 IHN1cHBvc2VkIHRvCisgICAgICAgIG1lYW4gdGhhdCBJIHdhbnQgdG8gc3BlYWsgUG9saXNoLXN0 eWxlIEVuZ2xpc2guICBUaGVyZSdzIG5vIHN1Y2ggdGhpbmcuCisKKyAgICAgICAgSXQgbWF5IGJl IHdvcnRod2hpbGUgdG8gd2lyZSB0aGUgcmVnaW9uIHNldHRpbmdzIG1vcmUgZWxlZ2FudGx5IGlu dG8gSW50bCwgYnV0IGlmIHdlIGRvIHRoYXQsCisgICAgICAgIGl0IHNob3VsZCBiZSB2aWEgYSBt ZWNoYW5pc20gdGhhdCBpcyBzZXBhcmF0ZSBmcm9tIG5hdmlnYXRvci5sYW5ndWFnZS4gU28sIHRo aXMgY2hhbmdlIHNpbXBseQorICAgICAgICByZXZlcnRzIHIyMDAxMDUuCisKKyAgICAgICAgKiB3 dGYvUGxhdGZvcm1Vc2VyUHJlZmVycmVkTGFuZ3VhZ2VzTWFjLm1tOgorICAgICAgICAoV1RGOjpo dHRwU3R5bGVMYW5ndWFnZUNvZGUpOgorICAgICAgICAoV1RGOjpwbGF0Zm9ybVVzZXJQcmVmZXJy ZWRMYW5ndWFnZXMpOgorICAgICAgICAoV1RGOjppc1ZhbGlkSUNVQ291bnRyeUNvZGUpOiBEZWxl dGVkLgorCiAyMDE2LTA3LTEyICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtKU0NdIEFycmF5LnByb3RvdHlwZS5qb2luKCkgZmFpbHMgc29tZSBjb25m b3JtYW5jZSB0ZXN0cwpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm1Vc2VyUHJlZmVycmVk TGFuZ3VhZ2VzTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtVXNl clByZWZlcnJlZExhbmd1YWdlc01hYy5tbQkocmV2aXNpb24gMjAzMTIzKQorKysgU291cmNlL1dU Ri93dGYvUGxhdGZvcm1Vc2VyUHJlZmVycmVkTGFuZ3VhZ2VzTWFjLm1tCSh3b3JraW5nIGNvcHkp CkBAIC03NywxNSArNzcsMTMgQEAgKyAodm9pZClsYW5ndWFnZVByZWZlcmVuY2VzRGlkQ2hhbmdl OihOUwogCiBuYW1lc3BhY2UgV1RGIHsKIAotc3RhdGljIFN0cmluZyBodHRwU3R5bGVMYW5ndWFn ZUNvZGUoTlNTdHJpbmcgKmxhbmd1YWdlLCBOU1N0cmluZyAqY291bnRyeSkKK3N0YXRpYyBTdHJp bmcgaHR0cFN0eWxlTGFuZ3VhZ2VDb2RlKE5TU3RyaW5nICpsYW5ndWFnZSkKIHsKICAgICBTSW50 MzIgbGFuZ3VhZ2VDb2RlOwogICAgIFNJbnQzMiByZWdpb25Db2RlOyAKICAgICBTSW50MzIgc2Ny aXB0Q29kZTsgCiAgICAgQ0ZTdHJpbmdFbmNvZGluZyBzdHJpbmdFbmNvZGluZzsKICAgICAKLSAg ICBib29sIGxhbmd1YWdlRGlkU3BlY2lmeUV4cGxpY2l0VmFyaWFudCA9IFtsYW5ndWFnZSByYW5n ZU9mQ2hhcmFjdGVyRnJvbVNldDpbTlNDaGFyYWN0ZXJTZXQgY2hhcmFjdGVyU2V0V2l0aENoYXJh Y3RlcnNJblN0cmluZzpAIi1fIl1dLmxvY2F0aW9uICE9IE5TTm90Rm91bmQ7Ci0KICAgICAvLyBG SVhNRTogVGhpcyB0cmFuc2Zvcm1hdGlvbiBpcyB2ZXJ5IHdyb25nOgogICAgIC8vIDEuIFRoZXJl IGlzIG5vIHJlYXNvbiB3aHkgQ0ZCdW5kbGUgbG9jYWxpemF0aW9uIG5hbWVzIHdvdWxkIGJlIGF0 IGFsbCByZWxhdGVkIHRvIGxhbmd1YWdlIG5hbWVzIGFzIHVzZWQgb24gdGhlIFdlYi4KICAgICAv LyAyLiBTY3JpcHQgTWFuYWdlciBjb2RlcyBjYW5ub3QgcmVwcmVzZW50IGFsbCBsYW5ndWFnZXMg dGhhdCBhcmUgbm93IHN1cHBvcnRlZCBieSB0aGUgcGxhdGZvcm0sIHNvIHRoZSBjb252ZXJzaW9u IGlzIGxvc3N5LgpAQCAtOTcsMTkgKzk1LDkgQEAgc3RhdGljIFN0cmluZyBodHRwU3R5bGVMYW5n dWFnZUNvZGUoTlNTdAogCiAgICAgLy8gTWFrZSB0aGUgc3RyaW5nIGxvd2VyY2FzZS4KICAgICBO U1N0cmluZyAqbG93ZXJjYXNlTGFuZ3VhZ2VDb2RlID0gW2xhbmd1YWdlIGxvd2VyY2FzZVN0cmlu Z107Ci0gICAgTlNTdHJpbmcgKmxvd2VyY2FzZUNvdW50cnlDb2RlID0gW2NvdW50cnkgbG93ZXJj YXNlU3RyaW5nXTsKLSAgICAKLSAgICAvLyBJZiB3ZSBzZWUgYSAiXyIgYWZ0ZXIgYSAyLWxldHRl ciBsYW5ndWFnZSBjb2RlOgotICAgIC8vIElmIHRoZSBjb3VudHJ5IGlzIHZhbGlkIGFuZCB0aGUg bGFuZ3VhZ2UgZGlkIG5vdCBzcGVjaWZ5IGEgdmFyaWFudCwgcmVwbGFjZSB0aGUgIl8iIGFuZAot ICAgIC8vIHdoYXRldmVyIGNvbWVzIGFmdGVyIGl0IHdpdGggIi0iIGZvbGxvd2VkIGJ5IHRoZSBj b3VudHJ5IGNvZGUuCi0gICAgLy8gT3RoZXJ3aXNlLCByZXBsYWNlIHRoZSAiXyIgd2l0aCBhICIt IiBhbmQgdXNlIHdoYXRldmVyIGNvdW50cnkKLSAgICAvLyBDRkJ1bmRsZUNvcHlMb2NhbGl6YXRp b25Gb3JMb2NhbGl6YXRpb25JbmZvKCkgcmV0dXJuZWQuCi0gICAgaWYgKFtsb3dlcmNhc2VMYW5n dWFnZUNvZGUgbGVuZ3RoXSA+PSAzICYmIFtsb3dlcmNhc2VMYW5ndWFnZUNvZGUgY2hhcmFjdGVy QXRJbmRleDoyXSA9PSAnXycpIHsKLSAgICAgICAgaWYgKGNvdW50cnkgJiYgIWxhbmd1YWdlRGlk U3BlY2lmeUV4cGxpY2l0VmFyaWFudCkKLSAgICAgICAgICAgIHJldHVybiBbTlNTdHJpbmcgc3Ry aW5nV2l0aEZvcm1hdDpAIiVALSVAIiwgW2xvd2VyY2FzZUxhbmd1YWdlQ29kZSBzdWJzdHJpbmdX aXRoUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgMildLCBsb3dlcmNhc2VDb3VudHJ5Q29kZV07CiAgICAg ICAgIAotICAgICAgICAvLyBGYWxsIGJhY2sgdG8gb2xkZXIgYmVoYXZpb3IsIHdoaWNoIHVzZWQg dGhlIG9yaWdpbmFsIGxhbmd1YWdlLWJhc2VkIGNvZGUgYnV0IGp1c3QgY2hhbmdlZAotICAgICAg ICAvLyB0aGUgIl8iIHRvIGEgIi0iLgorICAgIC8vIFR1cm4gYSAnXycgaW50byBhICctJyBpZiBp dCBhcHBlYXJzIGFmdGVyIGEgMi1sZXR0ZXIgbGFuZ3VhZ2UgY29kZQorICAgIGlmIChbbG93ZXJj YXNlTGFuZ3VhZ2VDb2RlIGxlbmd0aF0gPj0gMyAmJiBbbG93ZXJjYXNlTGFuZ3VhZ2VDb2RlIGNo YXJhY3RlckF0SW5kZXg6Ml0gPT0gJ18nKSB7CiAgICAgICAgIFJldGFpblB0cjxOU011dGFibGVT dHJpbmc+IG11dGFibGVMYW5ndWFnZUNvZGUgPSBhZG9wdE5TKFtsb3dlcmNhc2VMYW5ndWFnZUNv ZGUgbXV0YWJsZUNvcHldKTsKICAgICAgICAgW211dGFibGVMYW5ndWFnZUNvZGUuZ2V0KCkgcmVw bGFjZUNoYXJhY3RlcnNJblJhbmdlOk5TTWFrZVJhbmdlKDIsIDEpIHdpdGhTdHJpbmc6QCItIl07 CiAgICAgICAgIHJldHVybiBtdXRhYmxlTGFuZ3VhZ2VDb2RlLmdldCgpOwpAQCAtMTE4LDIwICsx MDYsNiBAQCBzdGF0aWMgU3RyaW5nIGh0dHBTdHlsZUxhbmd1YWdlQ29kZShOU1N0CiAgICAgcmV0 dXJuIGxvd2VyY2FzZUxhbmd1YWdlQ29kZTsKIH0KIAotc3RhdGljIGJvb2wgaXNWYWxpZElDVUNv dW50cnlDb2RlKE5TU3RyaW5nKiBjb3VudHJ5Q29kZSkKLXsKLSAgICBpZiAoIWNvdW50cnlDb2Rl KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgY29uc3QgY2hhciogY29uc3QqIGNvdW50cmll cyA9IHVsb2NfZ2V0SVNPQ291bnRyaWVzKCk7Ci0gICAgY29uc3QgY2hhciogY291bnRyeVVURjgg PSBbY291bnRyeUNvZGUgVVRGOFN0cmluZ107Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgY291 bnRyaWVzW2ldOyArK2kpIHsKLSAgICAgICAgY29uc3QgY2hhciogcG9zc2libGVDb3VudHJ5ID0g Y291bnRyaWVzW2ldOwotICAgICAgICBpZiAoIXN0cmNtcChjb3VudHJ5VVRGOCwgcG9zc2libGVD b3VudHJ5KSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFs c2U7Ci19Ci0KIFZlY3RvcjxTdHJpbmc+IHBsYXRmb3JtVXNlclByZWZlcnJlZExhbmd1YWdlcygp CiB7CiAjaWYgUExBVEZPUk0oTUFDKQpAQCAtMTQ3LDE5ICsxMjEsMTMgQEAgVmVjdG9yPFN0cmlu Zz4gcGxhdGZvcm1Vc2VyUHJlZmVycmVkTGFuZwogICAgIFZlY3RvcjxTdHJpbmc+JiB1c2VyUHJl ZmVycmVkTGFuZ3VhZ2VzID0gcHJlZmVycmVkTGFuZ3VhZ2VzKCk7CiAKICAgICBpZiAodXNlclBy ZWZlcnJlZExhbmd1YWdlcy5pc0VtcHR5KCkpIHsKLSAgICAgICAgUmV0YWluUHRyPENGTG9jYWxl UmVmPiBsb2NhbGUgPSBhZG9wdENGKENGTG9jYWxlQ29weUN1cnJlbnQoKSk7Ci0gICAgICAgIE5T U3RyaW5nICpjb3VudHJ5Q29kZSA9IChOU1N0cmluZyAqKUNGTG9jYWxlR2V0VmFsdWUobG9jYWxl LmdldCgpLCBrQ0ZMb2NhbGVDb3VudHJ5Q29kZSk7Ci0gICAgICAgIAotICAgICAgICBpZiAoIWlz VmFsaWRJQ1VDb3VudHJ5Q29kZShjb3VudHJ5Q29kZSkpCi0gICAgICAgICAgICBjb3VudHJ5Q29k ZSA9IG5pbDsKLSAgICAgICAgCiAgICAgICAgIFJldGFpblB0cjxDRkFycmF5UmVmPiBsYW5ndWFn ZXMgPSBhZG9wdENGKENGTG9jYWxlQ29weVByZWZlcnJlZExhbmd1YWdlcygpKTsKICAgICAgICAg Q0ZJbmRleCBsYW5ndWFnZUNvdW50ID0gQ0ZBcnJheUdldENvdW50KGxhbmd1YWdlcy5nZXQoKSk7 CiAgICAgICAgIGlmICghbGFuZ3VhZ2VDb3VudCkKICAgICAgICAgICAgIHVzZXJQcmVmZXJyZWRM YW5ndWFnZXMuYXBwZW5kKCJlbiIpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIGZvciAo Q0ZJbmRleCBpID0gMDsgaSA8IGxhbmd1YWdlQ291bnQ7IGkrKykKLSAgICAgICAgICAgICAgICB1 c2VyUHJlZmVycmVkTGFuZ3VhZ2VzLmFwcGVuZChodHRwU3R5bGVMYW5ndWFnZUNvZGUoKE5TU3Ry aW5nICopQ0ZBcnJheUdldFZhbHVlQXRJbmRleChsYW5ndWFnZXMuZ2V0KCksIGkpLCBjb3VudHJ5 Q29kZSkpOworICAgICAgICAgICAgICAgIHVzZXJQcmVmZXJyZWRMYW5ndWFnZXMuYXBwZW5kKGh0 dHBTdHlsZUxhbmd1YWdlQ29kZSgoTlNTdHJpbmcgKilDRkFycmF5R2V0VmFsdWVBdEluZGV4KGxh bmd1YWdlcy5nZXQoKSwgaSkpKTsKICAgICAgICAgfQogICAgIH0KIAo= 283465 2016-07-12 15:50:43 -0700 2016-07-12 15:50:43 -0700 patch for landing blah.patch text/plain 8692 fpizlo SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMDMxMzIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE2LTA3LTEyICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CisKKyAgICAgICAgcGxhdGZvcm1Vc2VyUHJlZmVycmVkTGFuZ3VhZ2VzIG9u IE1hYyBzaG91bGQgbm90IHRyeSB0byBwdXQgdGhlIHJlZ2lvbiBpbnRvIHRoZSBsYW5ndWFnZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5NjkzCisK KyAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKyAgICAgICAg CisgICAgICAgIEN1cnJlbnRseSwgbmF2aWdhdG9yLmxhbmd1YWdlIGlzIHRoZSB0aGluZyB0aGF0 IHdlIHVzZSBhcyB0aGUgQkNQLTQ3IHRhZyBpbiBvdXIgSW50bCBjb2RlCisgICAgICAgIHdoZW4g Y2VydGFpbiBBUElzIGFyZSBjYWxsZWQgd2l0aG91dCBhIGxvY2FsZSBhcmd1bWVudC4gIFRoYXQg bW9zdGx5IG1ha2VzIHNlbnNlLCBhbmQgaXMKKyAgICAgICAgZGVlcGx5IHdpcmVkIGludG8gb3Vy IGVuZ2luZS4KKworICAgICAgICBJbiByMjAwMTA1LCB3ZSBtYWRlIEludGwgYXdhcmUgb2YgdGhl IHJlZ2lvbiBhcyBhIHNlcGFyYXRlIHRoaW5nIGZyb20gdGhlIGxhbmd1YWdlIGJ5IGhhdmluZwor ICAgICAgICBwbGF0Zm9ybVVzZXJQcmVmZXJyZWRMYW5ndWFnZXMoKSByZXR1cm4gc29tZXRoaW5n IGxpa2UgYSBCQ1AtNDcgdGFnIHRoYXQgd2FzCisgICAgICAgIDxsYW5ndWFnZT4tPHJlZ2lvbj4u ICBGb3IgZXhhbXBsZSwgaWYgSSB0b2xkIFN5c3RlbSBQcmVmZXJlbmNlcyB0aGF0IEkgd2FudCB0 byBzcGVhayBFbmdsaXNoCisgICAgICAgIGJ1dCBsaXZlIGluIFBvbGFuZCB0aGVuIHdlJ2QgZ2V0 ICJlbi1wbCIuICBUaGlzIGhhZCB0aGUgZWZmZWN0IG9mIG1ha2luZyBJbnRsIEFQSXMgZm9ybWF0 CisgICAgICAgIGRhdGVzIHVzaW5nIFBvbGlzaCBmb3JtYXR0aW5nLCBmb3IgZXhhbXBsZS4KKwor ICAgICAgICBCdXQgdGhpcyBpcyBhbiBvZGQgY2hhbmdlLCBzaW5jZSB0aGF0IHNhbWUgZnVuY3Rp b24gYWxzbyBmZWVkcyBpbnRvIG5hdmlnYXRvci5sYW5ndWFnZS4KKyAgICAgICAgImVuLXBsIiBp c24ndCB3aGF0IHdlIHdhbnQgdGhlcmUsIHNpbmNlIG15IFN5c3RlbSBQcmVmZXJlbmNlcyBzZXR0 aW5ncyBhcmVuJ3Qgc3VwcG9zZWQgdG8KKyAgICAgICAgbWVhbiB0aGF0IEkgd2FudCB0byBzcGVh ayBQb2xpc2gtc3R5bGUgRW5nbGlzaC4gIFRoZXJlJ3Mgbm8gc3VjaCB0aGluZy4KKworICAgICAg ICBJdCBtYXkgYmUgd29ydGh3aGlsZSB0byB3aXJlIHRoZSByZWdpb24gc2V0dGluZ3MgbW9yZSBl bGVnYW50bHkgaW50byBJbnRsLCBidXQgaWYgd2UgZG8gdGhhdCwKKyAgICAgICAgaXQgc2hvdWxk IGJlIHZpYSBhIG1lY2hhbmlzbSB0aGF0IGlzIHNlcGFyYXRlIGZyb20gbmF2aWdhdG9yLmxhbmd1 YWdlLiBTbywgdGhpcyBjaGFuZ2Ugc2ltcGx5CisgICAgICAgIHJldmVydHMgcjIwMDEwNS4KKwor ICAgICAgICAqIHd0Zi9QbGF0Zm9ybVVzZXJQcmVmZXJyZWRMYW5ndWFnZXNNYWMubW06CisgICAg ICAgIChXVEY6Omh0dHBTdHlsZUxhbmd1YWdlQ29kZSk6CisgICAgICAgIChXVEY6OnBsYXRmb3Jt VXNlclByZWZlcnJlZExhbmd1YWdlcyk6CisgICAgICAgIChXVEY6OmlzVmFsaWRJQ1VDb3VudHJ5 Q29kZSk6IERlbGV0ZWQuCisKIDIwMTYtMDctMTIgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFp bkBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gQXJyYXkucHJvdG90eXBlLmpvaW4oKSBmYWls cyBzb21lIGNvbmZvcm1hbmNlIHRlc3RzCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVz ZXJQcmVmZXJyZWRMYW5ndWFnZXNNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYv UGxhdGZvcm1Vc2VyUHJlZmVycmVkTGFuZ3VhZ2VzTWFjLm1tCShyZXZpc2lvbiAyMDMxMjMpCisr KyBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybVVzZXJQcmVmZXJyZWRMYW5ndWFnZXNNYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTc3LDE1ICs3NywxMyBAQCArICh2b2lkKWxhbmd1YWdlUHJlZmVyZW5j ZXNEaWRDaGFuZ2U6KE5TCiAKIG5hbWVzcGFjZSBXVEYgewogCi1zdGF0aWMgU3RyaW5nIGh0dHBT dHlsZUxhbmd1YWdlQ29kZShOU1N0cmluZyAqbGFuZ3VhZ2UsIE5TU3RyaW5nICpjb3VudHJ5KQor c3RhdGljIFN0cmluZyBodHRwU3R5bGVMYW5ndWFnZUNvZGUoTlNTdHJpbmcgKmxhbmd1YWdlKQog ewogICAgIFNJbnQzMiBsYW5ndWFnZUNvZGU7CiAgICAgU0ludDMyIHJlZ2lvbkNvZGU7IAogICAg IFNJbnQzMiBzY3JpcHRDb2RlOyAKICAgICBDRlN0cmluZ0VuY29kaW5nIHN0cmluZ0VuY29kaW5n OwogICAgIAotICAgIGJvb2wgbGFuZ3VhZ2VEaWRTcGVjaWZ5RXhwbGljaXRWYXJpYW50ID0gW2xh bmd1YWdlIHJhbmdlT2ZDaGFyYWN0ZXJGcm9tU2V0OltOU0NoYXJhY3RlclNldCBjaGFyYWN0ZXJT ZXRXaXRoQ2hhcmFjdGVyc0luU3RyaW5nOkAiLV8iXV0ubG9jYXRpb24gIT0gTlNOb3RGb3VuZDsK LQogICAgIC8vIEZJWE1FOiBUaGlzIHRyYW5zZm9ybWF0aW9uIGlzIHZlcnkgd3Jvbmc6CiAgICAg Ly8gMS4gVGhlcmUgaXMgbm8gcmVhc29uIHdoeSBDRkJ1bmRsZSBsb2NhbGl6YXRpb24gbmFtZXMg d291bGQgYmUgYXQgYWxsIHJlbGF0ZWQgdG8gbGFuZ3VhZ2UgbmFtZXMgYXMgdXNlZCBvbiB0aGUg V2ViLgogICAgIC8vIDIuIFNjcmlwdCBNYW5hZ2VyIGNvZGVzIGNhbm5vdCByZXByZXNlbnQgYWxs IGxhbmd1YWdlcyB0aGF0IGFyZSBub3cgc3VwcG9ydGVkIGJ5IHRoZSBwbGF0Zm9ybSwgc28gdGhl IGNvbnZlcnNpb24gaXMgbG9zc3kuCkBAIC05NywxOSArOTUsOSBAQCBzdGF0aWMgU3RyaW5nIGh0 dHBTdHlsZUxhbmd1YWdlQ29kZShOU1N0CiAKICAgICAvLyBNYWtlIHRoZSBzdHJpbmcgbG93ZXJj YXNlLgogICAgIE5TU3RyaW5nICpsb3dlcmNhc2VMYW5ndWFnZUNvZGUgPSBbbGFuZ3VhZ2UgbG93 ZXJjYXNlU3RyaW5nXTsKLSAgICBOU1N0cmluZyAqbG93ZXJjYXNlQ291bnRyeUNvZGUgPSBbY291 bnRyeSBsb3dlcmNhc2VTdHJpbmddOwotICAgIAotICAgIC8vIElmIHdlIHNlZSBhICJfIiBhZnRl ciBhIDItbGV0dGVyIGxhbmd1YWdlIGNvZGU6Ci0gICAgLy8gSWYgdGhlIGNvdW50cnkgaXMgdmFs aWQgYW5kIHRoZSBsYW5ndWFnZSBkaWQgbm90IHNwZWNpZnkgYSB2YXJpYW50LCByZXBsYWNlIHRo ZSAiXyIgYW5kCi0gICAgLy8gd2hhdGV2ZXIgY29tZXMgYWZ0ZXIgaXQgd2l0aCAiLSIgZm9sbG93 ZWQgYnkgdGhlIGNvdW50cnkgY29kZS4KLSAgICAvLyBPdGhlcndpc2UsIHJlcGxhY2UgdGhlICJf IiB3aXRoIGEgIi0iIGFuZCB1c2Ugd2hhdGV2ZXIgY291bnRyeQotICAgIC8vIENGQnVuZGxlQ29w eUxvY2FsaXphdGlvbkZvckxvY2FsaXphdGlvbkluZm8oKSByZXR1cm5lZC4KLSAgICBpZiAoW2xv d2VyY2FzZUxhbmd1YWdlQ29kZSBsZW5ndGhdID49IDMgJiYgW2xvd2VyY2FzZUxhbmd1YWdlQ29k ZSBjaGFyYWN0ZXJBdEluZGV4OjJdID09ICdfJykgewotICAgICAgICBpZiAoY291bnRyeSAmJiAh bGFuZ3VhZ2VEaWRTcGVjaWZ5RXhwbGljaXRWYXJpYW50KQotICAgICAgICAgICAgcmV0dXJuIFtO U1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAtJUAiLCBbbG93ZXJjYXNlTGFuZ3VhZ2VDb2Rl IHN1YnN0cmluZ1dpdGhSYW5nZTpOU01ha2VSYW5nZSgwLCAyKV0sIGxvd2VyY2FzZUNvdW50cnlD b2RlXTsKICAgICAgICAgCi0gICAgICAgIC8vIEZhbGwgYmFjayB0byBvbGRlciBiZWhhdmlvciwg d2hpY2ggdXNlZCB0aGUgb3JpZ2luYWwgbGFuZ3VhZ2UtYmFzZWQgY29kZSBidXQganVzdCBjaGFu Z2VkCi0gICAgICAgIC8vIHRoZSAiXyIgdG8gYSAiLSIuCisgICAgLy8gVHVybiBhICdfJyBpbnRv IGEgJy0nIGlmIGl0IGFwcGVhcnMgYWZ0ZXIgYSAyLWxldHRlciBsYW5ndWFnZSBjb2RlCisgICAg aWYgKFtsb3dlcmNhc2VMYW5ndWFnZUNvZGUgbGVuZ3RoXSA+PSAzICYmIFtsb3dlcmNhc2VMYW5n dWFnZUNvZGUgY2hhcmFjdGVyQXRJbmRleDoyXSA9PSAnXycpIHsKICAgICAgICAgUmV0YWluUHRy PE5TTXV0YWJsZVN0cmluZz4gbXV0YWJsZUxhbmd1YWdlQ29kZSA9IGFkb3B0TlMoW2xvd2VyY2Fz ZUxhbmd1YWdlQ29kZSBtdXRhYmxlQ29weV0pOwogICAgICAgICBbbXV0YWJsZUxhbmd1YWdlQ29k ZS5nZXQoKSByZXBsYWNlQ2hhcmFjdGVyc0luUmFuZ2U6TlNNYWtlUmFuZ2UoMiwgMSkgd2l0aFN0 cmluZzpAIi0iXTsKICAgICAgICAgcmV0dXJuIG11dGFibGVMYW5ndWFnZUNvZGUuZ2V0KCk7CkBA IC0xMTgsMjAgKzEwNiw2IEBAIHN0YXRpYyBTdHJpbmcgaHR0cFN0eWxlTGFuZ3VhZ2VDb2RlKE5T U3QKICAgICByZXR1cm4gbG93ZXJjYXNlTGFuZ3VhZ2VDb2RlOwogfQogCi1zdGF0aWMgYm9vbCBp c1ZhbGlkSUNVQ291bnRyeUNvZGUoTlNTdHJpbmcqIGNvdW50cnlDb2RlKQotewotICAgIGlmICgh Y291bnRyeUNvZGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBjb25zdCBjaGFyKiBjb25z dCogY291bnRyaWVzID0gdWxvY19nZXRJU09Db3VudHJpZXMoKTsKLSAgICBjb25zdCBjaGFyKiBj b3VudHJ5VVRGOCA9IFtjb3VudHJ5Q29kZSBVVEY4U3RyaW5nXTsKLSAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBjb3VudHJpZXNbaV07ICsraSkgewotICAgICAgICBjb25zdCBjaGFyKiBwb3NzaWJs ZUNvdW50cnkgPSBjb3VudHJpZXNbaV07Ci0gICAgICAgIGlmICghc3RyY21wKGNvdW50cnlVVEY4 LCBwb3NzaWJsZUNvdW50cnkpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAg IHJldHVybiBmYWxzZTsKLX0KLQogVmVjdG9yPFN0cmluZz4gcGxhdGZvcm1Vc2VyUHJlZmVycmVk TGFuZ3VhZ2VzKCkKIHsKICNpZiBQTEFURk9STShNQUMpCkBAIC0xNDcsMTkgKzEyMSwxMyBAQCBW ZWN0b3I8U3RyaW5nPiBwbGF0Zm9ybVVzZXJQcmVmZXJyZWRMYW5nCiAgICAgVmVjdG9yPFN0cmlu Zz4mIHVzZXJQcmVmZXJyZWRMYW5ndWFnZXMgPSBwcmVmZXJyZWRMYW5ndWFnZXMoKTsKIAogICAg IGlmICh1c2VyUHJlZmVycmVkTGFuZ3VhZ2VzLmlzRW1wdHkoKSkgewotICAgICAgICBSZXRhaW5Q dHI8Q0ZMb2NhbGVSZWY+IGxvY2FsZSA9IGFkb3B0Q0YoQ0ZMb2NhbGVDb3B5Q3VycmVudCgpKTsK LSAgICAgICAgTlNTdHJpbmcgKmNvdW50cnlDb2RlID0gKE5TU3RyaW5nICopQ0ZMb2NhbGVHZXRW YWx1ZShsb2NhbGUuZ2V0KCksIGtDRkxvY2FsZUNvdW50cnlDb2RlKTsKLSAgICAgICAgCi0gICAg ICAgIGlmICghaXNWYWxpZElDVUNvdW50cnlDb2RlKGNvdW50cnlDb2RlKSkKLSAgICAgICAgICAg IGNvdW50cnlDb2RlID0gbmlsOwotICAgICAgICAKICAgICAgICAgUmV0YWluUHRyPENGQXJyYXlS ZWY+IGxhbmd1YWdlcyA9IGFkb3B0Q0YoQ0ZMb2NhbGVDb3B5UHJlZmVycmVkTGFuZ3VhZ2VzKCkp OwogICAgICAgICBDRkluZGV4IGxhbmd1YWdlQ291bnQgPSBDRkFycmF5R2V0Q291bnQobGFuZ3Vh Z2VzLmdldCgpKTsKICAgICAgICAgaWYgKCFsYW5ndWFnZUNvdW50KQogICAgICAgICAgICAgdXNl clByZWZlcnJlZExhbmd1YWdlcy5hcHBlbmQoImVuIik7CiAgICAgICAgIGVsc2UgewogICAgICAg ICAgICAgZm9yIChDRkluZGV4IGkgPSAwOyBpIDwgbGFuZ3VhZ2VDb3VudDsgaSsrKQotICAgICAg ICAgICAgICAgIHVzZXJQcmVmZXJyZWRMYW5ndWFnZXMuYXBwZW5kKGh0dHBTdHlsZUxhbmd1YWdl Q29kZSgoTlNTdHJpbmcgKilDRkFycmF5R2V0VmFsdWVBdEluZGV4KGxhbmd1YWdlcy5nZXQoKSwg aSksIGNvdW50cnlDb2RlKSk7CisgICAgICAgICAgICAgICAgdXNlclByZWZlcnJlZExhbmd1YWdl cy5hcHBlbmQoaHR0cFN0eWxlTGFuZ3VhZ2VDb2RlKChOU1N0cmluZyAqKUNGQXJyYXlHZXRWYWx1 ZUF0SW5kZXgobGFuZ3VhZ2VzLmdldCgpLCBpKSkpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4 OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lv biAyMDMxMzMpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NSBAQAorMjAxNi0wNy0xMiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgorCisgICAg ICAgIHBsYXRmb3JtVXNlclByZWZlcnJlZExhbmd1YWdlcyBvbiBNYWMgc2hvdWxkIG5vdCB0cnkg dG8gcHV0IHRoZSByZWdpb24gaW50byB0aGUgbGFuZ3VhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTY5MworCisgICAgICAgIFJ1YmJlciBzdGFt cGVkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCisgICAgICAgIAorICAgICAgICBSZXZlcnQgdGhl IHRlc3QgY2hhbmdlIGluIHIyMDAxMDUuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L21hYy9OYXZpZ2F0b3JMYW5ndWFnZS5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6Omxhbmd1 YWdlRm9yU3lzdGVtTGFuZ3VhZ2UpOgorCiAyMDE2LTA3LTEyICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gUHJvdGVjdCBhZ2FpbnN0IGJhZCBkYXRhYmFz ZSBkYXRhIGluIExvY2FsU3RvcmFnZURhdGFiYXNlOjppbXBvcnRJdGVtcygpCkluZGV4OiBUb29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9OYXZpZ2F0b3JMYW5ndWFnZS5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9OYXZpZ2F0b3JMYW5ndWFnZS5tbQko cmV2aXNpb24gMjAzMTIzKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvTmF2aWdh dG9yTGFuZ3VhZ2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTY4LDIxICs2OCwxNyBAQCBzdGF0aWMg TlNTdHJpbmcgKmxhbmd1YWdlRm9yU3lzdGVtTGFuZ3VhCiAgICAgcmV0dXJuIFt3ZWJWaWV3IHN0 cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9tU3RyaW5nOkAibmF2aWdhdG9yLmxhbmd1YWdl Il07CiB9CiAKLS8vIFRoZXNlIHRlc3RzIGRvY3VtZW50IGN1cnJlbnQgYmVoYXZpb3IuIFNvbWUg b2YgdGhlIGN1cnJlbnQgcmVzdWx0cyBtYXkgbm90IGJlIHJpZ2h0LiBOb3RlIHRoYXQKLS8vIHRo aXMgb2RkbHkgYXNzdW1lcyB0aGF0IHRoZSB1c2VyIGhhcyBzZXQgdGhlaXIgbGFuZ3VhZ2UgdG8g c29tZXRoaW5nIHBvc3NpYmx5LWZvcmVpZ24gYnV0IHN0aWxsCi0vLyBsZWZ0IHRoZWlyIHJlZ2lv biBhcyBVUy4gSGVuY2UgdGhlICItdXMiIHZhcmlhbnRzLgotLy8gRklYTUU6IFRoZXNlIHRlc3Rz IHNob3VsZCBhbHNvIHNldCB0aGUgcmVnaW9uIHRvIHNlZSBob3cgV2ViS2l0IHdpbGwgaGFuZGxl IHRoYXQuCi0vLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3MDM5 CisvLyBUaGVzZSB0ZXN0cyBkb2N1bWVudCBjdXJyZW50IGJlaGF2aW9yLiBTb21lIG9mIHRoZSBj dXJyZW50IHJlc3VsdHMgbWF5IG5vdCBiZSByaWdodC4KIE5TQXJyYXkgKnRlc3RzID0gQFsKLSAg ICBAW0AicnUiLCBAInJ1LXVzIl0sIC8vIFRoaXMgZG9lcyBub3QgbWF0Y2ggb3RoZXIgYnJvd3Nl cnMgb3IgQ0ZOZXR3b3JrJ3MgQWNjZXB0LUxhbmd1YWdlLCB3aGljaCBhbGwgdXNlICJydSIuCisg ICAgQFtAInJ1IiwgQCJydS1ydSJdLCAvLyBUaGlzIGRvZXMgbm90IG1hdGNoIG90aGVyIGJyb3dz ZXJzIG9yIENGTmV0d29yaydzIEFjY2VwdC1MYW5ndWFnZSwgd2hpY2ggYWxsIHVzZSAicnUiLgog ICAgIEBbQCJlbiIsIEAiZW4tdXMiXSwKICAgICBAW0AiZW4tR0IiLCBAImVuLWdiIl0sCiAgICAg QFtAImVuLVVTIiwgQCJlbi11cyJdLAotICAgIEBbQCJqYSIsIEAiamEtdXMiXSwKLSAgICBAW0Ai aGkiLCBAImhpLXVzIl0sCisgICAgQFtAImphIiwgQCJqYS1qcCJdLAorICAgIEBbQCJoaSIsIEAi aGktaW4iXSwKICAgICBAW0AiemgtVFciLCBAInpoLXR3Il0sIC8vIFRoaXMgc2hvdWxkIG5vdCBt YXAgdG8gdGhlIGdlbmVyaWMgemgtaGFudCwgc2VlIHJkYXI6Ly9wcm9ibGVtLzIxMzk1MTgwLgog ICAgIEBbQCJ6aC1ISyIsIEAiemgtdHciXSwKLSAgICBAW0AiZXMiLCBAImVzLXVzIl0sCisgICAg QFtAImVzIiwgQCJlcy1lcyJdLAogICAgIEBbQCJlcy1NWCIsIEAiZXMteGwiXSwKICAgICBAW0Ai ZXMtRVMiLCBAImVzLWVzIl0sCiAgICAgQFtAImVzLTQxOSIsIEAiZXMteGwiXSwKQEAgLTkwLDcg Kzg2LDcgQEAgTlNBcnJheSAqdGVzdHMgPSBAWwogICAgIEBbQCJ6aC1IYW50IiwgQCJ6aC10dyJd LAogICAgIEBbQCJwdC1CUiIsIEAicHQtYnIiXSwKICAgICBAW0AicHQtUFQiLCBAInB0LXB0Il0s Ci0gICAgQFtAImZyIiwgQCJmci11cyJdLAorICAgIEBbQCJmciIsIEAiZnItZnIiXSwKICAgICBA W0AiZnItQ0EiLCBAImZyLWNhIl0sCiBdOwogCg==