From 5c0c2f6b455d4e53364ff2be3c8425631b47e23b Mon Sep 17 00:00:00 2001 From: "roberto@debian32" Date: Mon, 5 Sep 2011 08:12:12 +0200 Subject: [PATCH] yaml fix --- plugins/python/python_plugin.c | 5 ++++- yaml.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/python/python_plugin.c b/plugins/python/python_plugin.c index 87496d68..1acd5716 100644 --- a/plugins/python/python_plugin.c +++ b/plugins/python/python_plugin.c @@ -802,7 +802,7 @@ int uwsgi_python_manage_options(int i, char *optarg) { int uwsgi_python_mount_app(char *mountpoint, char *app, int regexp) { - int id, i; + int id; uwsgi.wsgi_req->appid = mountpoint; uwsgi.wsgi_req->appid_len = strlen(mountpoint); if (uwsgi.single_interpreter) { @@ -810,6 +810,8 @@ int uwsgi_python_mount_app(char *mountpoint, char *app, int regexp) { } id = init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, NULL, PYTHON_APP_TYPE_WSGI); +#ifdef UWSGI_PCRE + int i; if (regexp && id != -1) { struct uwsgi_app *ua = &uwsgi_apps[id]; uwsgi_regexp_build(mountpoint, &ua->pattern, &ua->pattern_extra); @@ -820,6 +822,7 @@ int uwsgi_python_mount_app(char *mountpoint, char *app, int regexp) { } } } +#endif return id; diff --git a/yaml.c b/yaml.c index be27e4fa..94018a88 100644 --- a/yaml.c +++ b/yaml.c @@ -107,7 +107,7 @@ void uwsgi_yaml_config(char *file, char *magic_table[]) { char *section_asked = "uwsgi"; char *colon; - if (!uwsgi_check_scheme(file)) { + if (uwsgi_check_scheme(file)) { colon = uwsgi_get_last_char(file, '/'); colon = uwsgi_get_last_char(colon, ':'); }