clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-06-16 02:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not set upper magic vars in --inherit or --include mode

Browse Source
This commit is contained in:
Unbit
2013-10-01 18:42:30 +02:00
parent bf8207f0f1
commit feec6b3151
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/uwsgi.c
+16 -10
View File
@@ -1102,10 +1102,10 @@ reuse:
magic_table['D'] = magic_table['d'];
magic_table['S'] = magic_table['s'];
magic_table['P'] = magic_table['p'];
if (magic_table['c']) magic_table['C'] = magic_table['c'];
if (magic_table['e']) magic_table['E'] = magic_table['e'];
if (magic_table['n']) magic_table['N'] = magic_table['n'];
if (magic_table['x']) magic_table['X'] = magic_table['x'];
magic_table['C'] = magic_table['c'];
magic_table['E'] = magic_table['e'];
magic_table['N'] = magic_table['n'];
magic_table['X'] = magic_table['x'];
uwsgi.magic_table_first_round = 1;
}
@@ -4323,39 +4323,45 @@ void uwsgi_opt_deprecated(char *opt, char *value, void *message) {
void uwsgi_opt_load(char *opt, char *filename, void *none) {
// here we need to avoid setting upper magic vars
int orig_magic = uwsgi.magic_table_first_round;
uwsgi.magic_table_first_round = 1;
if (uwsgi_endswith(filename, ".ini")) {
uwsgi_opt_load_ini(opt, filename, none);
return;
goto end;
}
#ifdef UWSGI_XML
if (uwsgi_endswith(filename, ".xml")) {
uwsgi_opt_load_xml(opt, filename, none);
return;
goto end;
}
#endif
#ifdef UWSGI_YAML
if (uwsgi_endswith(filename, ".yaml")) {
uwsgi_opt_load_yml(opt, filename, none);
return;
goto end;
}
if (uwsgi_endswith(filename, ".yml")) {
uwsgi_opt_load_yml(opt, filename, none);
return;
goto end;
}
#endif
#ifdef UWSGI_JSON
if (uwsgi_endswith(filename, ".json")) {
uwsgi_opt_load_json(opt, filename, none);
return;
goto end;
}
if (uwsgi_endswith(filename, ".js")) {
uwsgi_opt_load_json(opt, filename, none);
return;
goto end;
}
#endif
// fallback to pluggable system
uwsgi_opt_load_config(opt, filename, none);
end:
uwsgi.magic_table_first_round = orig_magic;
}
void uwsgi_opt_logic(char *opt, char *arg, void *func) {