diff --git a/buildconf/default.ini b/buildconf/default.ini index 88c904b1..8d316221 100644 --- a/buildconf/default.ini +++ b/buildconf/default.ini @@ -3,7 +3,7 @@ xml = true ini = true yaml = true json = auto -sqlite3 = false +sqlite3 = auto zeromq = auto snmp = true sctp = false diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c index 0af77042..ceb595df 100644 --- a/plugins/python/pyloader.c +++ b/plugins/python/pyloader.c @@ -80,9 +80,7 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre int id = uwsgi_apps_cnt; int multiapp = 0; -#ifdef UWSGI_ASYNC int i; -#endif char *mountpoint; @@ -320,9 +318,9 @@ int init_uwsgi_app(int loader, void *arg1, struct wsgi_request *wsgi_req, PyThre // add start_response on WSGI app Py_INCREF((PyObject *)up.wsgi_spitout); - wi->wsgi_args = PyTuple_New(wi->argc); + wi->args = PyTuple_New(wi->argc); if (app_type == PYTHON_APP_TYPE_WSGI) { - if (PyTuple_SetItem(wi->wsgi_args, 1, up.wsgi_spitout)) { + if (PyTuple_SetItem(wi->args, 1, up.wsgi_spitout)) { uwsgi_log("unable to set start_response in args tuple\n"); exit(1); } diff --git a/uwsgi.c b/uwsgi.c index ccdd860b..fdeaefed 100644 --- a/uwsgi.c +++ b/uwsgi.c @@ -1750,6 +1750,7 @@ int uwsgi_start(void *v_argv) { uwsgi_register_loop("simple", simple_loop); +#ifdef UWSGI_ASYNC uwsgi_register_loop("async", async_loop); @@ -1777,6 +1778,7 @@ int uwsgi_start(void *v_argv) { } } } +#endif if (!getrlimit(RLIMIT_NOFILE, &uwsgi.rl)) { uwsgi.max_fd = uwsgi.rl.rlim_cur; @@ -2972,9 +2974,11 @@ void uwsgi_ignition() { long y = 0; simple_loop((void *) y); } +#ifdef UWSGI_ASYNC else { async_loop(NULL); } +#endif }