diff --git a/core/event.c b/core/event.c index 82088b0f..9fb90f28 100644 --- a/core/event.c +++ b/core/event.c @@ -92,7 +92,6 @@ int event_queue_del_fd(int eq, int fd, int event) { return -1; } int event_queue_wait_multi(int eq, int timeout, void *events, int nevents) { - uwsgi_log("ciao\n"); return -1; } int event_queue_interesting_fd_has_error(void *events, int id) { diff --git a/plugins/python/python_plugin.c b/plugins/python/python_plugin.c index c1d0375e..35e63727 100644 --- a/plugins/python/python_plugin.c +++ b/plugins/python/python_plugin.c @@ -126,8 +126,10 @@ struct uwsgi_option uwsgi_python_options[] = { {"ini-paste-logged", required_argument, 0, "load a paste.deploy config file containing uwsgi section (load loggers too)", uwsgi_opt_ini_paste, NULL, UWSGI_OPT_IMMEDIATE}, #endif {"reload-os-env", no_argument, 0, "force reload of os.environ at each request", uwsgi_opt_true, &up.reload_os_env, 0}, +#ifndef __CYGWIN__ #ifndef UWSGI_PYPY {"no-site", no_argument, 0, "do not import site module", uwsgi_opt_true, &Py_NoSiteFlag, 0}, +#endif #endif {"pyshell", no_argument, 0, "run an interactive python shell in the uWSGI environment", uwsgi_opt_pyshell, NULL, 0}, {"pyshell-oneshot", no_argument, 0, "run an interactive python shell in the uWSGI environment (one-shot variant)", uwsgi_opt_pyshell, NULL, 0}, diff --git a/uwsgiconfig.py b/uwsgiconfig.py index 8a0ceaff..e84e78e3 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py @@ -311,6 +311,12 @@ def build_uwsgi(uc, print_only=False): p_cflags = cflags[:] p_cflags += up['CFLAGS'] + if uwsgi_os.startswith('CYGWIN'): + try: + p_cflags.remove('-fstack-protector') + except: + pass + try: p_cflags.remove('-Wdeclaration-after-statement') except: