diff --git a/doc/haproxy.1 b/doc/haproxy.1 index cc9c702b3..73c2aee76 100644 --- a/doc/haproxy.1 +++ b/doc/haproxy.1 @@ -35,8 +35,8 @@ instances without risking the system's stability. .TP \fB\-f \fP Specify configuration file or directory path. If the argument is a directory -the files (and only files) it containes are added in lexical order (respecting -LC_COLLATE) ; only non hidden files with ".cfg" extension are added. +the files (and only files) it containes are added in lexical order (using +LC_COLLATE=C) ; only non hidden files with ".cfg" extension are added. .TP \fB\-L \fP diff --git a/doc/management.txt b/doc/management.txt index 4f0af1062..119c3fa6d 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -136,7 +136,7 @@ list of options is : -f : adds to the list of configuration files to be loaded. If is a directory, all the files (and only files) it - containes are added in lexical order (respecting LC_COLLATE) to the list of + containes are added in lexical order (using LC_COLLATE=C) to the list of configuration files to be loaded ; only files with ".cfg" extension are added, only non hidden files (not prefixed with ".") are added. Configuration files are loaded and processed in their declaration order. diff --git a/src/haproxy.c b/src/haproxy.c index 582ad8203..c6d1505d9 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -1752,9 +1751,6 @@ int main(int argc, char **argv) char errmsg[100]; int pidfd = -1; - /* get the locale from the environment variables */ - setlocale(LC_ALL, ""); - init(argc, argv); signal_register_fct(SIGQUIT, dump, SIGQUIT); signal_register_fct(SIGUSR1, sig_soft_stop, SIGUSR1);