Allow options:casemapping to remain defined when using m_nationalchars.

This commit is contained in:
Matt Schatz 2019-11-17 05:06:33 -07:00 committed by P. Powell
parent 2ec7654267
commit 43da9c3232

View File

@ -368,7 +368,8 @@ void ServerConfig::Fill()
throw CoreException("You must restart to change the server id");
std::string casemapping = options->getString("casemapping");
if (!casemapping.empty() && casemapping != CaseMapping)
// Ignore this value if CaseMapping is set to something the core doesn't provide (i.e., m_nationalchars).
if (!casemapping.empty() && casemapping != CaseMapping && (CaseMapping == "ascii" || CaseMapping == "rfc1459"))
throw CoreException("You must restart to change the server casemapping");
}