135667 2014-08-06 13:07:28 -0700 REGRESSION (WebKit2): iOS Safari default encoding doesn't follow system language 2014-08-06 13:26:12 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad All RESOLVED FIXED InRadar P2 Normal --- 1 ap ap andersca mitz sam oldest_to_newest 1027268 0 ap 2014-08-06 13:07:28 -0700 With WebKit1, default encoding could be set via +[WebPreferences _setInitialDefaultTextEncodingToSystemEncoding], but there is nothing equivalent for WebKit2 modern API. 1027269 1 ap 2014-08-06 13:07:41 -0700 <rdar://problem/17862892> 1027273 2 236128 ap 2014-08-06 13:14:13 -0700 Created attachment 236128 proposed fix 1027275 3 236128 andersca 2014-08-06 13:18:20 -0700 Comment on attachment 236128 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=236128&action=review > Source/WebKit2/Shared/WebPreferencesDefinitions.h:278 > + macro(DefaultTextEncodingName, defaultTextEncodingName, String, String, defaultTextEncodingNameForSystemLanguage()) \ I think you want to prefix this with WebCore:: since it's a WebCore function. 1027277 4 ap 2014-08-06 13:25:51 -0700 Committed <http://trac.webkit.org/changeset/172172>. 1027278 5 ap 2014-08-06 13:26:12 -0700 > I think you want to prefix this with WebCore:: since it's a WebCore function. Talked to Anders, and we decided that it's OK as is. 236128 2014-08-06 13:14:13 -0700 2014-08-06 13:18:20 -0700 proposed fix DefaultLanguage.txt text/plain 13808 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjE2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA4LTA2ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKFdlYktp dDIpOiBpT1MgU2FmYXJpIGRlZmF1bHQgZW5jb2RpbmcgZG9lc24ndCBmb2xsb3cgc3lzdGVtIGxh bmd1YWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzU2NjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3ODYyODkyPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIGEgZnVuY3Rpb24gdGhhdCBj b21wdXRlcyBkZWZhdWx0IGVuY29kaW5nIGZyb20gV2ViS2l0IHRvIFdlYkNvcmUsIHNvIHRoYXQK KyAgICAgICAgaXQgY291bGQgYmUgc2hhcmVkIHdpdGggV2ViS2l0Mi4KKworICAgICAgICAqIFdl YkNvcmUuZXhwLmluOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJDb3JlU3lzdGVtSW50ZXJm YWNlSU9TLm1tOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNl Lmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW06Cisg ICAgICAgICogcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2RpbmdSZWdpc3RyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpkZWZhdWx0VGV4dEVuY29kaW5nTmFtZUZvclN5c3RlbUxhbmd1YWdlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS90ZXh0L1RleHRFbmNvZGluZ1JlZ2lzdHJ5Lmg6CisKIDIwMTQtMDgt MDYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1 bnVzZWQgUmVuZGVyQm94OjpyZWZsZWN0aW9uQm94KCkuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgkocmV2aXNpb24gMTcxOTk3KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHdv cmtpbmcgY29weSkKQEAgLTEwNzUsNiArMTA3NSw3IEBAIF9fWk43V2ViQ29yZTNVUkxDMUVQNU5T VVJMCiBfX1pON1dlYkNvcmUzVVJMQzFFUEs3X19DRlVSTAogX19aTjdXZWJDb3JlM1VSTEMxRVJL UzBfUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUzbWFjRVJLTlNfMjNBdXRoZW50aWNhdGlv bkNoYWxsZW5nZUUKK19fWk43V2ViQ29yZTQwZGVmYXVsdFRleHRFbmNvZGluZ05hbWVGb3JTeXN0 ZW1MYW5ndWFnZUV2CiBfX1pON1dlYkNvcmU0MHJlc3RyaWN0TWluaW11bVNjYWxlRmFjdG9yVG9W aWV3cG9ydFNpemVFUk5TXzE4Vmlld3BvcnRBdHRyaWJ1dGVzRU5TXzdJbnRTaXplRWYKIF9fWk43 V2ViQ29yZTQyVVJMQnlUcnVuY2F0aW5nT25lQ2hhcmFjdGVyQmVmb3JlQ29tcG9uZW50RVA1TlNV UkwxOENGVVJMQ29tcG9uZW50VHlwZQogX19aTjdXZWJDb3JlNDdhdHRyaWJ1dGVkU3RyaW5nQnlT dHJpcHBpbmdBdHRhY2htZW50Q2hhcmFjdGVyc0VQMThOU0F0dHJpYnV0ZWRTdHJpbmcKQEAgLTIx MDQsNiArMjEwNSw3IEBAIF93a0dldEhUVFBSZXF1ZXN0UHJpb3JpdHkKIF93a0dldE1JTUVUeXBl Rm9yRXh0ZW5zaW9uCiBfd2tHZXROU1VSTFJlc3BvbnNlTGFzdE1vZGlmaWVkRGF0ZQogX3drR2V0 VXNlclRvQmFzZUNUTQorX3drR2V0V2ViRGVmYXVsdENGU3RyaW5nRW5jb2RpbmcKIF93a0hUVFBD b29raWVzCiBfd2tIVFRQQ29va2llc0ZvclVSTAogX3drSFRUUFJlcXVlc3RFbmFibGVQaXBlbGlu aW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVy ZmFjZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2Vi Q29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQkocmV2aXNpb24gMTcxOTk3KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJT1MubW0JKHdvcmtpbmcg Y29weSkKQEAgLTc2LDYgKzc2LDcgQEAgYm9vbCAoKndrSXNHQjE4MDMwQ29tcGxpYW5jZVJlcXVp cmVkKSh2bwogdm9pZCAoKndrQ0dQYXRoQWRkUm91bmRlZFJlY3QpKENHTXV0YWJsZVBhdGhSZWYg cGF0aCwgY29uc3QgQ0dBZmZpbmVUcmFuc2Zvcm0qIG1hdHJpeCwgQ0dSZWN0IHJlY3QsIENHRmxv YXQgY29ybmVyV2lkdGgsIENHRmxvYXQgY29ybmVySGVpZ2h0KTsgCiB2b2lkICgqd2tDRlVSTFJl cXVlc3RBbGxvd0FsbFBvc3RDYWNoaW5nKShDRlVSTFJlcXVlc3RSZWYpOwogQ0ZBcnJheVJlZiAo KndrQ29weU5TVVJMUmVzcG9uc2VDZXJ0aWZpY2F0ZUNoYWluKShOU1VSTFJlc3BvbnNlKik7CitD RlN0cmluZ0VuY29kaW5nICgqd2tHZXRXZWJEZWZhdWx0Q0ZTdHJpbmdFbmNvZGluZykodm9pZCk7 CiAKICNpZiBVU0UoQ0ZORVRXT1JLKQogQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiAoKndrR2V0RGVm YXVsdEhUVFBDb29raWVTdG9yYWdlKSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oCShyZXZpc2lvbiAxNzE5OTcp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xNTIsNiArMTUyLDcgQEAgZXh0ZXJuIENGUmVhZFN0cmVhbVJl ZiAoKndrQ3JlYXRlQ3VzdG9tQwogZXh0ZXJuIENGU3RyaW5nUmVmICgqd2tDb3B5Q0ZMb2NhbGl6 YXRpb25QcmVmZXJyZWROYW1lKShDRlN0cmluZ1JlZik7CiBleHRlcm4gTlNTdHJpbmcqICgqd2tD b3B5TlNVUkxSZXNwb25zZVN0YXR1c0xpbmUpKE5TVVJMUmVzcG9uc2UqKTsKIGV4dGVybiBDRkFy cmF5UmVmICgqd2tDb3B5TlNVUkxSZXNwb25zZUNlcnRpZmljYXRlQ2hhaW4pKE5TVVJMUmVzcG9u c2UqKTsKK2V4dGVybiBDRlN0cmluZ0VuY29kaW5nICgqd2tHZXRXZWJEZWZhdWx0Q0ZTdHJpbmdF bmNvZGluZykodm9pZCk7CiAjaWYgIVBMQVRGT1JNKElPUykKIGV4dGVybiB2b2lkICgqd2tEcmF3 QmV6ZWxlZFRleHRGaWVsZENlbGwpKE5TUmVjdCwgQk9PTCBlbmFibGVkKTsKIGV4dGVybiB2b2lk ICgqd2tEcmF3VGV4dEZpZWxkQ2VsbEZvY3VzUmluZykoTlNUZXh0RmllbGRDZWxsKiwgTlNSZWN0 KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJm YWNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3Jl U3lzdGVtSW50ZXJmYWNlLm1tCShyZXZpc2lvbiAxNzE5OTcpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQkod29ya2luZyBjb3B5KQpAQCAt MzgsNiArMzgsNyBAQCBDR1BhdHRlcm5SZWYgKCp3a0NHUGF0dGVybkNyZWF0ZVdpdGhJbWFnCiBD RlN0cmluZ1JlZiAoKndrQ29weUNGTG9jYWxpemF0aW9uUHJlZmVycmVkTmFtZSkoQ0ZTdHJpbmdS ZWYpOwogTlNTdHJpbmcqICgqd2tDb3B5TlNVUkxSZXNwb25zZVN0YXR1c0xpbmUpKE5TVVJMUmVz cG9uc2UqKTsKIENGQXJyYXlSZWYgKCp3a0NvcHlOU1VSTFJlc3BvbnNlQ2VydGlmaWNhdGVDaGFp bikoTlNVUkxSZXNwb25zZSopOworQ0ZTdHJpbmdFbmNvZGluZyAoKndrR2V0V2ViRGVmYXVsdENG U3RyaW5nRW5jb2RpbmcpKHZvaWQpOwogTlNTdHJpbmcqICgqd2tDcmVhdGVVUkxQYXN0ZWJvYXJk Rmxhdm9yVHlwZU5hbWUpKHZvaWQpOwogTlNTdHJpbmcqICgqd2tDcmVhdGVVUkxOUGFzdGVib2Fy ZEZsYXZvclR5cGVOYW1lKSh2b2lkKTsKIHZvaWQgKCp3a0RyYXdCZXplbGVkVGV4dEZpZWxkQ2Vs bCkoTlNSZWN0LCBCT09MIGVuYWJsZWQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9UZXh0RW5jb2RpbmdSZWdpc3RyeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2RpbmdSZWdpc3RyeS5jcHAJKHJldmlzaW9uIDE3MTk5 NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0MiwxMCBAQAogI2luY2x1ZGUgPHd0Zi9TdGRM aWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvU3RyaW5nRXh0cmFzLmg+CiAKKyNpZiBQTEFURk9S TShDT0NPQSkKKyNpbmNsdWRlICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgiCisjZW5kaWYKKwog I2lmIFBMQVRGT1JNKE1BQykKICNpbmNsdWRlICJUZXh0Q29kZWNNYWMuaCIKICNlbmRpZgpAQCAt MzUwLDYgKzM1NCwyMSBAQCBib29sIG5vRXh0ZW5kZWRUZXh0RW5jb2RpbmdOYW1lVXNlZCgpCiAg ICAgcmV0dXJuICFkaWRFeHRlbmRUZXh0Q29kZWNNYXBzOwogfQogCisjaWYgUExBVEZPUk0oQ09D T0EpCitTdHJpbmcgZGVmYXVsdFRleHRFbmNvZGluZ05hbWVGb3JTeXN0ZW1MYW5ndWFnZSgpCit7 CisgICAgU3RyaW5nIHN5c3RlbUVuY29kaW5nTmFtZSA9IENGU3RyaW5nQ29udmVydEVuY29kaW5n VG9JQU5BQ2hhclNldE5hbWUod2tHZXRXZWJEZWZhdWx0Q0ZTdHJpbmdFbmNvZGluZygpKTsKKwor ICAgIC8vIENGU3RyaW5nQ29udmVydEVuY29kaW5nVG9JQU5BQ2hhclNldE5hbWUoKSByZXR1cm5z IGNwOTQ5IGZvciBrVGV4dEVuY29kaW5nRE9TS29yZWFuIEFLQSAiZXh0ZW5kZWQgRVVDLUtSIiBB S0Egd2luZG93cy05NDkuCisgICAgLy8gSUNVIHVzZXMgdGhpcyBuYW1lIGZvciBhIGRpZmZlcmVu dCBlbmNvZGluZywgc28gd2UgbmVlZCB0byBjaGFuZ2UgdGhlIG5hbWUgdG8gYSB2YWx1ZSB0aGF0 IGFjdHVhbGx5IGdpdmVzIHVzIHdpbmRvd3MtOTQ5LgorICAgIC8vIEluIGFkZGl0aW9uLCB0aGlz IHZhbHVlIG11c3QgbWF0Y2ggd2hhdCBpcyB1c2VkIGluIFNhZmFyaSwgc2VlIDxyZGFyOi8vcHJv YmxlbS81NTc5MjkyPi4KKyAgICAvLyBPbiBzb21lIE9TIHZlcnNpb25zLCB0aGUgcmVzdWx0IGlz IENQOTQ5ICh1cHBlcmNhc2UpLgorICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShzeXN0ZW1FbmNv ZGluZ05hbWUsICJjcDk0OSIpKQorICAgICAgICBzeXN0ZW1FbmNvZGluZ05hbWUgPSAia3NfY181 NjAxLTE5ODciOworICAgIHJldHVybiBzeXN0ZW1FbmNvZGluZ05hbWU7Cit9CisjZW5kaWYKKwog I2lmbmRlZiBOREVCVUcKIHZvaWQgZHVtcFRleHRFbmNvZGluZ05hbWVNYXAoKQogewpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2RpbmdSZWdpc3RyeS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0 cnkuaAkocmV2aXNpb24gMTcxOTk3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9U ZXh0RW5jb2RpbmdSZWdpc3RyeS5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwxMCBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgYm9vbCBpc0phcGFuZXNlRW5jb2RpbmcoY29uc3QgY2hh ciogY2Fub25pY2FsRW5jb2RpbmdOYW1lKTsKICAgICBib29sIHNob3VsZFNob3dCYWNrc2xhc2hB c0N1cnJlbmN5U3ltYm9sSW4oY29uc3QgY2hhciogY2Fub25pY2FsRW5jb2RpbmdOYW1lKTsKIAor I2lmIFBMQVRGT1JNKENPQ09BKQorICAgIFN0cmluZyBkZWZhdWx0VGV4dEVuY29kaW5nTmFtZUZv clN5c3RlbUxhbmd1YWdlKCk7CisjZW5kaWYKKwogI2lmbmRlZiBOREVCVUcKICAgICB2b2lkIGR1 bXBUZXh0RW5jb2RpbmdOYW1lTWFwKCk7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9u IDE3MjE2NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDIzIEBACisyMDE0LTA4LTA2ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUu Y29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKFdlYktpdDIpOiBpT1MgU2FmYXJpIGRlZmF1bHQg ZW5jb2RpbmcgZG9lc24ndCBmb2xsb3cgc3lzdGVtIGxhbmd1YWdlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU2NjcKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE3ODYyODkyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaDogQ29tcHV0ZSB0 aGUgYWN0dWFsIHByb3BlciBkZWZhdWx0LCBkb24ndAorICAgICAgICBoYXJkY29kZSBpdCB0byBJ U08tODg1OS0xIGhvcGluZyB0aGF0IHNvbWVvbmUgZWxzZSB3aWxsIGNvcnJlY3QgaXQgbGF0ZXIu CisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHA6IEFkZGVkIGFuIGlu Y2x1ZGUgZm9yIFdlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaAorICAgICAgICBtYWNybyBleHBh bnNpb24gdG8gY29tcGlsZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5j cHA6IChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpjcmVhdGVXaXRoTGVnYWN5RGVmYXVsdHMpOgor ICAgICAgICBBZGRlZCBhIEZJWE1FLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9tYWMvV2ViU3lzdGVtSW50ZXJmYWNlLm1tOiAoSW5pdFdlYkNvcmVTeXN0ZW1JbnRlcmZh Y2UpOgorICAgICAgICBXZSBub3cgdXNlIFdLR2V0V2ViRGVmYXVsdENGU3RyaW5nRW5jb2Rpbmcg aW4gV2ViQ29yZSwgc28gaXQgbmVlZHMgdG8gYmUgaW5pdGlhbGl6ZWQuCisKIDIwMTQtMDgtMDYg IEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBBZGQgc3VwcG9ydCBmb3IgdXNlciBzY3JpcHRzIHRvIFdlYktpdFVzZXJDb250ZW50TWFu YWdlcgpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlv bnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNE ZWZpbml0aW9ucy5oCShyZXZpc2lvbiAxNzE5OTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNzUsNyArMjc1 LDcgQEAKIAogI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfU1RSSU5HX1BSRUZFUkVOQ0UobWFjcm8p IFwKICAgICBGT1JfRUFDSF9XRUJLSVRfRk9OVF9GQU1JTFlfUFJFRkVSRU5DRShtYWNybykgXAot ICAgIG1hY3JvKERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lLCBkZWZhdWx0VGV4dEVuY29kaW5nTmFt ZSwgU3RyaW5nLCBTdHJpbmcsICJJU08tODg1OS0xIikgXAorICAgIG1hY3JvKERlZmF1bHRUZXh0 RW5jb2RpbmdOYW1lLCBkZWZhdWx0VGV4dEVuY29kaW5nTmFtZSwgU3RyaW5nLCBTdHJpbmcsIGRl ZmF1bHRUZXh0RW5jb2RpbmdOYW1lRm9yU3lzdGVtTGFuZ3VhZ2UoKSkgXAogICAgIG1hY3JvKEZU UERpcmVjdG9yeVRlbXBsYXRlUGF0aCwgZnRwRGlyZWN0b3J5VGVtcGxhdGVQYXRoLCBTdHJpbmcs IFN0cmluZywgIiIpIFwKICAgICBcCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAJKHJldmlzaW9uIDE3MTk5NykKKysrIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAs MTIgKzMwLDE1IEBACiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgiCiAjaW5jbHVk ZSAiV2ViUHJlZmVyZW5jZXNLZXlzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9TZXR0aW5ncy5oPgor I2luY2x1ZGUgPFdlYkNvcmUvVGV4dEVuY29kaW5nUmVnaXN0cnkuaD4KICNpbmNsdWRlIDx3dGYv TmV2ZXJEZXN0cm95ZWQuaD4KIAogI2lmIFBMQVRGT1JNKElPUykKICNpbXBvcnQgPFdlYktpdFN5 c3RlbUludGVyZmFjZUlPUy5oPgogI2VuZGlmCiAKK3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwor CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgYm9vbD4gQm9v bE92ZXJyaWRlc01hcDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJl bmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZl cmVuY2VzLmNwcAkocmV2aXNpb24gMTcxOTk3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBQYXNz UmVmUHRyPFdlYlByZWZlcmVuY2VzPiBXZWJQcmVmZXJlbmNlCiBQYXNzUmVmUHRyPFdlYlByZWZl cmVuY2VzPiBXZWJQcmVmZXJlbmNlczo6Y3JlYXRlV2l0aExlZ2FjeURlZmF1bHRzKGNvbnN0IFN0 cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBrZXlQcmVmaXgsIGNvbnN0IFN0cmluZyYg Z2xvYmFsRGVidWdLZXlQcmVmaXgpCiB7CiAgICAgUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBwcmVm ZXJlbmNlcyA9IGFkb3B0UmVmKG5ldyBXZWJQcmVmZXJlbmNlcyhpZGVudGlmaWVyLCBrZXlQcmVm aXgsIGdsb2JhbERlYnVnS2V5UHJlZml4KSk7CisgICAgLy8gRklYTUU6IFRoZSByZWdpc3RlckRl ZmF1bHQuLi5WYWx1ZUZvcktleSBtYWNoaW5lcnkgaXMgdW5uZWNlc3NhcmlseSBoZWF2eXdlaWdo dCBhbmQgY29tcGxpY2F0ZWQuCisgICAgLy8gV2UgY2FuIGp1c3QgY29tcHV0ZSBkaWZmZXJlbnQg ZGVmYXVsdHMgZm9yIG1vZGVybiBhbmQgbGVnYWN5IEFQSXMgaW4gV2ViUHJlZmVyZW5jZXNEZWZp bml0aW9ucy5oIG1hY3Jvcy4KICAgICBwcmVmZXJlbmNlcy0+cmVnaXN0ZXJEZWZhdWx0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpqYXZhRW5hYmxlZEtleSgpLCB0cnVlKTsKICAg ICBwcmVmZXJlbmNlcy0+cmVnaXN0ZXJEZWZhdWx0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5OjpqYXZhRW5hYmxlZEZvckxvY2FsRmlsZXNLZXkoKSwgdHJ1ZSk7CiAgICAgcHJlZmVy ZW5jZXMtPnJlZ2lzdGVyRGVmYXVsdEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6 cGx1Z2luc0VuYWJsZWRLZXkoKSwgdHJ1ZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2UubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViU3lzdGVt SW50ZXJmYWNlLm1tCShyZXZpc2lvbiAxNzE5OTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2UubW0JKHdvcmtpbmcgY29w eSkKQEAgLTgwLDYgKzgwLDcgQEAgdm9pZCBJbml0V2ViQ29yZVN5c3RlbUludGVyZmFjZSh2b2lk KQogICAgICAgICBJTklUKEdldFByZWZlcnJlZEV4dGVuc2lvbkZvck1JTUVUeXBlKTsKICNlbmRp ZgogICAgICAgICBJTklUKEdldFVzZXJUb0Jhc2VDVE0pOworICAgICAgICBJTklUKEdldFdlYkRl ZmF1bHRDRlN0cmluZ0VuY29kaW5nKTsKICAgICAgICAgSU5JVChDR0NvbnRleHRJc1BERkNvbnRl eHQpOwogI2lmICFQTEFURk9STShJT1MpCiAgICAgICAgIElOSVQoR2V0V2hlZWxFdmVudERlbHRh cyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNzIxNjUpCisrKyBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxNC0w OC0wNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdS RVNTSU9OIChXZWJLaXQyKTogaU9TIFNhZmFyaSBkZWZhdWx0IGVuY29kaW5nIGRvZXNuJ3QgZm9s bG93IHN5c3RlbSBsYW5ndWFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM1NjY3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzg2Mjg5Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcv V2ViUHJlZmVyZW5jZXMubW06ICgrW1dlYlByZWZlcmVuY2VzIF9zZXRJbml0aWFsRGVmYXVsdFRl eHRFbmNvZGluZ1RvU3lzdGVtRW5jb2RpbmddKToKKyAgICAgICAgTW92ZWQgaW1wbGVtZW50YXRp b24gdG8gV2ViQ29yZSwgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIHdpdGggV2ViS2l0Mi4KKwor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbTogKEluaXRXZWJD b3JlU3lzdGVtSW50ZXJmYWNlKToKKyAgICAgICAgV2Ugbm93IHVzZSBXS0dldFdlYkRlZmF1bHRD RlN0cmluZ0VuY29kaW5nIGluIFdlYkNvcmUsIHNvIGl0IG5lZWRzIHRvIGJlIGluaXRpYWxpemVk LgorCiAyMDE0LTA4LTA1ICBQZXl0b24gUmFuZG9scGggIDxwcmFuZG9scGhAYXBwbGUuY29tPgog CiAgICAgICAgIFJlbmFtZSBNQUNfTE9OR19QUkVTUyBmZWF0dXJlIGZsYWcgdG8gTE9OR19NT1VT RV9QUkVTUy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlN5c3Rl bUludGVyZmFjZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJTeXN0ZW1JbnRlcmZhY2UubW0JKHJldmlzaW9uIDE3MTk5NykKKysrIFNvdXJjZS9X ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbQkod29ya2luZyBj b3B5KQpAQCAtODAsNiArODAsNyBAQCB2b2lkIEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKHZv aWQpCiAgICAgSU5JVChHZXRIVFRQUmVxdWVzdFByaW9yaXR5KTsKICAgICBJTklUKEdldE1JTUVU eXBlRm9yRXh0ZW5zaW9uKTsKICAgICBJTklUKEdldE5TVVJMUmVzcG9uc2VMYXN0TW9kaWZpZWRE YXRlKTsKKyAgICBJTklUKEdldFdlYkRlZmF1bHRDRlN0cmluZ0VuY29kaW5nKTsKICNpZiAhUExB VEZPUk0oSU9TKQogICAgIElOSVQoU2lnbmVkUHVibGljS2V5QW5kQ2hhbGxlbmdlU3RyaW5nKTsK ICAgICBJTklUKEdldFByZWZlcnJlZEV4dGVuc2lvbkZvck1JTUVUeXBlKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkocmV2aXNpb24gMTcxOTk3 KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9BdWRpb1Nlc3Npb24u aD4KICNpbXBvcnQgPFdlYkNvcmUvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CisjaW1wb3J0IDxXZWJDb3JlL1RleHRFbmNvZGluZ1Jl Z2lzdHJ5Lmg+CiAjaW1wb3J0IDxydW50aW1lL0luaXRpYWxpemVUaHJlYWRpbmcuaD4KICNpbXBv cnQgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC0xNzE1 LDE2ICsxNzE2LDggQEAgKyAoQ0ZTdHJpbmdFbmNvZGluZylfc3lzdGVtQ0ZTdHJpbmdFbmNvZAog CiArICh2b2lkKV9zZXRJbml0aWFsRGVmYXVsdFRleHRFbmNvZGluZ1RvU3lzdGVtRW5jb2RpbmcK IHsKLSAgICBOU1N0cmluZyAqc3lzdGVtRW5jb2RpbmdOYW1lID0gKE5TU3RyaW5nICopQ0ZTdHJp bmdDb252ZXJ0RW5jb2RpbmdUb0lBTkFDaGFyU2V0TmFtZShbc2VsZiBfc3lzdGVtQ0ZTdHJpbmdF bmNvZGluZ10pOwotCi0gICAgLy8gQ0ZTdHJpbmdDb252ZXJ0RW5jb2RpbmdUb0lBTkFDaGFyU2V0 TmFtZSgpIHJldHVybnMgY3A5NDkgZm9yIGtUZXh0RW5jb2RpbmdET1NLb3JlYW4gQUtBICJleHRl bmRlZCBFVUMtS1IiIEFLQSB3aW5kb3dzLTk0OS4KLSAgICAvLyBJQ1UgdXNlcyB0aGlzIG5hbWUg Zm9yIGEgZGlmZmVyZW50IGVuY29kaW5nLCBzbyB3ZSBuZWVkIHRvIGNoYW5nZSB0aGUgbmFtZSB0 byBhIHZhbHVlIHRoYXQgYWN0dWFsbHkgZ2l2ZXMgdXMgd2luZG93cy05NDkuCi0gICAgLy8gSW4g YWRkaXRpb24sIHRoaXMgdmFsdWUgbXVzdCBtYXRjaCB3aGF0IGlzIHVzZWQgaW4gU2FmYXJpLCBz ZWUgPHJkYXI6Ly9wcm9ibGVtLzU1NzkyOTI+LgotICAgIC8vIE9uIHNvbWUgT1MgdmVyc2lvbnMs IHRoZSByZXN1bHQgaXMgQ1A5NDkgKHVwcGVyY2FzZSkuCi0gICAgaWYgKFtzeXN0ZW1FbmNvZGlu Z05hbWUgX3dlYmtpdF9pc0Nhc2VJbnNlbnNpdGl2ZUVxdWFsVG9TdHJpbmc6QCJjcDk0OSJdKQot ICAgICAgICBzeXN0ZW1FbmNvZGluZ05hbWUgPSBAImtzX2NfNTYwMS0xOTg3IjsKICAgICBbW05T VXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSByZWdpc3RlckRlZmF1bHRzOgotICAg ICAgICBbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OnN5c3RlbUVuY29kaW5nTmFt ZSBmb3JLZXk6V2ViS2l0RGVmYXVsdFRleHRFbmNvZGluZ05hbWVQcmVmZXJlbmNlS2V5XV07Cisg ICAgICAgIFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6ZGVmYXVsdFRleHRFbmNv ZGluZ05hbWVGb3JTeXN0ZW1MYW5ndWFnZSgpIGZvcktleTpXZWJLaXREZWZhdWx0VGV4dEVuY29k aW5nTmFtZVByZWZlcmVuY2VLZXldXTsKIH0KIAogc3RhdGljIE5TU3RyaW5nICpjbGFzc0lCQ3Jl YXRvcklEID0gbmlsOwo=