57087 2011-03-25 00:18:20 -0700 [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled 2011-03-28 14:24:01 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED EasyFix, Qt, QtTriaged P3 Minor --- 57016 0 kristian.amlie webkit-unassigned abarth benjamin commit-queue eric kenneth kling ossy webkit.review.bot oldest_to_newest 373366 0 kristian.amlie 2011-03-25 00:18:20 -0700 In Source/WebKit/qt/QtWebKit.pro there is a line "DEFINES -= QT_ASCII_CAST_WARNINGS", which disables warnings when you convert from anything 8-bit to a UTF-16 string (default QString). Since warnings are treated as errors in WebKit, this causes the build to fail. Ideally, WebKit should be able to compile with these warnings turned on. 373368 1 kristian.amlie 2011-03-25 00:18:51 -0700 Related to https://bugs.webkit.org/show_bug.cgi?id=57016. 373555 2 86951 benjamin 2011-03-25 09:28:57 -0700 Created attachment 86951 Patch 373566 3 86952 benjamin 2011-03-25 09:48:36 -0700 Created attachment 86952 Patch 373577 4 86951 kling 2011-03-25 10:12:11 -0700 Comment on attachment 86951 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86951&action=review > Source/WebCore/ChangeLog:8 > + Use explicit convertion for string to avoid depending on the default codec s/convertion/conversion/ 373579 5 86952 kling 2011-03-25 10:15:02 -0700 Comment on attachment 86952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86952&action=review > Source/WebKit2/ChangeLog:8 > + Use explicit convertion for string to avoid depending on the default codec s/convertion/conversion/ 373583 6 86951 benjamin 2011-03-25 10:23:23 -0700 Comment on attachment 86951 Patch Landed as r81967. 373584 7 86952 benjamin 2011-03-25 10:26:09 -0700 Comment on attachment 86952 Patch Landed: r81968 373592 8 86957 benjamin 2011-03-25 10:38:28 -0700 Created attachment 86957 Patch 373594 9 benjamin 2011-03-25 10:39:10 -0700 I'll finish the tests later, the diff is already huge and I need to find a way to automate some of the conversions. 373919 10 86957 kling 2011-03-26 11:23:23 -0700 Comment on attachment 86957 Patch Did you performance test this on AIX? 374061 11 86957 commit-queue 2011-03-27 00:19:15 -0700 Comment on attachment 86957 Patch Clearing flags on attachment: 86957 Committed r82059: <http://trac.webkit.org/changeset/82059> 374062 12 commit-queue 2011-03-27 00:19:19 -0700 All reviewed patches have been landed. Closing bug. 374098 13 benjamin 2011-03-27 03:51:28 -0700 Reopening, there is still the define to change. 374188 14 87079 benjamin 2011-03-27 11:40:50 -0700 Created attachment 87079 Patch 374191 15 87082 benjamin 2011-03-27 11:47:39 -0700 Created attachment 87082 Patch Hopefully it is the last patch. This enable QT_ASCII_CAST_WARNINGS by default and disable it where the warning does not make sense. 374192 16 87082 kling 2011-03-27 11:53:28 -0700 Comment on attachment 87082 Patch Good luck, monsieur Poulain! 374242 17 commit-queue 2011-03-27 15:51:59 -0700 The commit-queue encountered the following flaky tests while processing attachment 87079: fast/forms/input-appearance-preventDefault.html bug 57194 (author: adele@apple.com) The commit-queue is continuing to process your patch. 374244 18 87079 commit-queue 2011-03-27 15:55:20 -0700 Comment on attachment 87079 Patch Clearing flags on attachment: 87079 Committed r82082: <http://trac.webkit.org/changeset/82082> 374383 19 87082 benjamin 2011-03-28 03:21:56 -0700 Comment on attachment 87082 Patch I cq+ this one and I'll check the bots to see if I break any platform. 374542 20 87082 commit-queue 2011-03-28 09:29:30 -0700 Comment on attachment 87082 Patch Clearing flags on attachment: 87082 Committed r82125: <http://trac.webkit.org/changeset/82125> 374543 21 commit-queue 2011-03-28 09:29:34 -0700 All reviewed patches have been landed. Closing bug. 374608 22 ossy 2011-03-28 10:53:05 -0700 Buildfix landed in http://trac.webkit.org/changeset/82134. Unfortunately CQ can't test define changes in project files due to: https://bugs.webkit.org/show_bug.cgi?id=38054 374660 23 webkit.review.bot 2011-03-28 12:00:42 -0700 http://trac.webkit.org/changeset/82134 might have broken Leopard Intel Release (Tests) 374772 24 ossy 2011-03-28 14:24:01 -0700 (In reply to comment #18) > (From update of attachment 87079 [details]) > Clearing flags on attachment: 87079 > > Committed r82082: <http://trac.webkit.org/changeset/82082> Typo fix for it landed in http://trac.webkit.org/changeset/82155 86951 2011-03-25 09:28:57 -0700 2011-03-25 10:23:23 -0700 Patch bug-57087-20110325174053.patch text/plain 5168 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogODE5NjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMjM1MDIwNjc5NDkzZWIx MGFhODIwYzRjZWI3ODMyZTYwNjhlNzEyLi5hMzAzMmIyZDEwN2EwYWZjNzIxNTA5NzE1NTQxMWQ2 M2E0YjI2NGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDMtMjUgIEJlbmph bWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0V2ViS2l0IHdpbGwgbm90 IGNvbXBpbGUgd2l0aCBRVF9BU0NJSV9DQVNUX1dBUk5JTkdTIGVuYWJsZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDg3CisKKyAgICAgICAgVXNl IGV4cGxpY2l0IGNvbnZlcnRpb24gZm9yIHN0cmluZyB0byBhdm9pZCBkZXBlbmRpbmcgb24gdGhl IGRlZmF1bHQgY29kZWMKKyAgICAgICAgaW5zdGFsbGVkIGJ5IHRoZSB1c2VyIGNvZGUuCisKKyAg ICAgICAgKiBicmlkZ2UvcXQvcXRfcGl4bWFwcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpRdFBpeG1hcFRvRGF0YVVybE1ldGhvZDo6aW52b2tlKToKKyAgICAgICAgKEpTQzo6 QmluZGluZ3M6OlF0UGl4bWFwSW5zdGFuY2U6OnZhbHVlT2YpOgorICAgICAgICAqIHBsYXRmb3Jt L3F0L0xhbmd1YWdlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGxhdGZvcm1EZWZhdWx0TGFu Z3VhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1Bhc3RlYm9hcmRRdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQYXN0ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbik6CisgICAgICAgICogcGx1Z2lu cy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZUd0 ayk6CisgICAgICAgICogcGx1Z2lucy9xdC9QbHVnaW5WaWV3UXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Z2V0UGx1Z2luRGlzcGxheSk6CisKIDIwMTEtMDMtMjUgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1h bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9waXhtYXBydW50aW1l LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9waXhtYXBydW50aW1lLmNwcAppbmRl eCBmNWUyYjEyYmQzMTE1NWRlN2JjZWY4ZmZiYzJkNzczZDg3NmY0ZTNhLi5kYTNlMzgzMTJkM2M4 OTUwZTkwNTIzYTAxN2M3ZjJkYWY4YjdmZjk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i cmlkZ2UvcXQvcXRfcGl4bWFwcnVudGltZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYnJpZGdl L3F0L3F0X3BpeG1hcHJ1bnRpbWUuY3BwCkBAIC0xMTksNyArMTE5LDcgQEAgcHVibGljOgogICAg ICAgICBRQnl0ZUFycmF5IGJ5dGVBcnJheTsKICAgICAgICAgUUJ1ZmZlciBidWZmZXIoJmJ5dGVB cnJheSk7CiAgICAgICAgIGluc3RhbmNlLT50b0ltYWdlKCkuc2F2ZSgmYnVmZmVyLCAiUE5HIik7 Ci0gICAgICAgIGNvbnN0IFFTdHJpbmcgZW5jb2RlZFN0cmluZyA9IFFTdHJpbmcoImRhdGE6aW1h Z2UvcG5nO2Jhc2U2NCwiKSArIGJ5dGVBcnJheS50b0Jhc2U2NCgpOworICAgICAgICBjb25zdCBR U3RyaW5nIGVuY29kZWRTdHJpbmcgPSBRTGF0aW4xU3RyaW5nKCJkYXRhOmltYWdlL3BuZztiYXNl NjQsIikgKyBRTGF0aW4xU3RyaW5nKGJ5dGVBcnJheS50b0Jhc2U2NCgpKTsKICAgICAgICAgY29u c3QgVVN0cmluZyB1c3RyaW5nKChVQ2hhciopZW5jb2RlZFN0cmluZy51dGYxNigpLCBlbmNvZGVk U3RyaW5nLmxlbmd0aCgpKTsKICAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIHVzdHJpbmcp OwogICAgIH0KQEAgLTIzOSw3ICsyMzksNyBAQCBKU1ZhbHVlIFF0UGl4bWFwSW5zdGFuY2U6OmRl ZmF1bHRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgcAogCiBK U1ZhbHVlIFF0UGl4bWFwSW5zdGFuY2U6OnZhbHVlT2YoRXhlY1N0YXRlKiBleGVjKSBjb25zdAog ewotICAgIGNvbnN0IFFTdHJpbmcgc3RyaW5nVmFsdWUgPSBRU3RyaW5nKCJbUXQgTmF0aXZlIFBp eG1hcCAlMSwlMl0iKS5hcmcod2lkdGgoKSkuYXJnKGhlaWdodCgpKTsKKyAgICBjb25zdCBRU3Ry aW5nIHN0cmluZ1ZhbHVlID0gUVN0cmluZzo6ZnJvbUxhdGluMSgiW1F0IE5hdGl2ZSBQaXhtYXAg JTEsJTJdIikuYXJnKHdpZHRoKCkpLmFyZyhoZWlnaHQoKSk7CiAgICAgVVN0cmluZyB1c3RyaW5n KChVQ2hhciopc3RyaW5nVmFsdWUudXRmMTYoKSwgc3RyaW5nVmFsdWUubGVuZ3RoKCkpOwogICAg IHJldHVybiBqc1N0cmluZyhleGVjLCB1c3RyaW5nKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3F0L0xhbmd1YWdlUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vcXQvTGFuZ3VhZ2VRdC5jcHAKaW5kZXggNzFlNTU0ZjMzYTIzMTU0M2M2M2Q3NmQ3MGQ0Y2Vl OThkYmY1NTU2Ny4uNWExZDcwNzIxZTE5MGYwMTNjZTg5MjQxMWUzOWFkNjViMTBmOTU3OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTGFuZ3VhZ2VRdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvTGFuZ3VhZ2VRdC5jcHAKQEAgLTM1LDcgKzM1LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogU3RyaW5nIHBsYXRmb3JtRGVmYXVsdExhbmd1YWdlKCkK IHsKICAgICBRTG9jYWxlIGxvY2FsZTsKLSAgICByZXR1cm4gbG9jYWxlLm5hbWUoKS5yZXBsYWNl KCJfIiwgIi0iKTsKKyAgICByZXR1cm4gbG9jYWxlLm5hbWUoKS5yZXBsYWNlKFFMYXRpbjFDaGFy KCdfJyksIFFMYXRpbjFDaGFyKCctJykpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9QYXN0ZWJvYXJkUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vcXQvUGFzdGVib2FyZFF0LmNwcAppbmRleCA2ODY1ZmQ3ZGUxZGFhZjNhODZkYjk2ZTFjNTc3 ODQ0Njg4MmI3MTk3Li44NTBkNjhhZTQ4MjQ2ZGIyY2NkNTg5NWQ3ZGE1NThmMTIxNDI2MzY4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9QYXN0ZWJvYXJkUXQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Bhc3RlYm9hcmRRdC5jcHAKQEAgLTc3LDcg Kzc3LDcgQEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihSYW5nZSogc2VsZWN0ZWRS YW5nZSwgYm9vbCBjYW5TbWFydENvcHlPckRlbGV0ZSwKICAgICBRQXBwbGljYXRpb246OmNsaXBi b2FyZCgpLT5zZXRNaW1lRGF0YShtZCwgbV9zZWxlY3Rpb25Nb2RlID8gUUNsaXBib2FyZDo6U2Vs ZWN0aW9uIDogUUNsaXBib2FyZDo6Q2xpcGJvYXJkKTsKICNlbmRpZgogICAgIGlmIChjYW5TbWFy dENvcHlPckRlbGV0ZSkKLSAgICAgICAgbWQtPnNldERhdGEoImFwcGxpY2F0aW9uL3ZuZC5xdHdl YmtpdC5zbWFydHBhc3RlIiwgUUJ5dGVBcnJheSgpKTsKKyAgICAgICAgbWQtPnNldERhdGEoUUxh dGluMVN0cmluZygiYXBwbGljYXRpb24vdm5kLnF0d2Via2l0LnNtYXJ0cGFzdGUiKSwgUUJ5dGVB cnJheSgpKTsKIH0KIAogYm9vbCBQYXN0ZWJvYXJkOjpjYW5TbWFydFJlcGxhY2UoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwCmluZGV4IGNlMDdmYWYw NTI0MjE5NDYyZjkxZWUwNTliNGRiYzg0YmI2Mjc5NDQuLjE5OTQxZDYwZjc0YWQxOTRjZDAzZjM4 NzkwZWM5OTRhM2M4MGE2NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQv UGx1Z2luUGFja2FnZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdp blBhY2thZ2VRdC5jcHAKQEAgLTEyMSw3ICsxMjEsNyBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXpl R3RrKFFMaWJyYXJ5KiBtb2R1bGUgPSAwKQogICAgICAgICB9CiAgICAgfQogCi0gICAgUUxpYnJh cnkgbGlicmFyeSgibGliZ3RrLXgxMS0yLjAuc28uMCIpOworICAgIFFMaWJyYXJ5IGxpYnJhcnko UUxhdGluMVN0cmluZygibGliZ3RrLXgxMS0yLjAuc28uMCIpKTsKICAgICBpZiAobGlicmFyeS5s b2FkKCkpIHsKICAgICAgICAgdHlwZWRlZiB2b2lkICooKmd0a19pbml0X2NoZWNrX3B0cikoaW50 KiwgY2hhcioqKik7CiAgICAgICAgIGd0a19pbml0X2NoZWNrX3B0ciBndGtJbml0Q2hlY2sgPSAo Z3RrX2luaXRfY2hlY2tfcHRyKWxpYnJhcnkucmVzb2x2ZSgiZ3RrX2luaXRfY2hlY2siKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luVmlld1F0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luVmlld1F0LmNwcAppbmRleCA2MTFhYmI5ZmNl YmM1ZmFkNzNkMWRkNWU4NTU1YjFmM2EwN2YzOTBhLi5kY2I4MDVhYTEyNTdjMWIzMzQ3ZjVjOWU2 YmM5MzY5MDczNzliOTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1Bs dWdpblZpZXdRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5WaWV3 UXQuY3BwCkBAIC04NDcsNyArODQ3LDcgQEAgc3RhdGljIERpc3BsYXkgKmdldFBsdWdpbkRpc3Bs YXkoKQogICAgIC8vIHN1cHBvcnQgZ2RrIGJhc2VkIHBsdWdpbnMgKGxpa2UgZmxhc2gpIHRoYXQg dXNlIGEgZGlmZmVyZW50IFggY29ubmVjdGlvbi4KICAgICAvLyBUaGUgY29kZSBiZWxvdyBoYXMg dGhlIHNhbWUgZWZmZWN0IGFzIHRoaXMgb25lOgogICAgIC8vIERpc3BsYXkgKmdka0Rpc3BsYXkg PSBnZGtfeDExX2Rpc3BsYXlfZ2V0X3hkaXNwbGF5KGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCkp OwotICAgIFFMaWJyYXJ5IGxpYnJhcnkoImxpYmdkay14MTEtMi4wIiwgMCk7CisgICAgUUxpYnJh cnkgbGlicmFyeShRTGF0aW4xU3RyaW5nKCJsaWJnZGsteDExLTIuMCIpLCAwKTsKICAgICBpZiAo IWxpYnJhcnkubG9hZCgpKQogICAgICAgICByZXR1cm4gMDsKIAo= 86952 2011-03-25 09:48:36 -0700 2011-03-25 10:26:09 -0700 Patch bug-57087-20110325180032.patch text/plain 8436 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogODE5NjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3MTBhYzM2MzE5MTdiZjdk MDUxMzM5YWEzOGIyYjkyNzJlMGI4NTA0Li42YTRiMmRkYmM5MWI1Yjk4MWY1ODJjNmEyZGU0ZTI2 Yzk1YjYyMjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDMtMjUgIEJlbmph bWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0V2ViS2l0IHdpbGwgbm90 IGNvbXBpbGUgd2l0aCBRVF9BU0NJSV9DQVNUX1dBUk5JTkdTIGVuYWJsZWQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDg3CisKKyAgICAgICAgVXNl IGV4cGxpY2l0IGNvbnZlcnRpb24gZm9yIHN0cmluZyB0byBhdm9pZCBkZXBlbmRpbmcgb24gdGhl IGRlZmF1bHQgY29kZWMKKyAgICAgICAgaW5zdGFsbGVkIGJ5IHRoZSB1c2VyIGNvZGUuCisKKyAg ICAgICAgKiBQbGF0Zm9ybS9xdC9TaGFyZWRNZW1vcnlRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlNoYXJlZE1lbW9yeTo6Y3JlYXRlKToKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lucy9OZXRzY2Fw ZS94MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwOgorICAgICAgICAoV2ViS2l0Ojppbml0 aWFsaXplR1RLKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FncmFwaGljc3dr dmlldy90c3RfcWdyYXBoaWNzd2t2aWV3LmNwcDoKKyAgICAgICAgKHRzdF9RR3JhcGhpY3NXS1Zp ZXc6OmxvYWRFbXB0eVBhZ2UpOgorICAgICAgICAodHN0X1FHcmFwaGljc1dLVmlldzo6bG9hZEVt cHR5VXJsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3F3a3BhZ2UvdHN0X3F3 a3BhZ2UuY3BwOgorICAgICAgICAodHN0X1FXS1BhZ2U6OmxvYWRFbXB0eVVybCk6CisgICAgICAg ICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDoKKyAgICAgICAg KFdlYktpdDo6UHJvY2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6Z2V0UGx1Z2luRGlzcGxheSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9xdC9X ZWJQcm9jZXNzTWFpblF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6RW52SHR0cFByb3h5RmFjdG9y eTo6aW5pdGlhbGl6ZUZyb21FbnZpcm9ubWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NNYWluUXQpOgorCiAyMDExLTAzLTI1ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3F0L1NoYXJlZE1lbW9yeVF0LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL3F0L1NoYXJlZE1lbW9yeVF0LmNwcAppbmRleCA5MWFmNTMzODcy ZGViZDQzMjk4ZTFjOWZkYmVjMjU4ZDU5MGNjZjc1Li44ZDVkNzBmYzIzOGQ2ODZmNTkzYjNkOTcz ZjllZmJlOGUxMTY2NDllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9T aGFyZWRNZW1vcnlRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vcXQvU2hhcmVk TWVtb3J5UXQuY3BwCkBAIC0xMDEsNyArMTAxLDcgQEAgdm9pZCBTaGFyZWRNZW1vcnk6OkhhbmRs ZTo6YWRvcHRGcm9tQXR0YWNobWVudChpbnQgZmlsZURlc2NyaXB0b3IsIHNpemVfdCBzaXplKQog CiBQYXNzUmVmUHRyPFNoYXJlZE1lbW9yeT4gU2hhcmVkTWVtb3J5OjpjcmVhdGUoc2l6ZV90IHNp emUpCiB7Ci0gICAgUVN0cmluZyB0ZW1wTmFtZSA9IFFEaXI6OnRlbXAoKS5maWxlUGF0aCgicXdr c2htLlhYWFhYWCIpOworICAgIFFTdHJpbmcgdGVtcE5hbWUgPSBRRGlyOjp0ZW1wKCkuZmlsZVBh dGgoUUxhdGluMVN0cmluZygicXdrc2htLlhYWFhYWCIpKTsKICAgICBRQnl0ZUFycmF5IHRlbXBO YW1lQ1NUUiA9IHRlbXBOYW1lLnRvTG9jYWw4Qml0KCk7CiAgICAgY2hhciogdGVtcE5hbWVDID0g dGVtcE5hbWVDU1RSLmRhdGEoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVk L1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luTW9kdWxlWDExLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpbk1vZHVs ZVgxMS5jcHAKaW5kZXggYjVlM2FhZGI1NTUxM2E0ZThjMTFmMDU5NTk4ZmZlNWIyMWI0ZWMzMC4u NzZlY2RhNzkxOTAwZTk1ZmVmNDA5NTk2NjBjNGQ1Zjk2Mjg3YWE0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luTW9k dWxlWDExLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS94 MTEvTmV0c2NhcGVQbHVnaW5Nb2R1bGVYMTEuY3BwCkBAIC00MCw3ICs0MCw3IEBAIG5hbWVzcGFj ZSBXZWJLaXQgewogI2lmIFBMQVRGT1JNKFFUKQogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUdUSygp CiB7Ci0gICAgUUxpYnJhcnkgbGlicmFyeSgibGliZ3RrLXgxMS0yLjAuc28uMCIpOworICAgIFFM aWJyYXJ5IGxpYnJhcnkoUUxhdGluMVN0cmluZygibGliZ3RrLXgxMS0yLjAuc28uMCIpKTsKICAg ICBpZiAobGlicmFyeS5sb2FkKCkpIHsKICAgICAgICAgdHlwZWRlZiB2b2lkICooKmd0a19pbml0 X2NoZWNrX3B0cikoaW50KiwgY2hhcioqKik7CiAgICAgICAgIGd0a19pbml0X2NoZWNrX3B0ciBn dGtJbml0Q2hlY2sgPSByZWludGVycHJldF9jYXN0PGd0a19pbml0X2NoZWNrX3B0cj4obGlicmFy eS5yZXNvbHZlKCJndGtfaW5pdF9jaGVjayIpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcWdyYXBoaWNzd2t2aWV3L3RzdF9xZ3JhcGhpY3N3a3Zp ZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xZ3JhcGhpY3N3 a3ZpZXcvdHN0X3FncmFwaGljc3drdmlldy5jcHAKaW5kZXggNjU1Y2FkYzYxMjY4NTY0ZmE5ZTM5 MzdjM2MxYTg0MDc3N2ZkZDNkZi4uOGNiNzI2MzgxY2IxODdlZDkxN2Y5ZDc0YjYyZGU3ZGQ2NTFj OWMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9x Z3JhcGhpY3N3a3ZpZXcvdHN0X3FncmFwaGljc3drdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xZ3JhcGhpY3N3a3ZpZXcvdHN0X3FncmFwaGljc3dr dmlldy5jcHAKQEAgLTg0LDcgKzg0LDcgQEAgdm9pZCB0c3RfUUdyYXBoaWNzV0tWaWV3Ojpsb2Fk RW1wdHlQYWdlKCkKIHsKICAgICBtX3ZpZXctPnNob3coKTsKIAotICAgIG1fdmlldy0+bV93ZWJW aWV3LT4gbG9hZChRVXJsOjpmcm9tTG9jYWxGaWxlKFRFU1RTX1NPVVJDRV9ESVIgIi9odG1sL2Jh c2ljX3BhZ2UuaHRtbCIpKTsKKyAgICBtX3ZpZXctPm1fd2ViVmlldy0+IGxvYWQoUVVybDo6ZnJv bUxvY2FsRmlsZShRTGF0aW4xU3RyaW5nKFRFU1RTX1NPVVJDRV9ESVIgIi9odG1sL2Jhc2ljX3Bh Z2UuaHRtbCIpKSk7CiAgICAgUVZFUklGWSh3YWl0Rm9yU2lnbmFsKG1fdmlldy0+bV93ZWJWaWV3 LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkpOwogfQogCkBAIC05NSw3ICs5NSw3IEBAIHZv aWQgdHN0X1FHcmFwaGljc1dLVmlldzo6bG9hZEVtcHR5VXJsKCkKICAgICBtX3ZpZXctPm1fd2Vi Vmlldy0+bG9hZChRVXJsKCkpOwogICAgIFFWRVJJRlkoIXdhaXRGb3JTaWduYWwobV92aWV3LT5t X3dlYlZpZXctPnBhZ2UoKSwgU0lHTkFMKGVuZ2luZUNvbm5lY3Rpb25DaGFuZ2VkKGJvb2wpKSwg NTApKTsKIAotICAgIG1fdmlldy0+bV93ZWJWaWV3LT5sb2FkKFFVcmwoIiIpKTsKKyAgICBtX3Zp ZXctPm1fd2ViVmlldy0+bG9hZChRVXJsKFFMYXRpbjFTdHJpbmcoIiIpKSk7CiAgICAgUVZFUklG WSghd2FpdEZvclNpZ25hbChtX3ZpZXctPm1fd2ViVmlldy0+cGFnZSgpLCBTSUdOQUwoZW5naW5l Q29ubmVjdGlvbkNoYW5nZWQoYm9vbCkpLCA1MCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3F3a3BhZ2UvdHN0X3F3a3BhZ2UuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xd2twYWdlL3RzdF9xd2twYWdl LmNwcAppbmRleCAzYjY0ZDA1NGVlMmZmYjkzZWJmMTM0MGY3MDdjNjRkYjVmYzdmYzc3Li4zOWZj YWMyOGI2Mjk5NWU4NjQ5MmIyMjhiOGQzMjJlYjkzZTYyOWNkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3F3a3BhZ2UvdHN0X3F3a3BhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcXdrcGFnZS90c3RfcXdr cGFnZS5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgdm9pZCB0c3RfUVdLUGFnZTo6Y2xlYW51cCgpCiB2 b2lkIHRzdF9RV0tQYWdlOjpsb2FkRW1wdHlVcmwoKQogewogICAgIG1fcGFnZS0+bG9hZChRVXJs KCkpOwotICAgIG1fcGFnZS0+bG9hZChRVXJsKCIiKSk7CisgICAgbV9wYWdlLT5sb2FkKFFVcmwo UUxhdGluMVN0cmluZygiIikpKTsKIH0KIAogUVRFU1RfTUFJTih0c3RfUVdLUGFnZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNo ZXJRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xh dW5jaGVyUXQuY3BwCmluZGV4IGRiZTNmMTA2ZDE4ZTllZDYzOGQ4YmJkM2ZlOGU3YWE1YjNkZDAx NzAuLmNhZTViZGZmNjc1MzQzYTdkN2IwZDAwYThlMGUxOGI5MjE3OWE1Y2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVu Y2hlclF0LmNwcApAQCAtODUsMTIgKzg1LDEyIEBAIHZvaWQgUXRXZWJQcm9jZXNzOjpzZXR1cENo aWxkUHJvY2VzcygpCiAKIHZvaWQgUHJvY2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKCkKIHsK LSAgICBRU3RyaW5nIGFwcGxpY2F0aW9uUGF0aCA9ICIlMSAlMiI7CisgICAgUVN0cmluZyBhcHBs aWNhdGlvblBhdGggPSBRTGF0aW4xU3RyaW5nKCIlMSAlMiIpOwogCi0gICAgaWYgKFFGaWxlOjpl eGlzdHMoUUNvcmVBcHBsaWNhdGlvbjo6YXBwbGljYXRpb25EaXJQYXRoKCkgKyAiL1F0V2ViUHJv Y2VzcyIpKSB7Ci0gICAgICAgIGFwcGxpY2F0aW9uUGF0aCA9IGFwcGxpY2F0aW9uUGF0aC5hcmco UUNvcmVBcHBsaWNhdGlvbjo6YXBwbGljYXRpb25EaXJQYXRoKCkgKyAiL1F0V2ViUHJvY2VzcyIp OworICAgIGlmIChRRmlsZTo6ZXhpc3RzKFFDb3JlQXBwbGljYXRpb246OmFwcGxpY2F0aW9uRGly UGF0aCgpICsgUUxhdGluMVN0cmluZygiL1F0V2ViUHJvY2VzcyIpKSkgeworICAgICAgICBhcHBs aWNhdGlvblBhdGggPSBhcHBsaWNhdGlvblBhdGguYXJnKFFDb3JlQXBwbGljYXRpb246OmFwcGxp Y2F0aW9uRGlyUGF0aCgpICsgUUxhdGluMVN0cmluZygiL1F0V2ViUHJvY2VzcyIpKTsKICAgICB9 IGVsc2UgewotICAgICAgICBhcHBsaWNhdGlvblBhdGggPSBhcHBsaWNhdGlvblBhdGguYXJnKCJR dFdlYlByb2Nlc3MiKTsKKyAgICAgICAgYXBwbGljYXRpb25QYXRoID0gYXBwbGljYXRpb25QYXRo LmFyZyhRTGF0aW4xU3RyaW5nKCJRdFdlYlByb2Nlc3MiKSk7CiAgICAgfQogCiAgICAgaW50IHNv Y2tldHNbMl07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwCmluZGV4IDhj MWZlZjZkMmY0ZGNlMmRiZTlmMzdhYmU4NjhiY2ZlNWI1MGQwOGYuLjI3ZTY5NGJjYmUwY2UwNjVj MzcyYTgxNDQyMmUwOGVjOTFhMDcxOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVn aW5YMTEuY3BwCkBAIC01MSw3ICs1MSw3IEBAIHN0YXRpYyBEaXNwbGF5ICpnZXRQbHVnaW5EaXNw bGF5KCkKICAgICAvLyBUaGUgY29kZSBiZWxvdyBoYXMgdGhlIHNhbWUgZWZmZWN0IGFzIHRoaXMg b25lOgogICAgIC8vIERpc3BsYXkgKmdka0Rpc3BsYXkgPSBnZGtfeDExX2Rpc3BsYXlfZ2V0X3hk aXNwbGF5KGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCkpOwogCi0gICAgUUxpYnJhcnkgbGlicmFy eSgibGliZ2RrLXgxMS0yLjAiLCAwKTsKKyAgICBRTGlicmFyeSBsaWJyYXJ5KFFMYXRpbjFTdHJp bmcoImxpYmdkay14MTEtMi4wIiksIDApOwogICAgIGlmICghbGlicmFyeS5sb2FkKCkpCiAgICAg ICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3F0 L1dlYlByb2Nlc3NNYWluUXQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9xdC9XZWJQ cm9jZXNzTWFpblF0LmNwcAppbmRleCBmYWRmNTQ1NmZlYzhjOTE0OGViZGZkZjliYzIwNTJmYTdl MTJjNWJjLi42ZmYxMGJhOTFhNmVlMDkzM2UwNWNkNTY0ZGZkOGEzZDViZDRkYzQxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3F0L1dlYlByb2Nlc3NNYWluUXQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvcXQvV2ViUHJvY2Vzc01haW5RdC5jcHAKQEAg LTgyLDcgKzgyLDcgQEAgYm9vbCBFbnZIdHRwUHJveHlGYWN0b3J5Ojppbml0aWFsaXplRnJvbUVu dmlyb25tZW50KCkKIHsKICAgICBib29sIHdhc1NldEJ5RW52aXJvbm1lbnQgPSBmYWxzZTsKIAot ICAgIFFVcmwgcHJveHlVcmwgPSBRVXJsOjpmcm9tVXNlcklucHV0KHFnZXRlbnYoImh0dHBfcHJv eHkiKSk7CisgICAgUVVybCBwcm94eVVybCA9IFFVcmw6OmZyb21Vc2VySW5wdXQoUVN0cmluZzo6 ZnJvbUxvY2FsOEJpdChxZ2V0ZW52KCJodHRwX3Byb3h5IikpKTsKICAgICBpZiAocHJveHlVcmwu aXNWYWxpZCgpICYmICFwcm94eVVybC5ob3N0KCkuaXNFbXB0eSgpKSB7CiAgICAgICAgIGludCBw cm94eVBvcnQgPSAocHJveHlVcmwucG9ydCgpID4gMCkgPyBwcm94eVVybC5wb3J0KCkgOiA4MDgw OwogICAgICAgICBtX2h0dHBQcm94eSA8PCBRTmV0d29ya1Byb3h5KFFOZXR3b3JrUHJveHk6Okh0 dHBQcm94eSwgcHJveHlVcmwuaG9zdCgpLCBwcm94eVBvcnQpOwpAQCAtOTAsNyArOTAsNyBAQCBi b29sIEVudkh0dHBQcm94eUZhY3Rvcnk6OmluaXRpYWxpemVGcm9tRW52aXJvbm1lbnQoKQogICAg IH0gZWxzZQogICAgICAgICBtX2h0dHBQcm94eSA8PCBRTmV0d29ya1Byb3h5OjpOb1Byb3h5Owog Ci0gICAgcHJveHlVcmwgPSBRVXJsOjpmcm9tVXNlcklucHV0KHFnZXRlbnYoImh0dHBzX3Byb3h5 IikpOworICAgIHByb3h5VXJsID0gUVVybDo6ZnJvbVVzZXJJbnB1dChRU3RyaW5nOjpmcm9tTG9j YWw4Qml0KHFnZXRlbnYoImh0dHBzX3Byb3h5IikpKTsKICAgICBpZiAocHJveHlVcmwuaXNWYWxp ZCgpICYmICFwcm94eVVybC5ob3N0KCkuaXNFbXB0eSgpKSB7CiAgICAgICAgIGludCBwcm94eVBv cnQgPSAocHJveHlVcmwucG9ydCgpID4gMCkgPyBwcm94eVVybC5wb3J0KCkgOiA4MDgwOwogICAg ICAgICBtX2h0dHBzUHJveHkgPDwgUU5ldHdvcmtQcm94eShRTmV0d29ya1Byb3h5OjpIdHRwUHJv eHksIHByb3h5VXJsLmhvc3QoKSwgcHJveHlQb3J0KTsKQEAgLTEzMiw3ICsxMzIsNyBAQCBzdGF0 aWMgdm9pZCBpbml0aWFsaXplUHJveHkoKQogCiBRX0RFQ0xfRVhQT1JUIGludCBXZWJQcm9jZXNz TWFpblF0KGludCBhcmdjLCBjaGFyKiogYXJndikKIHsKLSAgICBRQXBwbGljYXRpb246OnNldEdy YXBoaWNzU3lzdGVtKCJyYXN0ZXIiKTsKKyAgICBRQXBwbGljYXRpb246OnNldEdyYXBoaWNzU3lz dGVtKFFMYXRpbjFTdHJpbmcoInJhc3RlciIpKTsKICAgICBRQXBwbGljYXRpb24qIGFwcCA9IG5l dyBRQXBwbGljYXRpb24oYXJnYywgYXJndik7CiAjaWZuZGVmIE5ERUJVRwogICAgIGlmICghcWdl dGVudigiV0VCS0lUMl9QQVVTRV9XRUJfUFJPQ0VTU19PTl9MQVVOQ0giKS5pc0VtcHR5KCkpIHsK 86957 2011-03-25 10:38:28 -0700 2011-03-27 00:19:15 -0700 Patch bug-57087-20110325185024.patch text/plain 15773 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogODE5NjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3F3ZWJraXR2ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJraXR2ZXJz aW9uLmNwcAppbmRleCAxODE5MTNiYTMyMGM1NDgwYzc2MTIxNmU4N2QwZWIyOWE2MTk3Njk2Li4x MTQzZjk5ZTA1YjI5ZmJkNTc3NjQ3ODRmNjFlNWM2OTQzMTM0ZGNiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xd2Via2l0dmVyc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9x dC9BcGkvcXdlYmtpdHZlcnNpb24uY3BwCkBAIC00MCw3ICs0MCw3IEBACiAqLwogUVN0cmluZyBx V2ViS2l0VmVyc2lvbigpCiB7Ci0gICAgcmV0dXJuIFFTdHJpbmcoIiUxLiUyIikuYXJnKFdFQktJ VF9NQUpPUl9WRVJTSU9OKS5hcmcoV0VCS0lUX01JTk9SX1ZFUlNJT04pOworICAgIHJldHVybiBR U3RyaW5nOjpmcm9tTGF0aW4xKCIlMS4lMiIpLmFyZyhXRUJLSVRfTUFKT1JfVkVSU0lPTikuYXJn KFdFQktJVF9NSU5PUl9WRVJTSU9OKTsKIH0KIAogLyohCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5j cHAKaW5kZXggNWRhYmI2NzEyN2IwMjFhMjQ2N2Q0NDk4NzVmZTg0MGY3OWI5ZjVkNy4uYTJmZTdk M2RkOGY3NmI1OWE1MTc4MDA4OTIzMDU1MjM5OGQyZjcxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmNwcApAQCAtMTE2OCw3ICsxMTY4LDcgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmR5bmFt aWNQcm9wZXJ0eUNoYW5nZUV2ZW50KFFEeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCogZXYKIAog ICAgICAgICBRU3RyaW5nIHAgPSBxLT5wcm9wZXJ0eSgiX3FfUmVwYWludFRocm90dGxpbmdQcmVz ZXQiKS50b1N0cmluZygpOwogICAgICAgICBmb3IoaW50IGkgPSAwOyBpIDwgc2l6ZW9mKHByZXNl dHMpIC8gc2l6ZW9mKHByZXNldHNbMF0pOyBpKyspIHsKLSAgICAgICAgICAgIGlmKHAgPT0gcHJl c2V0c1tpXS5uYW1lKSB7CisgICAgICAgICAgICBpZiAocCA9PSBRTGF0aW4xU3RyaW5nKHByZXNl dHNbaV0ubmFtZSkpIHsKICAgICAgICAgICAgICAgICBGcmFtZVZpZXc6OnNldFJlcGFpbnRUaHJv dHRsaW5nRGVmZXJyZWRSZXBhaW50RGVsYXkoCiAgICAgICAgICAgICAgICAgICAgICAgICBwcmVz ZXRzW2ldLmRlZmVycmVkUmVwYWludERlbGF5KTsKICAgICAgICAgICAgICAgICBGcmFtZVZpZXc6 OnNldFJlcGFpbnRUaHJvdHRsaW5nbkluaXRpYWxEZWZlcnJlZFJlcGFpbnREZWxheUR1cmluZ0xv YWRpbmcoCkBAIC0yMDczLDcgKzIwNzMsNyBAQCB2b2lkIFFXZWJQYWdlOjpqYXZhU2NyaXB0Q29u c29sZU1lc3NhZ2UoY29uc3QgUVN0cmluZyYgbWVzc2FnZSwgaW50IGxpbmVOdW1iZXIsCiAgICAg Ly8gQ2F0Y2ggcGx1Z2luIGxvZ0Rlc3Ryb3kgbWVzc2FnZSBmb3IgTGF5b3V0VGVzdHMvcGx1Z2lu cy9vcGVuLWFuZC1jbG9zZS13aW5kb3ctd2l0aC1wbHVnaW4uaHRtbAogICAgIC8vIEF0IHRoaXMg cG9pbnQgRFJUJ3MgV2ViUGFnZSBoYXMgYWxyZWFkeSBiZWVuIGRlc3Ryb3llZAogICAgIGlmIChR V2ViUGFnZVByaXZhdGU6OmRydFJ1bikgewotICAgICAgICBpZiAobWVzc2FnZSA9PSAiUExVR0lO OiBOUFBfRGVzdHJveSIpCisgICAgICAgIGlmIChtZXNzYWdlID09IFFMYXRpbjFTdHJpbmcoIlBM VUdJTjogTlBQX0Rlc3Ryb3kiKSkKICAgICAgICAgICAgIGZwcmludGYgKHN0ZG91dCwgIkNPTlNP TEUgTUVTU0FHRTogbGluZSAlZDogJXNcbiIsIGxpbmVOdW1iZXIsIG1lc3NhZ2UudG9VdGY4KCku Y29uc3REYXRhKCkpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNjNkZjUwZGNmZGZmNDlk MmRkMmI0ZDBiZjEwODk0ZWViMDAyNWU5OC4uMGZhMzliOThhNWMwZjE2Njk4MWJiNmRkMmNiNDFh Y2Y4NzYxN2E2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMS0wMy0yNSAg QmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUXRXZWJLaXQgd2ls bCBub3QgY29tcGlsZSB3aXRoIFFUX0FTQ0lJX0NBU1RfV0FSTklOR1MgZW5hYmxlZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwODcKKworICAgICAg ICBVc2UgZXhwbGljaXQgY29udmVyc2lvbiBmb3Igc3RyaW5nIHRvIGF2b2lkIGRlcGVuZGluZyBv biB0aGUgZGVmYXVsdCBjb2RlYworICAgICAgICBpbnN0YWxsZWQgYnkgdGhlIHVzZXIgY29kZS4K KworICAgICAgICAqIEFwaS9xd2Via2l0dmVyc2lvbi5jcHA6CisgICAgICAgIChxV2ViS2l0VmVy c2lvbik6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlUHJp dmF0ZTo6ZHluYW1pY1Byb3BlcnR5Q2hhbmdlRXZlbnQpOgorICAgICAgICAoUVdlYlBhZ2U6Omph dmFTY3JpcHRDb25zb2xlTWVzc2FnZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJl bmRlclRyZWVTdXBwb3J0UXQuY3BwOgorICAgICAgICAoY29udmVydFRvUHJvcGVydHlOYW1lKToK KyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OjpzZXRFZGl0aW5nQmVoYXZpb3IpOgor ICAgICAgICAoRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OnBsYWluVGV4dCk6CisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwOgorICAgICAgICAoZHVtcFJhbmdlKToK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAgICAg ICAgKGRydERlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KToKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbik6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6Om9wZW5JbnNwZWN0b3JGcm9u dGVuZCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6cGFyc2VXZWJTb2NrZXRDaGFsbGVuZ2VOdW1iZXIpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yU2VydmVyUmVxdWVzdEhhbmRsZXJRdDo6dGNwUmVhZHlSZWFk KToKKwogMjAxMS0wMy0yNSAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuY3BwIGIvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAKaW5kZXggM2U1 NGQ1ZTZkZGYwMWI1ODRlMTM0NjVkYmVjYzhiZTM1ZTNhYjY5Yy4uZjQ0YTgyZDliYWExYmFiNTg2 OGNlY2M2NWU2NjJlNjg3ZDFhYjRlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAKQEAgLTUzMSw3 ICs1MzEsNyBAQCBRU3RyaW5nIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OjptYXJrZXJUZXh0Rm9y TGlzdEl0ZW0oY29uc3QgUVdlYkVsZW1lbnQmIGxpc3RJdAogCiBzdGF0aWMgUVN0cmluZyBjb252 ZXJ0VG9Qcm9wZXJ0eU5hbWUoY29uc3QgUVN0cmluZyYgbmFtZSkKIHsKLSAgICBRU3RyaW5nTGlz dCBwYXJ0cyA9IG5hbWUuc3BsaXQoJy0nKTsKKyAgICBRU3RyaW5nTGlzdCBwYXJ0cyA9IG5hbWUu c3BsaXQoUUxhdGluMUNoYXIoJy0nKSk7CiAgICAgUVN0cmluZyBjYW1lbENhc2VOYW1lOwogICAg IGZvciAoaW50IGogPSAwOyBqIDwgcGFydHMuY291bnQoKTsgKytqKSB7CiAgICAgICAgIFFTdHJp bmcgcGFydCA9IHBhcnRzLmF0KGopOwpAQCAtNjI2LDExICs2MjYsMTEgQEAgdm9pZCBEdW1wUmVu ZGVyVHJlZVN1cHBvcnRRdDo6c2V0RWRpdGluZ0JlaGF2aW9yKFFXZWJQYWdlKiBwYWdlLCBjb25z dCBRU3RyaW5nJgogewogICAgIFdlYkNvcmU6OkVkaXRpbmdCZWhhdmlvclR5cGUgY29yZUVkaXRp bmdCZWhhdmlvcjsKIAotICAgIGlmIChlZGl0aW5nQmVoYXZpb3IgPT0gIndpbiIpCisgICAgaWYg KGVkaXRpbmdCZWhhdmlvciA9PSBRTGF0aW4xU3RyaW5nKCJ3aW4iKSkKICAgICAgICAgY29yZUVk aXRpbmdCZWhhdmlvciA9IEVkaXRpbmdXaW5kb3dzQmVoYXZpb3I7Ci0gICAgZWxzZSBpZiAoZWRp dGluZ0JlaGF2aW9yID09ICJtYWMiKQorICAgIGVsc2UgaWYgKGVkaXRpbmdCZWhhdmlvciA9PSBR TGF0aW4xU3RyaW5nKCJtYWMiKSkKICAgICAgICAgY29yZUVkaXRpbmdCZWhhdmlvciA9IEVkaXRp bmdNYWNCZWhhdmlvcjsKLSAgICBlbHNlIGlmIChlZGl0aW5nQmVoYXZpb3IgPT0gInVuaXgiKQor ICAgIGVsc2UgaWYgKGVkaXRpbmdCZWhhdmlvciA9PSBRTGF0aW4xU3RyaW5nKCJ1bml4IikpCiAg ICAgICAgIGNvcmVFZGl0aW5nQmVoYXZpb3IgPSBFZGl0aW5nVW5peEJlaGF2aW9yOwogICAgIGVs c2UgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAgLTkyMywxMCArOTIzLDEwIEBA IHZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OnNpbXVsYXRlRGVza3RvcE5vdGlmaWNhdGlv bkNsaWNrKGNvbnN0IFFTdHJpbmcmIHRpCiBRU3RyaW5nIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0 OjpwbGFpblRleHQoY29uc3QgUVZhcmlhbnQmIHJhbmdlKQogewogICAgIFFNYXA8UVN0cmluZywg UVZhcmlhbnQ+IG1hcCA9IHJhbmdlLnRvTWFwKCk7Ci0gICAgUVZhcmlhbnQgc3RhcnRDb250YWlu ZXIgID0gbWFwLnZhbHVlKCJzdGFydENvbnRhaW5lciIpOworICAgIFFWYXJpYW50IHN0YXJ0Q29u dGFpbmVyICA9IG1hcC52YWx1ZShRTGF0aW4xU3RyaW5nKCJzdGFydENvbnRhaW5lciIpKTsKICAg ICBtYXAgPSBzdGFydENvbnRhaW5lci50b01hcCgpOwogCi0gICAgcmV0dXJuIG1hcC52YWx1ZSgi aW5uZXJUZXh0IikudG9TdHJpbmcoKTsKKyAgICByZXR1cm4gbWFwLnZhbHVlKFFMYXRpbjFTdHJp bmcoImlubmVyVGV4dCIpKS50b1N0cmluZygpOwogfQogCiBRVmFyaWFudExpc3QgRHVtcFJlbmRl clRyZWVTdXBwb3J0UXQ6Om5vZGVzRnJvbVJlY3QoY29uc3QgUVdlYkVsZW1lbnQmIGRvY3VtZW50 LCBpbnQgeCwgaW50IHksIHVuc2lnbmVkIHRvcCwgdW5zaWduZWQgcmlnaHQsIHVuc2lnbmVkIGJv dHRvbSwgdW5zaWduZWQgbGVmdCwgYm9vbCBpZ25vcmVDbGlwcGluZykKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwIGIvU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAKaW5kZXggZWFkYTg0 ZDMyNzRhOWU4YzA0ODZlZTQ2ZjYxMTlhY2YyZDg2ZTRjZS4uMmRmNmY5YTcxNzcyNmE2Y2Y1MWIw ODg4NWUxNzUxYzIyYzU1MjVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAKQEAgLTc2LDkgKzc2LDkgQEAgc3RhdGljIFFTdHJp bmcgZHVtcFJhbmdlKFdlYkNvcmU6OlJhbmdlICpyYW5nZSkKICAgICAgICAgcmV0dXJuIFFMYXRp bjFTdHJpbmcoIihudWxsKSIpOwogICAgIFdlYkNvcmU6OkV4Y2VwdGlvbkNvZGUgY29kZTsKIAot ICAgIFFTdHJpbmcgc3RyID0gUVN0cmluZygicmFuZ2UgZnJvbSAlMSBvZiAlMiB0byAlMyBvZiAl NCIpCi0gICAgICAgIC5hcmcocmFuZ2UtPnN0YXJ0T2Zmc2V0KGNvZGUpKS5hcmcoZHVtcFBhdGgo cmFuZ2UtPnN0YXJ0Q29udGFpbmVyKGNvZGUpKSkKLSAgICAgICAgLmFyZyhyYW5nZS0+ZW5kT2Zm c2V0KGNvZGUpKS5hcmcoZHVtcFBhdGgocmFuZ2UtPmVuZENvbnRhaW5lcihjb2RlKSkpOworICAg IFFTdHJpbmcgc3RyID0gUVN0cmluZzo6ZnJvbUxhdGluMSgicmFuZ2UgZnJvbSAlMSBvZiAlMiB0 byAlMyBvZiAlNCIpCisgICAgICAgICAgICAuYXJnKHJhbmdlLT5zdGFydE9mZnNldChjb2RlKSku YXJnKGR1bXBQYXRoKHJhbmdlLT5zdGFydENvbnRhaW5lcihjb2RlKSkpCisgICAgICAgICAgICAu YXJnKHJhbmdlLT5lbmRPZmZzZXQoY29kZSkpLmFyZyhkdW1wUGF0aChyYW5nZS0+ZW5kQ29udGFp bmVyKGNvZGUpKSk7CiAKICAgICByZXR1cm4gc3RyOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggYjk0 MjM5MDNmZTY5ZTQyZGE4ZDMxZWVlMWE5NTU5ZjZkZTZjMWUxZi4uYzY0OTJlNjRhY2I1ODY5M2Nh NGFmZDY1MzNjY2E3MWIzMjEwNjIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0xMTksNyArMTE5LDcg QEAgc3RhdGljIFFTdHJpbmcgZHJ0RGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQoY29u c3QgV2ViQ29yZTo6S1VSTCYgX3VybCkKICAgICBpZiAoX3VybC5pc0VtcHR5KCkgfHwgIV91cmwu aXNMb2NhbEZpbGUoKSkKICAgICAgICAgcmV0dXJuIF91cmwuc3RyaW5nKCk7CiAgICAgLy8gUmVt b3ZlIHRoZSBsZWFkaW5nIHBhdGggZnJvbSBmaWxlIHVybHMKLSAgICByZXR1cm4gUVN0cmluZyhf dXJsLnN0cmluZygpKS5yZXBsYWNlKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmR1bXBS ZXNvdXJjZUxvYWRDYWxsYmFja3NQYXRoLCAiIikubWlkKDEpOworICAgIHJldHVybiBRU3RyaW5n KF91cmwuc3RyaW5nKCkpLnJlbW92ZShXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpkdW1w UmVzb3VyY2VMb2FkQ2FsbGJhY2tzUGF0aCkubWlkKDEpOwogfQogCiBzdGF0aWMgUVN0cmluZyBk cnREZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZUVycm9yJiBlcnJvcikKQEAgLTE0NywxNyArMTQ3LDE3IEBAIHN0YXRpYyBRU3RyaW5nIGRydERl c2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IFJlZlB0cjxXZWJDb3JlOjpOb2Rl PiBuCiB7CiAgICAgUVN0cmluZyByZXN1bHQ7CiAgICAgaWYgKGV4Y2VwdGlvbikgewotICAgICAg ICByZXN1bHQuYXBwZW5kKCJFUlJPUiIpOworICAgICAgICByZXN1bHQuYXBwZW5kKFFMYXRpbjFT dHJpbmcoIkVSUk9SIikpOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KICAgICBpZiAo IW5vZGUpIHsKLSAgICAgICAgcmVzdWx0LmFwcGVuZCgiTlVMTCIpOworICAgICAgICByZXN1bHQu YXBwZW5kKFFMYXRpbjFTdHJpbmcoIk5VTEwiKSk7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAg ICAgfQogICAgIHJlc3VsdC5hcHBlbmQobm9kZS0+bm9kZU5hbWUoKSk7CiAgICAgUmVmUHRyPFdl YkNvcmU6Ok5vZGU+IHBhcmVudCA9IG5vZGUtPnBhcmVudE5vZGUoKTsKICAgICBpZiAocGFyZW50 KSB7Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQoIiA+ICIpOworICAgICAgICByZXN1bHQuYXBwZW5k KFFMYXRpbjFTdHJpbmcoIiA+ICIpKTsKICAgICAgICAgcmVzdWx0LmFwcGVuZChkcnREZXNjcmlw dGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChwYXJlbnQsIDApKTsKICAgICB9CiAgICAgcmV0dXJu IHJlc3VsdDsKQEAgLTEyMTIsNyArMTIxMiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6 ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKEZyYW1lUG9saWN5RnVuCiAK ICAgICAgICAgcHJpbnRmKCJQb2xpY3kgZGVsZWdhdGU6IGF0dGVtcHQgdG8gbG9hZCAlcyB3aXRo IG5hdmlnYXRpb24gdHlwZSAnJXMnJXNcbiIsCiAgICAgICAgICAgICAgICBxUHJpbnRhYmxlKGRy dERlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KHJlcXVlc3QudXJsKCkpKSwgbmF2aWdh dGlvblR5cGVUb1N0cmluZyhhY3Rpb24udHlwZSgpKSwKLSAgICAgICAgICAgICAgIChub2RlKSA/ IHFQcmludGFibGUoUVN0cmluZygiIG9yaWdpbmF0aW5nIGZyb20gIiArIGRydERlc2NyaXB0aW9u U3VpdGFibGVGb3JUZXN0UmVzdWx0KG5vZGUsIDApKSkgOiAiIik7CisgICAgICAgICAgICAgICAo bm9kZSkgPyBxUHJpbnRhYmxlKFFTdHJpbmc6OmZyb21MYXRpbjEoIiBvcmlnaW5hdGluZyBmcm9t ICIpICsgZHJ0RGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQobm9kZSwgMCkpIDogIiIp OwogCiAgICAgICAgIGlmIChwb2xpY3lEZWxlZ2F0ZVBlcm1pc3NpdmUpCiAgICAgICAgICAgICBy ZXN1bHQgPSBQb2xpY3lVc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwCmluZGV4IDI0M2MwMDRhZWY4MGZhZDQzODc4OTAz NmMxMzI2OGQwNjZiOTE2ZWUuLjZiNTU3ZGI0NTM1ZTEyZDI0MGVhODY1ZGNlOWMwYmFlYjMyMGI4 MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9y Q2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVj dG9yQ2xpZW50UXQuY3BwCkBAIC0xNDAsNyArMTQwLDcgQEAgcHVibGljOgogICAgICAgICBRVmFy aWFudCB2YWx1ZVRvU3RvcmUgPSBzZXR0aW5nVG9WYXJpYW50KHZhbHVlKTsKICAgICAgICAgUVN0 cmluZyBzZXR0aW5nS2V5KHNldHRpbmdTdG9yYWdlUHJlZml4ICsgUVN0cmluZyhuYW1lKSk7CiAg ICAgICAgIHFzZXR0aW5ncy5zZXRWYWx1ZShzZXR0aW5nS2V5LCB2YWx1ZVRvU3RvcmUpOwotICAg ICAgICBxc2V0dGluZ3Muc2V0VmFsdWUoc2V0dGluZ0tleSArIHNldHRpbmdTdG9yYWdlVHlwZVN1 ZmZpeCwgUVZhcmlhbnQ6OnR5cGVUb05hbWUodmFsdWVUb1N0b3JlLnR5cGUoKSkpOworICAgICAg ICBxc2V0dGluZ3Muc2V0VmFsdWUoc2V0dGluZ0tleSArIHNldHRpbmdTdG9yYWdlVHlwZVN1ZmZp eCwgUUxhdGluMVN0cmluZyhRVmFyaWFudDo6dHlwZVRvTmFtZSh2YWx1ZVRvU3RvcmUudHlwZSgp KSkpOwogI2VuZGlmIC8vIFFUX05PX1NFVFRJTkdTCiAgICAgfQogCkBAIC0yMjAsNyArMjIwLDcg QEAgdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6b3Blbkluc3BlY3RvckZyb250ZW5kKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXIqIGluc3AKICAgICBpbnNwZWN0b3JVcmwgPSBpbnNwZWN0b3It PnByb3BlcnR5KCJfcV9pbnNwZWN0b3JVcmwiKS50b1VybCgpOwogI2VuZGlmCiAgICAgaWYgKCFp bnNwZWN0b3JVcmwuaXNWYWxpZCgpKQotICAgICAgICBpbnNwZWN0b3JVcmwgPSBRVXJsKCJxcmM6 L3dlYmtpdC9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwiKTsKKyAgICAgICAgaW5zcGVjdG9yVXJs ID0gUVVybChRTGF0aW4xU3RyaW5nKCJxcmM6L3dlYmtpdC9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0 bWwiKSk7CiAKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAgIFFWYXJpYW50IGluc3BlY3Rv ckphdmFTY3JpcHRXaW5kb3dPYmplY3RzID0gaW5zcGVjdG9yLT5wcm9wZXJ0eSgiX3FfaW5zcGVj dG9ySmF2YVNjcmlwdFdpbmRvd09iamVjdHMiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yU2VydmVyUXQuY3BwIGIvU291cmNlL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAKaW5kZXggZjgzZGViMmI5NDEw ODU0ZWZhNzJjMzhiNmMyMmE1ODg1YjdjZjJlMC4uOTJiN2Q1Y2U1OTQwNTFlMWE3MzRiZjJlMTYw NzEzZWNhZGEwMjkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9JbnNwZWN0b3JTZXJ2ZXJRdC5jcHAKQEAgLTczLDExICs3MywxMCBAQCBzdGF0aWMgcXVp bnQzMiBwYXJzZVdlYlNvY2tldENoYWxsZW5nZU51bWJlcihRU3RyaW5nIGZpZWxkKQogICAgIGlu dCBudW1TcGFjZXMgPSAwOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZmllbGQuc2l6ZSgpOyBp KyspIHsKICAgICAgICAgUUNoYXIgYyA9IGZpZWxkW2ldOwotICAgICAgICBpZiAoYyA9PSAoUUNo YXIpJyAnKSB7CisgICAgICAgIGlmIChjID09IFFMYXRpbjFDaGFyKCcgJykpCiAgICAgICAgICAg ICBudW1TcGFjZXMrKzsKLSAgICAgICAgfSBlbHNlIGlmICgoYyA+PSAoUUNoYXIpJzAnKSAmJiAo YyA8PSAoUUNoYXIpJzknKSkgewotICAgICAgICAgICAgblN0cmluZy5hcHBlbmQoKFFDaGFyKWMp OwotICAgICAgICB9CisgICAgICAgIGVsc2UgaWYgKChjID49IFFMYXRpbjFDaGFyKCcwJykpICYm IChjIDw9IFFMYXRpbjFDaGFyKCc5JykpKQorICAgICAgICAgICAgblN0cmluZy5hcHBlbmQoYyk7 CiAgICAgfQogICAgIHF1aW50MzIgbnVtID0gblN0cmluZy50b0xvbmcoKTsKICAgICBxdWludDMy IHJlc3VsdCA9IChudW1TcGFjZXMgPyAobnVtIC8gbnVtU3BhY2VzKSA6IG51bSk7CkBAIC0xOTUs NyArMTk0LDcgQEAgdm9pZCBJbnNwZWN0b3JTZXJ2ZXJSZXF1ZXN0SGFuZGxlclF0Ojp0Y3BSZWFk eVJlYWQoKQogICAgICAgICAgICAgICAgIG1fcGF0aCA9IGhlYWRlci5wYXRoKCk7CiAgICAgICAg ICAgICAgICAgbV9jb250ZW50VHlwZSA9IGhlYWRlci5jb250ZW50VHlwZSgpLnRvTGF0aW4xKCk7 CiAgICAgICAgICAgICAgICAgbV9jb250ZW50TGVuZ3RoID0gaGVhZGVyLmNvbnRlbnRMZW5ndGgo KTsKLSAgICAgICAgICAgICAgICBpZiAoaGVhZGVyLmhhc0tleSgiVXBncmFkZSIpICYmIChoZWFk ZXIudmFsdWUoIlVwZ3JhZGUiKSA9PSBRTGF0aW4xU3RyaW5nKCJXZWJTb2NrZXQiKSkpCisgICAg ICAgICAgICAgICAgaWYgKGhlYWRlci5oYXNLZXkoUUxhdGluMVN0cmluZygiVXBncmFkZSIpKSAm JiAoaGVhZGVyLnZhbHVlKFFMYXRpbjFTdHJpbmcoIlVwZ3JhZGUiKSkgPT0gUUxhdGluMVN0cmlu ZygiV2ViU29ja2V0IikpKQogICAgICAgICAgICAgICAgICAgICBpc1dlYlNvY2tldCA9IHRydWU7 CiAKICAgICAgICAgICAgICAgICBtX2RhdGEuY2xlYXIoKTsKQEAgLTIwNCw5ICsyMDMsOSBAQCB2 b2lkIEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVyUXQ6OnRjcFJlYWR5UmVhZCgpCiAgICAg fQogCiAgICAgaWYgKG1fZW5kT2ZIZWFkZXJzKSB7Ci0gICAgICAgIFFTdHJpbmdMaXN0IHBhdGhB bmRRdWVyeSA9IG1fcGF0aC5zcGxpdCgiPyIpOworICAgICAgICBRU3RyaW5nTGlzdCBwYXRoQW5k UXVlcnkgPSBtX3BhdGguc3BsaXQoUUxhdGluMUNoYXIoJz8nKSk7CiAgICAgICAgIG1fcGF0aCA9 IHBhdGhBbmRRdWVyeVswXTsKLSAgICAgICAgUVN0cmluZ0xpc3Qgd29yZHMgPSBtX3BhdGguc3Bs aXQoUVN0cmluZzo6ZnJvbUxhdGluMSgiLyIpKTsKKyAgICAgICAgUVN0cmluZ0xpc3Qgd29yZHMg PSBtX3BhdGguc3BsaXQoUUxhdGluMUNoYXIoJy8nKSk7CiAKICAgICAgICAgaWYgKGlzV2ViU29j a2V0KSB7CiAgICAgICAgICAgICAvLyBzd2l0Y2ggdG8gd2Vic29ja2V0LXN0eWxlIFdlYlNvY2tl dFNlcnZpY2UgbWVzc2FnaW5nCkBAIC0yMTYsMTggKzIxNSwxOCBAQCB2b2lkIEluc3BlY3RvclNl cnZlclJlcXVlc3RIYW5kbGVyUXQ6OnRjcFJlYWR5UmVhZCgpCiAKICAgICAgICAgICAgICAgICBR Qnl0ZUFycmF5IGtleTMgPSBtX3RjcENvbm5lY3Rpb24tPnJlYWQoOCk7CiAKLSAgICAgICAgICAg ICAgICBxdWludDMyIG51bWJlcjEgPSBwYXJzZVdlYlNvY2tldENoYWxsZW5nZU51bWJlcihoZWFk ZXIudmFsdWUoIlNlYy1XZWJTb2NrZXQtS2V5MSIpKTsKLSAgICAgICAgICAgICAgICBxdWludDMy IG51bWJlcjIgPSBwYXJzZVdlYlNvY2tldENoYWxsZW5nZU51bWJlcihoZWFkZXIudmFsdWUoIlNl Yy1XZWJTb2NrZXQtS2V5MiIpKTsKKyAgICAgICAgICAgICAgICBxdWludDMyIG51bWJlcjEgPSBw YXJzZVdlYlNvY2tldENoYWxsZW5nZU51bWJlcihoZWFkZXIudmFsdWUoUUxhdGluMVN0cmluZygi U2VjLVdlYlNvY2tldC1LZXkxIikpKTsKKyAgICAgICAgICAgICAgICBxdWludDMyIG51bWJlcjIg PSBwYXJzZVdlYlNvY2tldENoYWxsZW5nZU51bWJlcihoZWFkZXIudmFsdWUoUUxhdGluMVN0cmlu ZygiU2VjLVdlYlNvY2tldC1LZXkyIikpKTsKIAogICAgICAgICAgICAgICAgIGNoYXIgcmVzcG9u c2VEYXRhWzE2XTsKICAgICAgICAgICAgICAgICBnZW5lcmF0ZVdlYlNvY2tldENoYWxsZW5nZVJl c3BvbnNlKG51bWJlcjEsIG51bWJlcjIsICh1bnNpZ25lZCBjaGFyKilrZXkzLmRhdGEoKSwgKHVu c2lnbmVkIGNoYXIqKXJlc3BvbnNlRGF0YSk7CiAgICAgICAgICAgICAgICAgUUJ5dGVBcnJheSBy ZXNwb25zZShyZXNwb25zZURhdGEsIHNpemVvZihyZXNwb25zZURhdGEpKTsKIAotICAgICAgICAg ICAgICAgIFFIdHRwUmVzcG9uc2VIZWFkZXIgcmVzcG9uc2VIZWFkZXIoMTAxLCAiV2ViU29ja2V0 IFByb3RvY29sIEhhbmRzaGFrZSIsIDEsIDEpOwotICAgICAgICAgICAgICAgIHJlc3BvbnNlSGVh ZGVyLnNldFZhbHVlKCJVcGdyYWRlIiwgaGVhZGVyLnZhbHVlKCJVcGdyYWRlIikpOwotICAgICAg ICAgICAgICAgIHJlc3BvbnNlSGVhZGVyLnNldFZhbHVlKCJDb25uZWN0aW9uIiwgaGVhZGVyLnZh bHVlKCJDb25uZWN0aW9uIikpOwotICAgICAgICAgICAgICAgIHJlc3BvbnNlSGVhZGVyLnNldFZh bHVlKCJTZWMtV2ViU29ja2V0LU9yaWdpbiIsIGhlYWRlci52YWx1ZSgiT3JpZ2luIikpOwotICAg ICAgICAgICAgICAgIHJlc3BvbnNlSGVhZGVyLnNldFZhbHVlKCJTZWMtV2ViU29ja2V0LUxvY2F0 aW9uIiwgKCJ3czovLyIgKyBoZWFkZXIudmFsdWUoIkhvc3QiKSArIG1fcGF0aCkpOworICAgICAg ICAgICAgICAgIFFIdHRwUmVzcG9uc2VIZWFkZXIgcmVzcG9uc2VIZWFkZXIoMTAxLCBRTGF0aW4x U3RyaW5nKCJXZWJTb2NrZXQgUHJvdG9jb2wgSGFuZHNoYWtlIiksIDEsIDEpOworICAgICAgICAg ICAgICAgIHJlc3BvbnNlSGVhZGVyLnNldFZhbHVlKFFMYXRpbjFTdHJpbmcoIlVwZ3JhZGUiKSwg aGVhZGVyLnZhbHVlKFFMYXRpbjFTdHJpbmcoIlVwZ3JhZGUiKSkpOworICAgICAgICAgICAgICAg IHJlc3BvbnNlSGVhZGVyLnNldFZhbHVlKFFMYXRpbjFTdHJpbmcoIkNvbm5lY3Rpb24iKSwgaGVh ZGVyLnZhbHVlKFFMYXRpbjFTdHJpbmcoIkNvbm5lY3Rpb24iKSkpOworICAgICAgICAgICAgICAg IHJlc3BvbnNlSGVhZGVyLnNldFZhbHVlKFFMYXRpbjFTdHJpbmcoIlNlYy1XZWJTb2NrZXQtT3Jp Z2luIiksIGhlYWRlci52YWx1ZShRTGF0aW4xU3RyaW5nKCJPcmlnaW4iKSkpOworICAgICAgICAg ICAgICAgIHJlc3BvbnNlSGVhZGVyLnNldFZhbHVlKFFMYXRpbjFTdHJpbmcoIlNlYy1XZWJTb2Nr ZXQtTG9jYXRpb24iKSwgKFFMYXRpbjFTdHJpbmcoIndzOi8vIikgKyBoZWFkZXIudmFsdWUoUUxh dGluMVN0cmluZygiSG9zdCIpKSArIG1fcGF0aCkpOwogICAgICAgICAgICAgICAgIHJlc3BvbnNl SGVhZGVyLnNldENvbnRlbnRMZW5ndGgocmVzcG9uc2Uuc2l6ZSgpKTsKICAgICAgICAgICAgICAg ICBtX3RjcENvbm5lY3Rpb24tPndyaXRlKHJlc3BvbnNlSGVhZGVyLnRvU3RyaW5nKCkudG9MYXRp bjEoKSk7CiAgICAgICAgICAgICAgICAgbV90Y3BDb25uZWN0aW9uLT53cml0ZShyZXNwb25zZSk7 CkBAIC0yNTksMTkgKzI1OCwxOSBAQCB2b2lkIEluc3BlY3RvclNlcnZlclJlcXVlc3RIYW5kbGVy UXQ6OnRjcFJlYWR5UmVhZCgpCiAgICAgICAgIFFTdHJpbmcgdGV4dCA9IFFTdHJpbmc6OmZyb21M YXRpbjEoIk9LIik7CiAKICAgICAgICAgLy8gSWYgbm8gcGF0aCBpcyBzcGVjaWZpZWQsIGdlbmVy YXRlIGFuIGluZGV4IHBhZ2UuCi0gICAgICAgIGlmICgobV9wYXRoID09ICIiKSB8fCAobV9wYXRo ID09ICIvIikpIHsKLSAgICAgICAgICAgIFFTdHJpbmcgaW5kZXhIdG1sID0gIjxodG1sPjxoZWFk Pjx0aXRsZT5SZW1vdGUgV2ViIEluc3BlY3RvcjwvdGl0bGU+PC9oZWFkPjxib2R5Pjx1bD5cbiI7 CisgICAgICAgIGlmIChtX3BhdGguaXNFbXB0eSgpIHx8IChtX3BhdGggPT0gUVN0cmluZyhRTGF0 aW4xQ2hhcignLycpKSkpIHsKKyAgICAgICAgICAgIFFTdHJpbmcgaW5kZXhIdG1sID0gUUxhdGlu MVN0cmluZygiPGh0bWw+PGhlYWQ+PHRpdGxlPlJlbW90ZSBXZWIgSW5zcGVjdG9yPC90aXRsZT48 L2hlYWQ+PGJvZHk+PHVsPlxuIik7CiAgICAgICAgICAgICBmb3IgKFFNYXA8aW50LCBJbnNwZWN0 b3JDbGllbnRRdCogPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3NlcnZlci0+bV9pbnNwZWN0b3JD bGllbnRzLmJlZ2luKCk7CiAgICAgICAgICAgICAgICAgIGl0ICE9IG1fc2VydmVyLT5tX2luc3Bl Y3RvckNsaWVudHMuZW5kKCk7IAogICAgICAgICAgICAgICAgICArK2l0KSB7Ci0gICAgICAgICAg ICAgICAgaW5kZXhIdG1sLmFwcGVuZChRU3RyaW5nKCI8bGk+PGEgaHJlZj1cIi93ZWJraXQvaW5z cGVjdG9yL2luc3BlY3Rvci5odG1sP3BhZ2U9JTFcIj4lMjwvbGk+XG4iKQorICAgICAgICAgICAg ICAgIGluZGV4SHRtbC5hcHBlbmQoUVN0cmluZzo6ZnJvbUxhdGluMSgiPGxpPjxhIGhyZWY9XCIv d2Via2l0L2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbD9wYWdlPSUxXCI+JTI8L2xpPlxuIikKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5hcmcoaXQua2V5KCkpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAuYXJnKGl0LnZhbHVlKCktPm1faW5zcGVjdGVkV2ViUGFn ZS0+bWFpbkZyYW1lKCktPnVybCgpLnRvU3RyaW5nKCkpKTsKICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIGluZGV4SHRtbC5hcHBlbmQoIjwvdWw+PC9ib2R5PjwvaHRtbD4iKTsKKyAgICAgICAg ICAgIGluZGV4SHRtbC5hcHBlbmQoUUxhdGluMVN0cmluZygiPC91bD48L2JvZHk+PC9odG1sPiIp KTsKICAgICAgICAgICAgIHJlc3BvbnNlID0gaW5kZXhIdG1sLnRvTGF0aW4xKCk7CiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBRU3RyaW5nIHBhdGggPSBRU3RyaW5nKCI6JTEiKS5hcmco bV9wYXRoKTsKKyAgICAgICAgICAgIFFTdHJpbmcgcGF0aCA9IFFTdHJpbmc6OmZyb21MYXRpbjEo IjolMSIpLmFyZyhtX3BhdGgpOwogICAgICAgICAgICAgUUZpbGUgZmlsZShwYXRoKTsKICAgICAg ICAgICAgIC8vIEl0IHNlZW1zIHRoYXQgdGhlcmUgc2hvdWxkIGJlIGFuIGVudW0gb3IgZGVmaW5l IGZvciB0aGVzZSBzdGF0dXMgY29kZXMgc29tZXdoZXJlIGluIFF0IG9yIFdlYktpdCwKICAgICAg ICAgICAgIC8vIGJ1dCBncmVwIGZhaWxzIHRvIHR1cm4gb25lIHVwLgo= 87079 2011-03-27 11:40:50 -0700 2011-03-27 15:55:19 -0700 Patch 57087.diff text/plain 2422 benjamin ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzYzM2 ODk2Li4xOWNiNGM0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMjcgIEJlbmphbWluIFBvdWxhaW4gIDxi ZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0V2ViS2l0IHdpbGwgbm90IGNvbXBpbGUgd2l0aCBR VF9BU0NJSV9DQVNUX1dBUk5JTkdTIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDg3CisKKyAgICAgICAgVXNlIGV4cGxpY2l0IGNvbnZl cnNpb24gZm9yIHN0cmluZyB0byBhdm9pZCBkZXBlbmRpbmcgb24gdGhlIGRlZmF1bHQgY29kZWMK KyAgICAgICAgaW5zdGFsbGVkIGJ5IHRoZSB1c2VyIGNvZGUuCisKKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL3F0L0FjdGl2YXRlRm9udHNRdC5jcHA6CisgICAgICAg IChXVFI6OmFjdGl2YXRlRm9udHMpOgorCiAyMDExLTAzLTI2ICBNYWNpZWogU3RhY2hvd2lhayAg PG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2ZXJ0IGluYWR2ZXJ0YW50bHkgY29tbWl0dGVk IGNoYW5nZXMuCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVu ZGxlL3F0L0FjdGl2YXRlRm9udHNRdC5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVj dGVkQnVuZGxlL3F0L0FjdGl2YXRlRm9udHNRdC5jcHAKaW5kZXggZTVhN2MyZS4uZDk0ODc3ZSAx MDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9xdC9BY3Rp dmF0ZUZvbnRzUXQuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvcXQvQWN0aXZhdGVGb250c1F0LmNwcApAQCAtNTcsOCArNTcsOSBAQCB2b2lkIGFjdGl2YXRl Rm9udHMoKQogICAgIGlmIChhcHBGb250U2V0ICYmIG51bUZvbnRzID49IDAgJiYgYXBwRm9udFNl dC0+bmZvbnQgPT0gbnVtRm9udHMpCiAgICAgICAgIHJldHVybjsKIAotICAgIFFCeXRlQXJyYXkg Zm9udERpciA9IGdldGVudigiV0VCS0lUX1RFU1RGT05UUyIpOwotICAgIGlmIChmb250RGlyLmlz RW1wdHkoKSB8fCAhUURpcihmb250RGlyKS5leGlzdHMoKSkgeworICAgIGNoYXIqIGNvbnN0IGZv bnREaXIgPSBnZXRlbnYoIldFQktJVF9URVNURk9OVFMiKTsKKyAgICBjb25zdCBRU3RyaW5nIGZv bnREaXJTdHJpbmcgPSBRU3RyaW5nOjpmcm9tTG9jYWw4Qml0KGZvbnREaXIpOworICAgIGlmICgh Zm9udERpclN0cmluZy5pc0VtcHR5KCkgfHwgIVFEaXIoZm9udERpclN0cmluZykuZXhpc3RzKCkp IHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsCiAgICAgICAgICAgICAgICAgIlxuXG4iCiAgICAg ICAgICAgICAgICAgIi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiIKQEAgLTc3LDcgKzc4LDcgQEAgdm9pZCBhY3Rp dmF0ZUZvbnRzKCkKICAgICBjb25maWdGaWxlICs9ICIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQv Zm9udHMuY29uZiI7CiAgICAgaWYgKCFGY0NvbmZpZ1BhcnNlQW5kTG9hZCAoY29uZmlnLCAoRmND aGFyOCopIGNvbmZpZ0ZpbGUuZGF0YSgpLCB0cnVlKSkKICAgICAgICAgcUZhdGFsKCJDb3VsZG4n dCBsb2FkIGZvbnQgY29uZmlndXJhdGlvbiBmaWxlIik7Ci0gICAgaWYgKCFGY0NvbmZpZ0FwcEZv bnRBZGREaXIgKGNvbmZpZywgKEZjQ2hhcjgqKSBmb250RGlyLmRhdGEoKSkpCisgICAgaWYgKCFG Y0NvbmZpZ0FwcEZvbnRBZGREaXIgKGNvbmZpZywgKEZjQ2hhcjgqKSBmb250RGlyKSkKICAgICAg ICAgcUZhdGFsKCJDb3VsZG4ndCBhZGQgZm9udCBkaXIhIik7CiAgICAgRmNDb25maWdTZXRDdXJy ZW50KGNvbmZpZyk7CiAKQEAgLTg1LDEwICs4NiwxMCBAQCB2b2lkIGFjdGl2YXRlRm9udHMoKQog ICAgIG51bUZvbnRzID0gYXBwRm9udFNldC0+bmZvbnQ7CiAjZW5kaWYKIAotICAgIFFBcHBsaWNh dGlvbjo6c2V0R3JhcGhpY3NTeXN0ZW0oInJhc3RlciIpOworICAgIFFBcHBsaWNhdGlvbjo6c2V0 R3JhcGhpY3NTeXN0ZW0oUUxhdGluMVN0cmluZygicmFzdGVyIikpOwogICAgIFFBcHBsaWNhdGlv bjo6c2V0U3R5bGUobmV3IFFXaW5kb3dzU3R5bGUpOwogCi0gICAgUUZvbnQgZigiU2FucyBTZXJp ZiIpOworICAgIFFGb250IGYoUUxhdGluMVN0cmluZygiU2FucyBTZXJpZiIpKTsKICAgICBmLnNl dFBvaW50U2l6ZSg5KTsKICAgICBmLnNldFdlaWdodChRRm9udDo6Tm9ybWFsKTsKICAgICBmLnNl dFN0eWxlKFFGb250OjpTdHlsZU5vcm1hbCk7Cg== 87082 2011-03-27 11:47:39 -0700 2011-03-28 09:29:30 -0700 Patch 57087_enable_default.diff text/plain 5929 benjamin ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxYmJhNjU5Li45MjJlODE0 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTEtMDMtMjcgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IFF0V2ViS2l0IHdpbGwgbm90IGNvbXBpbGUgd2l0aCBRVF9BU0NJSV9DQVNUX1dBUk5JTkdTIGVu YWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3 MDg3CisKKyAgICAgICAgRW5hYmxlIFFUX0FTQ0lJX0NBU1RfV0FSTklOR1MgYnkgZGVmYXVsdCBp biB3ZWJraXQucHJpIHRvIGNhdGNoIHRoZSBlcnJvcnMgZWFybHkgb24uCisKKyAgICAgICAgKiBT b3VyY2UvV2ViS2l0LnByaToKKwogMjAxMS0wMy0yNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC5wcmkgYi9Tb3VyY2UvV2ViS2l0LnByaQppbmRleCA1NTYzNDhhLi4xNWY4 M2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0LnByaQorKysgYi9Tb3VyY2UvV2ViS2l0LnBy aQpAQCAtNzMsNiArNzMsOCBAQCBJTkNMVURFUEFUSCArPSBcCiAgICAgJCRPVVRQVVRfRElSL2lu Y2x1ZGUgXAogICAgICQkUVQuc2NyaXB0LmluY2x1ZGVzCiAKK0RFRklORVMgKz0gUVRfQVNDSUlf Q0FTVF9XQVJOSU5HUworCiB3ZWJraXQyOklOQ0xVREVQQVRIICo9ICQkT1VUUFVUX0RJUi9pbmNs dWRlL1dlYktpdDIKIAogIyBQaWNrIHVwIDNyZHBhcnR5IGxpYnJhcmllcyBmcm9tIElOQ0xVREUv TElCIGp1c3QgbGlrZSB3aXRoIE1TVkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggYzFhZDI5ZC4uNTQ4MDFl MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0wMy0yNyAgQmVuamFtaW4g UG91bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUXRXZWJLaXQgd2lsbCBub3QgY29t cGlsZSB3aXRoIFFUX0FTQ0lJX0NBU1RfV0FSTklOR1MgZW5hYmxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwODcKKworICAgICAgICAqIFF0V2Vi S2l0LnBybzogd2UgY2FuIG5vdyBlbmFibGUgUVRfQVNDSUlfQ0FTVF9XQVJOSU5HUworICAgICAg ICAqIHRlc3RzL3Rlc3RzLnByaTogd2UgZG8gbm90IHJlcXVpcmUgUVRfQVNDSUlfQ0FTVF9XQVJO SU5HUyBmb3IgdGVzdHMKKyAgICAgICAgc2luY2UgdGhleSBhcmUgYXBwbGljYXRpb25zLCBub3Qg bGlicmFyaWVzLgorCiAyMDExLTAzLTI3ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8gYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0 LnBybwppbmRleCA1MTEwYmMyLi5kMmJhMzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0 L1F0V2ViS2l0LnBybworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybwpAQCAtODIs OCArODIsNiBAQCBDT05GSUcoUVRESVJfYnVpbGQpIHsKICAgICBzeW1iaWFuOiBUQVJHRVQgPSQk VEFSR0VUJCR7UVRfTElCSU5GSVh9CiB9CiAKLSMgQXZvaWQgQVNDSUktY2FzdCB3YXJuaW5ncyBi ZWNhdXNlIFF0IHVzZSB0aGVtIGEgbG90IGFuZCB3YXJuaW5ncyBhcmUgdHJlYXRlZCBhcyBlcnJv cnMuCi1ERUZJTkVTIC09IFFUX0FTQ0lJX0NBU1RfV0FSTklOR1MKIAogc3ltYmlhbiB7CiAgICAg VEFSR0VULkVQT0NBTExPV0RMTERBVEE9MQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90 ZXN0cy90ZXN0cy5wcmkgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3Rlc3RzLnByaQppbmRleCBi YjUxOWViLi5lYmI2ZjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3Rlc3Rz LnByaQorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3Rlc3RzLnByaQpAQCAtMzIsMyArMzIs NSBAQCBzeW1iaWFuIHsKICMgVGhpcyBkZWZpbmUgaXMgdXNlZCBieSBzb21lIHRlc3RzIHRvIGxv b2sgdXAgcmVzb3VyY2VzIGluIHRoZSBzb3VyY2UgdHJlZQogIXN5bWJpYW46IERFRklORVMgKz0g VEVTVFNfU09VUkNFX0RJUj1cXFwiJCRQV0QvXFxcIgogCitERUZJTkVTIC09IFFUX0FTQ0lJX0NB U1RfV0FSTklOR1MKKwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IDE5Y2I0YzQuLjkzODE3N2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTUsNiArNSwyMiBAQAogICAgICAgICBbUXRdIFF0V2Vi S2l0IHdpbGwgbm90IGNvbXBpbGUgd2l0aCBRVF9BU0NJSV9DQVNUX1dBUk5JTkdTIGVuYWJsZWQK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDg3CiAK KyAgICAgICAgRGlzYWJsZSBRVF9BU0NJSV9DQVNUX1dBUk5JTkdTIGZvciBhcHBsaWNhdGlvbnMu CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5wcm86CisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvcXQvSW1hZ2VEaWZmLnBybzoKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLnBybzoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm86CisgICAgICAgICogUXRUZXN0 QnJvd3Nlci9RdFRlc3RCcm93c2VyLnBybzoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL3F0 L1dlYktpdFRlc3RSdW5uZXIucHJvOgorCisyMDExLTAzLTI3ICBCZW5qYW1pbiBQb3VsYWluICA8 YmVuamFtaW4ucG91bGFpbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRdFdlYktpdCB3aWxsIG5vdCBjb21waWxlIHdpdGgg UVRfQVNDSUlfQ0FTVF9XQVJOSU5HUyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzA4NworCiAgICAgICAgIFVzZSBleHBsaWNpdCBjb252 ZXJzaW9uIGZvciBzdHJpbmcgdG8gYXZvaWQgZGVwZW5kaW5nIG9uIHRoZSBkZWZhdWx0IGNvZGVj CiAgICAgICAgIGluc3RhbGxlZCBieSB0aGUgdXNlciBjb2RlLgogCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5wcm8gYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9xdC9EdW1wUmVuZGVyVHJlZS5wcm8KaW5kZXggZDg0YWY5Ni4uZWUxZjUxMSAxMDA2NDQK LS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWUucHJvCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLnBybwpAQCAtNTEsMyArNTEsNCBA QCB3aW5jZSo6IHsKIH0KIAogREVGSU5FUyArPSBVU0VfU1lTVEVNX01BTExPQz0xCitERUZJTkVT IC09IFFUX0FTQ0lJX0NBU1RfV0FSTklOR1MKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0ltYWdlRGlmZi5wcm8gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9JbWFnZURpZmYu cHJvCmluZGV4IGNkYjA2N2UuLmIzZDUxODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0ltYWdlRGlmZi5wcm8KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvSW1hZ2VE aWZmLnBybwpAQCAtMTQsMyArMTQsNCBAQCB1bml4OiFtYWMgewogICAgIFFNQUtFX1JQQVRIRElS ID0gJCRPVVRQVVRfRElSL2xpYiAkJFFNQUtFX1JQQVRIRElSCiB9CiAKK0RFRklORVMgLT0gUVRf QVNDSUlfQ0FTVF9XQVJOSU5HUwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQv VGVzdE5ldHNjYXBlUGx1Z2luL1Rlc3ROZXRzY2FwZVBsdWdpbi5wcm8gYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9xdC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLnBybwppbmRl eCBmZDY1MDU4Li42NzQxNjY4IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9U ZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLnBybworKysgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9xdC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLnBybwpA QCAtNDcsNiArNDcsOCBAQCBtYWMgewogICAgIFNPVVJDRVMgKz0gLi4vLi4vdW5peC9UZXN0TmV0 c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLmNwcAogfQogCitERUZJTkVTIC09IFFUX0FT Q0lJX0NBU1RfV0FSTklOR1MKKwogIXdpbjMyOiFlbWJlZGRlZDohbWFjOiFzeW1iaWFuIHsKICAg ICBMSUJTICs9IC1sWDExCiB9CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5p QnJvd3Nlci5wcm8gYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm8KaW5kZXgg MDAzODgyMy4uODA5YzkzNCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJy b3dzZXIucHJvCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBybwpAQCAt NTYsNiArNTYsOCBAQCBjb250YWlucyhRVF9DT05GSUcsIG9wZW5nbCkgewogICAgIERFRklORVMg Kz0gUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTAogfQogCitERUZJTkVTIC09IFFUX0FTQ0lJX0NB U1RfV0FSTklOR1MKKwogIyBXZSBjb3B5IHRoZSByZXNvdXJjZSBmaWxlIHRvIHRoZSBidWlsZCBk aXJlY3RvcnkuCiAjIFRoZSBjb3BpZXIgaXMgZGVmaW5lZCBpbiBUb29scy9NaW5pQnJvd3Nlci9E ZXJpdmVkU291cmNlcy5wcm8uCiBSRVNPVVJDRVMgKz0gXApkaWZmIC0tZ2l0IGEvVG9vbHMvUXRU ZXN0QnJvd3Nlci9RdFRlc3RCcm93c2VyLnBybyBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIvUXRUZXN0 QnJvd3Nlci5wcm8KaW5kZXggZTNlMDNhNi4uYjlhZTI0NyAxMDA2NDQKLS0tIGEvVG9vbHMvUXRU ZXN0QnJvd3Nlci9RdFRlc3RCcm93c2VyLnBybworKysgYi9Ub29scy9RdFRlc3RCcm93c2VyL1F0 VGVzdEJyb3dzZXIucHJvCkBAIC02Miw1ICs2Miw3IEBAIGNvbnRhaW5zKFFUX0NPTkZJRywgb3Bl bmdsKSB7CiAgICAgREVGSU5FUyArPSBRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMCiB9CiAKK0RF RklORVMgLT0gUVRfQVNDSUlfQ0FTVF9XQVJOSU5HUworCiBSRVNPVVJDRVMgKz0gXAogICAgIFF0 VGVzdEJyb3dzZXIucXJjCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L1dl YktpdFRlc3RSdW5uZXIucHJvIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9XZWJLaXRUZXN0 UnVubmVyLnBybwppbmRleCBkNjU3OWE0Li42ODRhMTRhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL3F0L1dlYktpdFRlc3RSdW5uZXIucHJvCisrKyBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvcXQvV2ViS2l0VGVzdFJ1bm5lci5wcm8KQEAgLTksNiArOSw3IEBAIEdFTkVSQVRF RF9TT1VSQ0VTX0RJUiA9IC4uL2dlbmVyYXRlZAogaW5jbHVkZSguLi8uLi8uLi9Tb3VyY2UvV2Vi S2l0LnByaSkKIAogREVGSU5FUyArPSBVU0VfU1lTVEVNX01BTExPQz0xCitERUZJTkVTIC09IFFU X0FTQ0lJX0NBU1RfV0FSTklOR1MKIAogSU5DTFVERVBBVEggKz0gXAogICAgICQkQkFTRURJUiBc Cg==