adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-09 10:23:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable legacy encoding mode when modpython is loaded.

Browse Source 
Python is not happy when using non-unicode text as str.

Fix #1229
This commit is contained in:
Alexey Sokolov
2016-01-09 14:09:34 +00:00
parent 1e1fadbc2b
commit 4fe4a45dd6
8 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/data/webadmin/tmpl/encoding_settings.tmpl
+7 -2
View File
@@ -3,10 +3,15 @@
<div>
ZNC is compiled without encodings support. <a href="http://icu-project.org/">ICU</a> is required for it.
</div>
<? ENDIF ?>
<? ELSE ?><?IF LegacyEncodingDisabled ?>
<div>
<!-- TODO don't hardcode modpython here -->
Legacy mode is disabled by modpython.
</div>
<? ENDIF ?><? ENDIF ?>
<div>
<div class="checkboxandlabel checkbox">
<input type="radio" name="encoding_utf" id="encoding_utf_legacy" value="legacy" <? IF EncodingUtf == "legacy" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
<input type="radio" name="encoding_utf" id="encoding_utf_legacy" value="legacy" <? IF EncodingUtf == "legacy" ?>checked="checked"<? ENDIF ?> <? IF LegacyEncodingDisabled ?>disabled="disabled"<? ENDIF ?> />
<label for="encoding_utf_legacy">Don't ensure any encoding at all (legacy mode, not recommended)</label>
</div>
<div class="checkboxandlabel checkbox">
modules/modpython.cpp
+2
View File
@@ -82,6 +82,7 @@ class CModPython : public CModule {
}
MODCONSTRUCTOR(CModPython) {
CZNC::Get().ForceEncoding();
Py_Initialize();
m_PyFormatException = nullptr;
m_PyZNCModule = nullptr;
@@ -386,6 +387,7 @@ class CModPython : public CModule {
Py_CLEAR(m_PyFormatException);
Py_CLEAR(m_PyZNCModule);
Py_Finalize();
CZNC::Get().UnforceEncoding();
}
};
modules/webadmin.cpp
+6
View File
@@ -1013,7 +1013,10 @@ class CWebAdminMod : public CModule {
Tmpl["EncodingUtf"] = "simple";
Tmpl["Encoding"] = sEncoding;
}
Tmpl["LegacyEncodingDisabled"] =
CString(CZNC::Get().IsForcingEncoding());
#else
Tmpl["LegacyEncodingDisabled"] = "true";
Tmpl["EncodingDisabled"] = "true";
Tmpl["EncodingUtf"] = "legacy";
#endif
@@ -1353,7 +1356,10 @@ class CWebAdminMod : public CModule {
Tmpl["EncodingUtf"] = "simple";
Tmpl["Encoding"] = sEncoding;
}
Tmpl["LegacyEncodingDisabled"] =
CString(CZNC::Get().IsForcingEncoding());
#else
Tmpl["LegacyEncodingDisabled"] = "true";
Tmpl["EncodingDisabled"] = "true";
Tmpl["EncodingUtf"] = "legacy";
#endif