5715 2005-11-12 01:36:46 -0800 document.charset, document.defaultCharset, and document.characterSet are not supported 2005-12-26 14:08:36 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 VERIFIED FIXED http://gemal.dk/browserspy/document.html P2 Enhancement --- 1 ap hyatt oldest_to_newest 23946 0 ap 2005-11-12 01:36:46 -0800 MSIE document.charset and document.defaultCharset are not supported in WebKit, see the bug URL. Firefox document.characterSet is also not supported, see the attached test case. document.charset and document.characterSet are apparently supposed to be read/write, not sure about document.defaultCharset. 23947 1 4672 ap 2005-11-12 01:37:10 -0800 Created attachment 4672 test case 24632 2 4821 ap 2005-11-27 13:06:40 -0800 Created attachment 4821 proposed patch Implements: 1) document.charset (MSIE, read-write) 2) document.defaultCharset (MSIE, read-only) 3) document.characterSet (Firefox, read-only) 4) document.actualEncoding (Firefox, old DOM3 drafts, read-only) 5) document.inputEncoding (actualEncoding was renamed so in DOM3; Firefox doesn't support this yet). Of related properties, doesn't implement xmlEncoding (also in DOM3) and entity.inputEncoding. 24716 3 4821 darin 2005-11-27 18:35:24 -0800 Comment on attachment 4821 proposed patch I think that the Charset setting code should use UTF8String() instead of cstring(). The patch looks otherwise perfect, so I'm going to mark it review+ anyway, since cstring() seems OK. 24724 4 4828 ap 2005-11-27 21:27:28 -0800 Created attachment 4828 Patch using UTF8String() Replaced cstring() with UTF8String() 24725 5 ap 2005-11-27 21:42:10 -0800 Just noticed that dom/xhtml/level3/core/documentgetinputencoding01 now succeeds:-) 24828 6 ap 2005-11-29 01:54:43 -0800 Verified (but the committed patch doesn't use UTF8String(), nor updates dom/xhtml/level3/core/ documentgetinputencoding01 results). 4672 2005-11-12 01:37:10 -0800 2005-11-27 21:27:28 -0800 test case charsets.html text/html 563 ap PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PSJjb250ZW50LXR5cGUiIGNvbnRlbnQ9InRl eHQvaHRtbDsgY2hhcnNldD1rb2k4LXIiPgo8L2hlYWQ+Cjxib2R5Pgo8dGFibGU+Cjx0cj4KPHRk PmRvY3VtZW50LmNoYXJzZXQ8L3RkPgo8dGQ+CjxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0 Ij48IS0tCmRvY3VtZW50LndyaXRlbG4oZG9jdW1lbnQuY2hhcnNldCk7Ci8vIC0tPjwvc2NyaXB0 Pgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZD5kb2N1bWVudC5kZWZhdWx0Q2hhcnNldDwvdGQ+Cjx0ZD4K PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwhLS0KZG9jdW1lbnQud3JpdGVsbihkb2N1 bWVudC5kZWZhdWx0Q2hhcnNldCk7Ci8vIC0tPjwvc2NyaXB0Pgo8L3RkPgo8L3RyPgo8dHI+Cjx0 ZD5kb2N1bWVudC5jaGFyYWN0ZXJTZXQ8L3RkPgo8dGQ+CjxzY3JpcHQgdHlwZT0idGV4dC9qYXZh c2NyaXB0Ij48IS0tCmRvY3VtZW50LndyaXRlbG4oZG9jdW1lbnQuY2hhcmFjdGVyU2V0KTsKLy8g LS0+PC9zY3JpcHQ+CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjwvYm9keT4KPC9odG1sPgo= 4821 2005-11-27 13:06:40 -0800 2005-11-27 18:35:24 -0800 proposed patch CharsetPatch.txt text/plain 6835 ap SW5kZXg6IGRvY3VtZW50LWNoYXJzZXQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAtTnB1 IGRvY3VtZW50LWNoYXJzZXQtZXhwZWN0ZWQudHh0Ci0tLSBkb2N1bWVudC1jaGFyc2V0LWV4cGVj dGVkLnR4dAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBkb2N1bWVudC1jaGFyc2V0LWV4 cGVjdGVkLnR4dAkyNyBOb3YgMjAwNSAyMDo1NzoyNSAtMDAwMApAQCAtMCwwICsxLDM3IEBACitJ bml0aWFsCisKK8KgZG9jdW1lbnQuY2hhcnNldDogS09JOC1SCisKK8KgZG9jdW1lbnQuZGVmYXVs dENoYXJzZXQ6IGRlZmluZWQKKworwqBkb2N1bWVudC5jaGFyYWN0ZXJTZXQ6IEtPSTgtUgorCivC oGRvY3VtZW50LmlucHV0RW5jb2Rpbmc6IEtPSTgtUgorCivCoGRvY3VtZW50LmFjdHVhbEVuY29k aW5nOiBLT0k4LVIKKworU2V0dGluZyBjaGFyc2V0IHRvIFVURi04Li4uCisKK8KgZG9jdW1lbnQu Y2hhcnNldDogVVRGLTgKKworwqBkb2N1bWVudC5kZWZhdWx0Q2hhcnNldDogZGVmaW5lZAorCivC oGRvY3VtZW50LmNoYXJhY3RlclNldDogVVRGLTgKKworwqBkb2N1bWVudC5pbnB1dEVuY29kaW5n OiBVVEYtOAorCivCoGRvY3VtZW50LmFjdHVhbEVuY29kaW5nOiBVVEYtOAorCitTZXR0aW5nIGNo YXJhY3RlclNldCB0byBLT0k4LVIgKGV4cGVjdGVkIHRvIGZhaWwsIG1hdGNoaW5nIEZpcmVmb3gp Li4uCisKK8KgZG9jdW1lbnQuY2hhcnNldDogVVRGLTgKKworwqBkb2N1bWVudC5kZWZhdWx0Q2hh cnNldDogZGVmaW5lZAorCivCoGRvY3VtZW50LmNoYXJhY3RlclNldDogVVRGLTgKKworwqBkb2N1 bWVudC5pbnB1dEVuY29kaW5nOiBVVEYtOAorCivCoGRvY3VtZW50LmFjdHVhbEVuY29kaW5nOiBV VEYtOAorCisKSW5kZXg6IGRvY3VtZW50LWNoYXJzZXQuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLU5w dSBkb2N1bWVudC1jaGFyc2V0Lmh0bWwKLS0tIGRvY3VtZW50LWNoYXJzZXQuaHRtbAkxIEphbiAx OTcwIDAwOjAwOjAwIC0wMDAwCisrKyBkb2N1bWVudC1jaGFyc2V0Lmh0bWwJMjcgTm92IDIwMDUg MjA6NDg6MTYgLTAwMDAKQEAgLTAsMCArMSw0NSBAQAorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGh0 dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PWtvaTgt ciI+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+CisKKwlpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKQorCQlsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisJCQorCWRv Y3VtZW50LndyaXRlKCI8cD5Jbml0aWFsPC9wPiIpOworCWRvY3VtZW50LndyaXRlKCI8cD4mbmJz cDtkb2N1bWVudC5jaGFyc2V0OiAiICsgZG9jdW1lbnQuY2hhcnNldCArICI8L3A+Iik7CS8vIE1T SUUKKwlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuZGVmYXVsdENoYXJzZXQ6ICIg KyAoZG9jdW1lbnQuZGVmYXVsdENoYXJzZXQgPyAiZGVmaW5lZCIgOiAidW5kZWZpbmVkIikgKyAi PC9wPiIpOwkvLyBNU0lFCisJZG9jdW1lbnQud3JpdGUoIjxwPiZuYnNwO2RvY3VtZW50LmNoYXJh Y3RlclNldDogIiArIGRvY3VtZW50LmNoYXJhY3RlclNldCArICI8L3A+Iik7CS8vIEZpcmVmb3gK Kwlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuaW5wdXRFbmNvZGluZzogIiArIGRv Y3VtZW50LmlucHV0RW5jb2RpbmcgKyAiPC9wPiIpOwkvLyBET00zCisJZG9jdW1lbnQud3JpdGUo IjxwPiZuYnNwO2RvY3VtZW50LmFjdHVhbEVuY29kaW5nOiAiICsgZG9jdW1lbnQuYWN0dWFsRW5j b2RpbmcgKyAiPC9wPiIpOwkvLyBGaXJlZm94LCBvbGQgRE9NMyBkcmFmdAorCQorCWRvY3VtZW50 LndyaXRlKCI8cD5TZXR0aW5nIGNoYXJzZXQgdG8gVVRGLTguLi48L3A+Iik7CisJdHJ5IHsKKwkJ ZG9jdW1lbnQuY2hhcnNldCA9ICJ1dGYtOCI7CisJCWRvY3VtZW50LndyaXRlKCI8cD4mbmJzcDtk b2N1bWVudC5jaGFyc2V0OiAiICsgZG9jdW1lbnQuY2hhcnNldCArICI8L3A+Iik7CisJCWRvY3Vt ZW50LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5kZWZhdWx0Q2hhcnNldDogIiArIChkb2N1bWVu dC5kZWZhdWx0Q2hhcnNldCA/ICJkZWZpbmVkIiA6ICJ1bmRlZmluZWQiKSArICI8L3A+Iik7CisJ CWRvY3VtZW50LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5jaGFyYWN0ZXJTZXQ6ICIgKyBkb2N1 bWVudC5jaGFyYWN0ZXJTZXQgKyAiPC9wPiIpOworCQlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7 ZG9jdW1lbnQuaW5wdXRFbmNvZGluZzogIiArIGRvY3VtZW50LmlucHV0RW5jb2RpbmcgKyAiPC9w PiIpOworCQlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuYWN0dWFsRW5jb2Rpbmc6 ICIgKyBkb2N1bWVudC5hY3R1YWxFbmNvZGluZyArICI8L3A+Iik7CisJfSBjYXRjaCAoZXgpIHsK KwkJZG9jdW1lbnQud3JpdGUoIjxwPkZhaWx1cmU8L3A+Iik7CisJfQorCQorCS8vIHRocm93cyBh biBleGNlcHRpb24gaW4gRmlyZWZveCwgYnV0IEphdmFTY3JpcHRDb3JlIHNlZW1zIHRvIHNpbGVu dGx5IGlnbm9yZSBhc3NpZ25tZW50IHRvIHJlYWQtb25seSBwcm9wZXJ0aWVzCisJZG9jdW1lbnQu d3JpdGUoIjxwPlNldHRpbmcgY2hhcmFjdGVyU2V0IHRvIEtPSTgtUiAoZXhwZWN0ZWQgdG8gZmFp bCwgbWF0Y2hpbmcgRmlyZWZveCkuLi48L3A+Iik7CisJdHJ5IHsKKwkJZG9jdW1lbnQuY2hhcmFj dGVyU2V0ID0gIktPSTgtUiI7CisJCWRvY3VtZW50LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5j aGFyc2V0OiAiICsgZG9jdW1lbnQuY2hhcnNldCArICI8L3A+Iik7CisJCWRvY3VtZW50LndyaXRl KCI8cD4mbmJzcDtkb2N1bWVudC5kZWZhdWx0Q2hhcnNldDogIiArIChkb2N1bWVudC5kZWZhdWx0 Q2hhcnNldCA/ICJkZWZpbmVkIiA6ICJ1bmRlZmluZWQiKSArICI8L3A+Iik7CisJCWRvY3VtZW50 LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5jaGFyYWN0ZXJTZXQ6ICIgKyBkb2N1bWVudC5jaGFy YWN0ZXJTZXQgKyAiPC9wPiIpOworCQlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQu aW5wdXRFbmNvZGluZzogIiArIGRvY3VtZW50LmlucHV0RW5jb2RpbmcgKyAiPC9wPiIpOworCQlk b2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuYWN0dWFsRW5jb2Rpbmc6ICIgKyBkb2N1 bWVudC5hY3R1YWxFbmNvZGluZyArICI8L3A+Iik7CisJfSBjYXRjaCAoZXgpIHsKKwkJZG9jdW1l bnQud3JpdGUoIjxwPkZhaWx1cmUgKGV4cGVjdGVkKTwvcD4iKTsKKwl9CisKKzwvc2NyaXB0Pgor PC9ib2R5PgorPGh0bWw+CkluZGV4OiBXZWJDb3JlL2todG1sL2VjbWEva2pzX2RvbS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvZWNtYS9ranNfZG9tLmNw cCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMTIKZGlmZiAtcCAtdSAtcjEuMTEyIFdlYkNvcmUv a2h0bWwvZWNtYS9ranNfZG9tLmNwcAotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc19kb20uY3Bw CTI3IE5vdiAyMDA1IDAyOjA2OjU4IC0wMDAwCTEuMTEyCisrKyBXZWJDb3JlL2todG1sL2VjbWEv a2pzX2RvbS5jcHAJMjcgTm92IDIwMDUgMjE6MDQ6NTUgLTAwMDAKQEAgLTkyMCw2ICs5MjAsMTEg QEAgY29uc3QgQ2xhc3NJbmZvIERPTURvY3VtZW50OjppbmZvID0geyAiRAogICBkb2N0eXBlICAg ICAgICAgRE9NRG9jdW1lbnQ6OkRvY1R5cGUgICAgICAgICAgICAgICAgICAgICAgICAgRG9udERl bGV0ZXxSZWFkT25seQogICBpbXBsZW1lbnRhdGlvbiAgRE9NRG9jdW1lbnQ6OkltcGxlbWVudGF0 aW9uICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQogICBkb2N1bWVudEVsZW1l bnQgRE9NRG9jdW1lbnQ6OkRvY3VtZW50RWxlbWVudCAgICAgICAgICAgICAgICAgRG9udERlbGV0 ZXxSZWFkT25seQorICBjaGFyc2V0ICAgICAgICAgRE9NRG9jdW1lbnQ6OkNoYXJzZXQgICAgICAg ICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZQorICBkZWZhdWx0Q2hhcnNldCAgRE9NRG9jdW1l bnQ6OkRlZmF1bHRDaGFyc2V0ICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQor ICBjaGFyYWN0ZXJTZXQgICAgRE9NRG9jdW1lbnQ6OkNoYXJhY3RlclNldCAgICAgICAgICAgICAg ICAgICAgRG9udERlbGV0ZXxSZWFkT25seQorICBhY3R1YWxFbmNvZGluZyAgRE9NRG9jdW1lbnQ6 OkFjdHVhbEVuY29kaW5nICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQorICBp bnB1dEVuY29kaW5nICAgRE9NRG9jdW1lbnQ6OklucHV0RW5jb2RpbmcgICAgICAgICAgICAgICAg ICAgRG9udERlbGV0ZXxSZWFkT25seQogICBzdHlsZVNoZWV0cyAgICAgRE9NRG9jdW1lbnQ6OlN0 eWxlU2hlZXRzICAgICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQogICBwcmVm ZXJyZWRTdHlsZXNoZWV0U2V0ICBET01Eb2N1bWVudDo6UHJlZmVycmVkU3R5bGVzaGVldFNldCAg RG9udERlbGV0ZXxSZWFkT25seQogICBzZWxlY3RlZFN0eWxlc2hlZXRTZXQgIERPTURvY3VtZW50 OjpTZWxlY3RlZFN0eWxlc2hlZXRTZXQgICAgRG9udERlbGV0ZQpAQCAtOTYwLDYgKzk2NSwxOCBA QCBWYWx1ZUltcCAqRE9NRG9jdW1lbnQ6OmdldFZhbHVlUHJvcGVydHkoCiAgICAgcmV0dXJuIGdl dERPTURPTUltcGxlbWVudGF0aW9uKGV4ZWMsIGRvYy5pbXBsZW1lbnRhdGlvbigpKTsKICAgY2Fz ZSBEb2N1bWVudEVsZW1lbnQ6CiAgICAgcmV0dXJuIGdldERPTU5vZGUoZXhlYyxkb2MuZG9jdW1l bnRFbGVtZW50KCkpOworICBjYXNlIENoYXJzZXQ6CisgIGNhc2UgQ2hhcmFjdGVyU2V0OgorICBj YXNlIEFjdHVhbEVuY29kaW5nOgorICBjYXNlIElucHV0RW5jb2Rpbmc6CisgICAga2h0bWw6OkRl Y29kZXIqIGRlY29kZXIgPSBkb2MuZGVjb2RlcigpOworICAgIGlmIChkZWNvZGVyKQorICAgICAg cmV0dXJuIFN0cmluZyhkb2MuZGVjb2RlcigpLT5lbmNvZGluZygpKTsKKyAgICByZXR1cm4gTnVs bCgpOworICBjYXNlIERlZmF1bHRDaGFyc2V0OgorICAgIGlmIChLSFRNTFBhcnQqIHBhcnQgPSBk b2MucGFydCgpKQorICAgICAgICByZXR1cm4gU3RyaW5nKHBhcnQtPnNldHRpbmdzKCktPmVuY29k aW5nKCkpOworICAgIHJldHVybiBVbmRlZmluZWQoKTsKICAgY2FzZSBTdHlsZVNoZWV0czoKICAg ICAvL2tkRGVidWcoKSA8PCAiRE9NRG9jdW1lbnQ6OlN0eWxlU2hlZXRzLCByZXR1cm5pbmcgIiA8 PCBkb2Muc3R5bGVTaGVldHMoKS5sZW5ndGgoKSA8PCAiIHN0eWxlc2hlZXRzIiA8PCBlbmRsOwog ICAgIHJldHVybiBnZXRET01TdHlsZVNoZWV0TGlzdChleGVjLCBkb2Muc3R5bGVTaGVldHMoKSwg JmRvYyk7CkBAIC05OTYsMTAgKzEwMTMsMTIgQEAgdm9pZCBET01Eb2N1bWVudDo6cHV0VmFsdWVQ cm9wZXJ0eShFeGVjUwogewogICBEb2N1bWVudEltcGwgJmRvYyA9ICpzdGF0aWNfY2FzdDxEb2N1 bWVudEltcGwgKj4oaW1wbCgpKTsKICAgc3dpdGNoICh0b2tlbikgewotICAgIGNhc2UgU2VsZWN0 ZWRTdHlsZXNoZWV0U2V0OiB7CisgICAgY2FzZSBTZWxlY3RlZFN0eWxlc2hlZXRTZXQ6CiAgICAg ICBkb2Muc2V0U2VsZWN0ZWRTdHlsZXNoZWV0U2V0KHZhbHVlLT50b1N0cmluZyhleGVjKS5kb21T dHJpbmcoKSk7CiAgICAgICBicmVhazsKLSAgICB9CisgICAgY2FzZSBDaGFyc2V0OgorICAgICAg ZG9jLmRlY29kZXIoKS0+c2V0RW5jb2RpbmcodmFsdWUtPnRvU3RyaW5nKGV4ZWMpLmNzdHJpbmco KS5jX3N0cigpLCBraHRtbDo6RGVjb2Rlcjo6VXNlckNob3NlbkVuY29kaW5nKTsKKyAgICAgIGJy ZWFrOwogICB9CiB9CiAKSW5kZXg6IFdlYkNvcmUva2h0bWwvZWNtYS9ranNfZG9tLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvZWNtYS9ranNfZG9tLmgsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuNTkKZGlmZiAtcCAtdSAtcjEuNTkgV2ViQ29yZS9raHRtbC9l Y21hL2tqc19kb20uaAotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc19kb20uaAkyMyBOb3YgMjAw NSAwOTo0Njo1NCAtMDAwMAkxLjU5CisrKyBXZWJDb3JlL2todG1sL2VjbWEva2pzX2RvbS5oCTI3 IE5vdiAyMDA1IDIxOjA0OjU4IC0wMDAwCkBAIC0xMjIsNyArMTIyLDggQEAgbmFtZXNwYWNlIEtK UyB7CiAgICAgdm9pZCBwdXRWYWx1ZVByb3BlcnR5KEV4ZWNTdGF0ZSAqZXhlYywgaW50IHRva2Vu LCBWYWx1ZUltcCAqdmFsdWUsIGludCBhdHRyKTsKICAgICB2aXJ0dWFsIGNvbnN0IENsYXNzSW5m byogY2xhc3NJbmZvKCkgY29uc3QgeyByZXR1cm4gJmluZm87IH0KICAgICBzdGF0aWMgY29uc3Qg Q2xhc3NJbmZvIGluZm87Ci0gICAgZW51bSB7IERvY1R5cGUsIEltcGxlbWVudGF0aW9uLCBEb2N1 bWVudEVsZW1lbnQsCisgICAgZW51bSB7IERvY1R5cGUsIEltcGxlbWVudGF0aW9uLCBEb2N1bWVu dEVsZW1lbnQsIAorICAgICAgICAgICBDaGFyc2V0LCBEZWZhdWx0Q2hhcnNldCwgQ2hhcmFjdGVy U2V0LCBBY3R1YWxFbmNvZGluZywgSW5wdXRFbmNvZGluZywKICAgICAgICAgICAgLy8gRnVuY3Rp b25zCiAgICAgICAgICAgIEFkb3B0Tm9kZSwKICAgICAgICAgICAgQ3JlYXRlRWxlbWVudCwgQ3Jl YXRlRG9jdW1lbnRGcmFnbWVudCwgQ3JlYXRlVGV4dE5vZGUsIENyZWF0ZUNvbW1lbnQsCg== 4828 2005-11-27 21:27:28 -0800 2005-11-27 21:27:28 -0800 Patch using UTF8String() CharsetPatch.txt text/plain 6838 ap SW5kZXg6IGRvY3VtZW50LWNoYXJzZXQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KZGlmZiAtTnB1 IGRvY3VtZW50LWNoYXJzZXQtZXhwZWN0ZWQudHh0Ci0tLSBkb2N1bWVudC1jaGFyc2V0LWV4cGVj dGVkLnR4dAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBkb2N1bWVudC1jaGFyc2V0LWV4 cGVjdGVkLnR4dAkyNyBOb3YgMjAwNSAyMDo1NzoyNSAtMDAwMApAQCAtMCwwICsxLDM3IEBACitJ bml0aWFsCisKK8KgZG9jdW1lbnQuY2hhcnNldDogS09JOC1SCisKK8KgZG9jdW1lbnQuZGVmYXVs dENoYXJzZXQ6IGRlZmluZWQKKworwqBkb2N1bWVudC5jaGFyYWN0ZXJTZXQ6IEtPSTgtUgorCivC oGRvY3VtZW50LmlucHV0RW5jb2Rpbmc6IEtPSTgtUgorCivCoGRvY3VtZW50LmFjdHVhbEVuY29k aW5nOiBLT0k4LVIKKworU2V0dGluZyBjaGFyc2V0IHRvIFVURi04Li4uCisKK8KgZG9jdW1lbnQu Y2hhcnNldDogVVRGLTgKKworwqBkb2N1bWVudC5kZWZhdWx0Q2hhcnNldDogZGVmaW5lZAorCivC oGRvY3VtZW50LmNoYXJhY3RlclNldDogVVRGLTgKKworwqBkb2N1bWVudC5pbnB1dEVuY29kaW5n OiBVVEYtOAorCivCoGRvY3VtZW50LmFjdHVhbEVuY29kaW5nOiBVVEYtOAorCitTZXR0aW5nIGNo YXJhY3RlclNldCB0byBLT0k4LVIgKGV4cGVjdGVkIHRvIGZhaWwsIG1hdGNoaW5nIEZpcmVmb3gp Li4uCisKK8KgZG9jdW1lbnQuY2hhcnNldDogVVRGLTgKKworwqBkb2N1bWVudC5kZWZhdWx0Q2hh cnNldDogZGVmaW5lZAorCivCoGRvY3VtZW50LmNoYXJhY3RlclNldDogVVRGLTgKKworwqBkb2N1 bWVudC5pbnB1dEVuY29kaW5nOiBVVEYtOAorCivCoGRvY3VtZW50LmFjdHVhbEVuY29kaW5nOiBV VEYtOAorCisKSW5kZXg6IGRvY3VtZW50LWNoYXJzZXQuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLU5w dSBkb2N1bWVudC1jaGFyc2V0Lmh0bWwKLS0tIGRvY3VtZW50LWNoYXJzZXQuaHRtbAkxIEphbiAx OTcwIDAwOjAwOjAwIC0wMDAwCisrKyBkb2N1bWVudC1jaGFyc2V0Lmh0bWwJMjcgTm92IDIwMDUg MjA6NDg6MTYgLTAwMDAKQEAgLTAsMCArMSw0NSBAQAorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGh0 dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PWtvaTgt ciI+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+CisKKwlpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKQorCQlsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisJCQorCWRv Y3VtZW50LndyaXRlKCI8cD5Jbml0aWFsPC9wPiIpOworCWRvY3VtZW50LndyaXRlKCI8cD4mbmJz cDtkb2N1bWVudC5jaGFyc2V0OiAiICsgZG9jdW1lbnQuY2hhcnNldCArICI8L3A+Iik7CS8vIE1T SUUKKwlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuZGVmYXVsdENoYXJzZXQ6ICIg KyAoZG9jdW1lbnQuZGVmYXVsdENoYXJzZXQgPyAiZGVmaW5lZCIgOiAidW5kZWZpbmVkIikgKyAi PC9wPiIpOwkvLyBNU0lFCisJZG9jdW1lbnQud3JpdGUoIjxwPiZuYnNwO2RvY3VtZW50LmNoYXJh Y3RlclNldDogIiArIGRvY3VtZW50LmNoYXJhY3RlclNldCArICI8L3A+Iik7CS8vIEZpcmVmb3gK Kwlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuaW5wdXRFbmNvZGluZzogIiArIGRv Y3VtZW50LmlucHV0RW5jb2RpbmcgKyAiPC9wPiIpOwkvLyBET00zCisJZG9jdW1lbnQud3JpdGUo IjxwPiZuYnNwO2RvY3VtZW50LmFjdHVhbEVuY29kaW5nOiAiICsgZG9jdW1lbnQuYWN0dWFsRW5j b2RpbmcgKyAiPC9wPiIpOwkvLyBGaXJlZm94LCBvbGQgRE9NMyBkcmFmdAorCQorCWRvY3VtZW50 LndyaXRlKCI8cD5TZXR0aW5nIGNoYXJzZXQgdG8gVVRGLTguLi48L3A+Iik7CisJdHJ5IHsKKwkJ ZG9jdW1lbnQuY2hhcnNldCA9ICJ1dGYtOCI7CisJCWRvY3VtZW50LndyaXRlKCI8cD4mbmJzcDtk b2N1bWVudC5jaGFyc2V0OiAiICsgZG9jdW1lbnQuY2hhcnNldCArICI8L3A+Iik7CisJCWRvY3Vt ZW50LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5kZWZhdWx0Q2hhcnNldDogIiArIChkb2N1bWVu dC5kZWZhdWx0Q2hhcnNldCA/ICJkZWZpbmVkIiA6ICJ1bmRlZmluZWQiKSArICI8L3A+Iik7CisJ CWRvY3VtZW50LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5jaGFyYWN0ZXJTZXQ6ICIgKyBkb2N1 bWVudC5jaGFyYWN0ZXJTZXQgKyAiPC9wPiIpOworCQlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7 ZG9jdW1lbnQuaW5wdXRFbmNvZGluZzogIiArIGRvY3VtZW50LmlucHV0RW5jb2RpbmcgKyAiPC9w PiIpOworCQlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuYWN0dWFsRW5jb2Rpbmc6 ICIgKyBkb2N1bWVudC5hY3R1YWxFbmNvZGluZyArICI8L3A+Iik7CisJfSBjYXRjaCAoZXgpIHsK KwkJZG9jdW1lbnQud3JpdGUoIjxwPkZhaWx1cmU8L3A+Iik7CisJfQorCQorCS8vIHRocm93cyBh biBleGNlcHRpb24gaW4gRmlyZWZveCwgYnV0IEphdmFTY3JpcHRDb3JlIHNlZW1zIHRvIHNpbGVu dGx5IGlnbm9yZSBhc3NpZ25tZW50IHRvIHJlYWQtb25seSBwcm9wZXJ0aWVzCisJZG9jdW1lbnQu d3JpdGUoIjxwPlNldHRpbmcgY2hhcmFjdGVyU2V0IHRvIEtPSTgtUiAoZXhwZWN0ZWQgdG8gZmFp bCwgbWF0Y2hpbmcgRmlyZWZveCkuLi48L3A+Iik7CisJdHJ5IHsKKwkJZG9jdW1lbnQuY2hhcmFj dGVyU2V0ID0gIktPSTgtUiI7CisJCWRvY3VtZW50LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5j aGFyc2V0OiAiICsgZG9jdW1lbnQuY2hhcnNldCArICI8L3A+Iik7CisJCWRvY3VtZW50LndyaXRl KCI8cD4mbmJzcDtkb2N1bWVudC5kZWZhdWx0Q2hhcnNldDogIiArIChkb2N1bWVudC5kZWZhdWx0 Q2hhcnNldCA/ICJkZWZpbmVkIiA6ICJ1bmRlZmluZWQiKSArICI8L3A+Iik7CisJCWRvY3VtZW50 LndyaXRlKCI8cD4mbmJzcDtkb2N1bWVudC5jaGFyYWN0ZXJTZXQ6ICIgKyBkb2N1bWVudC5jaGFy YWN0ZXJTZXQgKyAiPC9wPiIpOworCQlkb2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQu aW5wdXRFbmNvZGluZzogIiArIGRvY3VtZW50LmlucHV0RW5jb2RpbmcgKyAiPC9wPiIpOworCQlk b2N1bWVudC53cml0ZSgiPHA+Jm5ic3A7ZG9jdW1lbnQuYWN0dWFsRW5jb2Rpbmc6ICIgKyBkb2N1 bWVudC5hY3R1YWxFbmNvZGluZyArICI8L3A+Iik7CisJfSBjYXRjaCAoZXgpIHsKKwkJZG9jdW1l bnQud3JpdGUoIjxwPkZhaWx1cmUgKGV4cGVjdGVkKTwvcD4iKTsKKwl9CisKKzwvc2NyaXB0Pgor PC9ib2R5PgorPGh0bWw+CkluZGV4OiBXZWJDb3JlL2todG1sL2VjbWEva2pzX2RvbS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvZWNtYS9ranNfZG9tLmNw cCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMTIKZGlmZiAtcCAtdSAtcjEuMTEyIFdlYkNvcmUv a2h0bWwvZWNtYS9ranNfZG9tLmNwcAotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc19kb20uY3Bw CTI3IE5vdiAyMDA1IDAyOjA2OjU4IC0wMDAwCTEuMTEyCisrKyBXZWJDb3JlL2todG1sL2VjbWEv a2pzX2RvbS5jcHAJMjcgTm92IDIwMDUgMjE6MDQ6NTUgLTAwMDAKQEAgLTkyMCw2ICs5MjAsMTEg QEAgY29uc3QgQ2xhc3NJbmZvIERPTURvY3VtZW50OjppbmZvID0geyAiRAogICBkb2N0eXBlICAg ICAgICAgRE9NRG9jdW1lbnQ6OkRvY1R5cGUgICAgICAgICAgICAgICAgICAgICAgICAgRG9udERl bGV0ZXxSZWFkT25seQogICBpbXBsZW1lbnRhdGlvbiAgRE9NRG9jdW1lbnQ6OkltcGxlbWVudGF0 aW9uICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQogICBkb2N1bWVudEVsZW1l bnQgRE9NRG9jdW1lbnQ6OkRvY3VtZW50RWxlbWVudCAgICAgICAgICAgICAgICAgRG9udERlbGV0 ZXxSZWFkT25seQorICBjaGFyc2V0ICAgICAgICAgRE9NRG9jdW1lbnQ6OkNoYXJzZXQgICAgICAg ICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZQorICBkZWZhdWx0Q2hhcnNldCAgRE9NRG9jdW1l bnQ6OkRlZmF1bHRDaGFyc2V0ICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQor ICBjaGFyYWN0ZXJTZXQgICAgRE9NRG9jdW1lbnQ6OkNoYXJhY3RlclNldCAgICAgICAgICAgICAg ICAgICAgRG9udERlbGV0ZXxSZWFkT25seQorICBhY3R1YWxFbmNvZGluZyAgRE9NRG9jdW1lbnQ6 OkFjdHVhbEVuY29kaW5nICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQorICBp bnB1dEVuY29kaW5nICAgRE9NRG9jdW1lbnQ6OklucHV0RW5jb2RpbmcgICAgICAgICAgICAgICAg ICAgRG9udERlbGV0ZXxSZWFkT25seQogICBzdHlsZVNoZWV0cyAgICAgRE9NRG9jdW1lbnQ6OlN0 eWxlU2hlZXRzICAgICAgICAgICAgICAgICAgICAgRG9udERlbGV0ZXxSZWFkT25seQogICBwcmVm ZXJyZWRTdHlsZXNoZWV0U2V0ICBET01Eb2N1bWVudDo6UHJlZmVycmVkU3R5bGVzaGVldFNldCAg RG9udERlbGV0ZXxSZWFkT25seQogICBzZWxlY3RlZFN0eWxlc2hlZXRTZXQgIERPTURvY3VtZW50 OjpTZWxlY3RlZFN0eWxlc2hlZXRTZXQgICAgRG9udERlbGV0ZQpAQCAtOTYwLDYgKzk2NSwxOCBA QCBWYWx1ZUltcCAqRE9NRG9jdW1lbnQ6OmdldFZhbHVlUHJvcGVydHkoCiAgICAgcmV0dXJuIGdl dERPTURPTUltcGxlbWVudGF0aW9uKGV4ZWMsIGRvYy5pbXBsZW1lbnRhdGlvbigpKTsKICAgY2Fz ZSBEb2N1bWVudEVsZW1lbnQ6CiAgICAgcmV0dXJuIGdldERPTU5vZGUoZXhlYyxkb2MuZG9jdW1l bnRFbGVtZW50KCkpOworICBjYXNlIENoYXJzZXQ6CisgIGNhc2UgQ2hhcmFjdGVyU2V0OgorICBj YXNlIEFjdHVhbEVuY29kaW5nOgorICBjYXNlIElucHV0RW5jb2Rpbmc6CisgICAga2h0bWw6OkRl Y29kZXIqIGRlY29kZXIgPSBkb2MuZGVjb2RlcigpOworICAgIGlmIChkZWNvZGVyKQorICAgICAg cmV0dXJuIFN0cmluZyhkb2MuZGVjb2RlcigpLT5lbmNvZGluZygpKTsKKyAgICByZXR1cm4gTnVs bCgpOworICBjYXNlIERlZmF1bHRDaGFyc2V0OgorICAgIGlmIChLSFRNTFBhcnQqIHBhcnQgPSBk b2MucGFydCgpKQorICAgICAgICByZXR1cm4gU3RyaW5nKHBhcnQtPnNldHRpbmdzKCktPmVuY29k aW5nKCkpOworICAgIHJldHVybiBVbmRlZmluZWQoKTsKICAgY2FzZSBTdHlsZVNoZWV0czoKICAg ICAvL2tkRGVidWcoKSA8PCAiRE9NRG9jdW1lbnQ6OlN0eWxlU2hlZXRzLCByZXR1cm5pbmcgIiA8 PCBkb2Muc3R5bGVTaGVldHMoKS5sZW5ndGgoKSA8PCAiIHN0eWxlc2hlZXRzIiA8PCBlbmRsOwog ICAgIHJldHVybiBnZXRET01TdHlsZVNoZWV0TGlzdChleGVjLCBkb2Muc3R5bGVTaGVldHMoKSwg JmRvYyk7CkBAIC05OTYsMTAgKzEwMTMsMTIgQEAgdm9pZCBET01Eb2N1bWVudDo6cHV0VmFsdWVQ cm9wZXJ0eShFeGVjUwogewogICBEb2N1bWVudEltcGwgJmRvYyA9ICpzdGF0aWNfY2FzdDxEb2N1 bWVudEltcGwgKj4oaW1wbCgpKTsKICAgc3dpdGNoICh0b2tlbikgewotICAgIGNhc2UgU2VsZWN0 ZWRTdHlsZXNoZWV0U2V0OiB7CisgICAgY2FzZSBTZWxlY3RlZFN0eWxlc2hlZXRTZXQ6CiAgICAg ICBkb2Muc2V0U2VsZWN0ZWRTdHlsZXNoZWV0U2V0KHZhbHVlLT50b1N0cmluZyhleGVjKS5kb21T dHJpbmcoKSk7CiAgICAgICBicmVhazsKLSAgICB9CisgICAgY2FzZSBDaGFyc2V0OgorICAgICAg ZG9jLmRlY29kZXIoKS0+c2V0RW5jb2RpbmcodmFsdWUtPnRvU3RyaW5nKGV4ZWMpLlVURjhTdHJp bmcoKS5jX3N0cigpLCBraHRtbDo6RGVjb2Rlcjo6VXNlckNob3NlbkVuY29kaW5nKTsKKyAgICAg IGJyZWFrOwogICB9CiB9CiAKSW5kZXg6IFdlYkNvcmUva2h0bWwvZWNtYS9ranNfZG9tLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNvcmUva2h0bWwvZWNtYS9ranNfZG9tLmgs dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNTkKZGlmZiAtcCAtdSAtcjEuNTkgV2ViQ29yZS9raHRt bC9lY21hL2tqc19kb20uaAotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc19kb20uaAkyMyBOb3Yg MjAwNSAwOTo0Njo1NCAtMDAwMAkxLjU5CisrKyBXZWJDb3JlL2todG1sL2VjbWEva2pzX2RvbS5o CTI3IE5vdiAyMDA1IDIxOjA0OjU4IC0wMDAwCkBAIC0xMjIsNyArMTIyLDggQEAgbmFtZXNwYWNl IEtKUyB7CiAgICAgdm9pZCBwdXRWYWx1ZVByb3BlcnR5KEV4ZWNTdGF0ZSAqZXhlYywgaW50IHRv a2VuLCBWYWx1ZUltcCAqdmFsdWUsIGludCBhdHRyKTsKICAgICB2aXJ0dWFsIGNvbnN0IENsYXNz SW5mbyogY2xhc3NJbmZvKCkgY29uc3QgeyByZXR1cm4gJmluZm87IH0KICAgICBzdGF0aWMgY29u c3QgQ2xhc3NJbmZvIGluZm87Ci0gICAgZW51bSB7IERvY1R5cGUsIEltcGxlbWVudGF0aW9uLCBE b2N1bWVudEVsZW1lbnQsCisgICAgZW51bSB7IERvY1R5cGUsIEltcGxlbWVudGF0aW9uLCBEb2N1 bWVudEVsZW1lbnQsIAorICAgICAgICAgICBDaGFyc2V0LCBEZWZhdWx0Q2hhcnNldCwgQ2hhcmFj dGVyU2V0LCBBY3R1YWxFbmNvZGluZywgSW5wdXRFbmNvZGluZywKICAgICAgICAgICAgLy8gRnVu Y3Rpb25zCiAgICAgICAgICAgIEFkb3B0Tm9kZSwKICAgICAgICAgICAgQ3JlYXRlRWxlbWVudCwg Q3JlYXRlRG9jdW1lbnRGcmFnbWVudCwgQ3JlYXRlVGV4dE5vZGUsIENyZWF0ZUNvbW1lbnQsCg==