diff options
| author | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2014-12-18 17:15:49 +1100 |
|---|---|---|
| committer | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2014-12-18 17:15:49 +1100 |
| commit | 3192e92876a52af87d546186ca52a7594a474fa2 (patch) | |
| tree | e8e9bac56d31f542c8d658d7405bc4a6c9bf021e /src/server/mod_wsgi.c | |
| parent | 8042adfb585d7f4a1dd6f4e9c77030778d63d2b4 (diff) | |
| parent | c47dc8155bcf7978d0abedd6d439f86d8cddeaa6 (diff) | |
| download | mod_wsgi-4.4.2.tar.gz | |
Merge branch 'release/4.4.2'4.4.2
Diffstat (limited to 'src/server/mod_wsgi.c')
| -rw-r--r-- | src/server/mod_wsgi.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c index 5a90dd2..31170ce 100644 --- a/src/server/mod_wsgi.c +++ b/src/server/mod_wsgi.c @@ -9194,18 +9194,35 @@ static int wsgi_start_process(apr_pool_t *p, WSGIDaemonProcess *daemon) /* Set lang/locale if specified for daemon process. */ if (daemon->group->lang) { - char *envvar = apr_pstrcat(p, "LANG=", daemon->group->lang, NULL); + char *envvar; + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wsgi_server, - "mod_wsgi (pid=%d): Setting lang to %s.", - getpid(), daemon->group->lang); + "mod_wsgi (pid=%d): Setting lang to %s for " + "daemon process group %s.", getpid(), + daemon->group->lang, daemon->group->name); + + envvar = apr_pstrcat(p, "LANG=", daemon->group->lang, NULL); putenv(envvar); } if (daemon->group->locale) { + char *result; + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wsgi_server, - "mod_wsgi (pid=%d): Setting locale to %s.", - getpid(), daemon->group->locale); - setlocale(LC_ALL, daemon->group->locale); + "mod_wsgi (pid=%d): Setting locale to %s for " + "daemon process group %s.", getpid(), + daemon->group->locale, daemon->group->name); + + result = setlocale(LC_ALL, daemon->group->locale); + + if (!result) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, wsgi_server, + "mod_wsgi (pid=%d): Unsupported locale setting " + "%s specified for daemon process group %s. " + "Consider using 'C.UTF-8' as fallback setting.", + getpid(), daemon->group->locale, + daemon->group->name); + } } /* |