diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/__init__.py | 4 | ||||
| -rw-r--r-- | src/server/management/commands/runmodwsgi.py | 2 | ||||
| -rw-r--r-- | src/server/mod_wsgi.c | 11 | ||||
| -rw-r--r-- | src/server/wsgi_apache.h | 1 | ||||
| -rw-r--r-- | src/server/wsgi_version.h | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/src/server/__init__.py b/src/server/__init__.py index 286e9ba..ffeb0d3 100644 --- a/src/server/__init__.py +++ b/src/server/__init__.py @@ -704,7 +704,7 @@ APACHE_ENVVARS_FILE = """ """ def generate_control_scripts(options): - path = os.path.join(options['server_root'], 'server-admin') + path = os.path.join(options['server_root'], 'apachectl') with open(path, 'w') as fp: print(WSGI_CONTROL_SCRIPT.lstrip() % options, file=fp) @@ -1183,7 +1183,7 @@ def cmd_start_server(params): options = cmd_setup_server(params, usage) - executable = os.path.join(options['server_root'], 'server-admin') + executable = os.path.join(options['server_root'], 'apachectl') name = executable.ljust(len(options['process_name'])) os.execl(executable, name, 'start', '-DNO_DETACH') diff --git a/src/server/management/commands/runmodwsgi.py b/src/server/management/commands/runmodwsgi.py index c1b64b3..1248526 100644 --- a/src/server/management/commands/runmodwsgi.py +++ b/src/server/management/commands/runmodwsgi.py @@ -46,6 +46,6 @@ class Command(BaseCommand): options = mod_wsgi.server._cmd_setup_server(args, options) - executable = os.path.join(options['server_root'], 'wsgi-server') + executable = os.path.join(options['server_root'], 'apachectl') name = executable.ljust(len(options['process_name'])) os.execl(executable, name, 'start', '-DNO_DETACH') diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c index 920cc5d..a09027f 100644 --- a/src/server/mod_wsgi.c +++ b/src/server/mod_wsgi.c @@ -7846,8 +7846,10 @@ static void *wsgi_deadlock_thread(apr_thread_t *thd, void *data) while (1) { apr_sleep(apr_time_from_sec(1)); - gilstate = PyGILState_Ensure(); - PyGILState_Release(gilstate); + if (!wsgi_daemon_shutdown) { + gilstate = PyGILState_Ensure(); + PyGILState_Release(gilstate); + } apr_thread_mutex_lock(wsgi_monitor_lock); wsgi_deadlock_shutdown_time = apr_time_now(); @@ -9204,8 +9206,7 @@ static apr_status_t wsgi_socket_connect_un(apr_socket_t *sock, } do { - rv = connect(rawsock, (struct sockaddr*)sa, - sizeof(*sa) + strlen(sa->sun_path)); + rv = connect(rawsock, (struct sockaddr*)sa, sizeof(*sa)); } while (rv == -1 && errno == EINTR); if ((rv == -1) && (errno == EINPROGRESS || errno == EALREADY) @@ -9249,7 +9250,7 @@ static int wsgi_connect_daemon(request_rec *r, WSGIDaemonSocket *daemon) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - apr_cpystrn(addr.sun_path, daemon->socket_path, sizeof addr.sun_path); + apr_cpystrn(addr.sun_path, daemon->socket_path, sizeof(addr.sun_path)); start_time = apr_time_now(); diff --git a/src/server/wsgi_apache.h b/src/server/wsgi_apache.h index d03b359..3727f3a 100644 --- a/src/server/wsgi_apache.h +++ b/src/server/wsgi_apache.h @@ -71,6 +71,7 @@ #include "apr_version.h" #include "apr_buckets.h" #include "apr_date.h" +#include "mpm_common.h" #include "apr_optional.h" diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h index 2fa8fad..17185ad 100644 --- a/src/server/wsgi_version.h +++ b/src/server/wsgi_version.h @@ -25,8 +25,8 @@ #define MOD_WSGI_MAJORVERSION_NUMBER 4 #define MOD_WSGI_MINORVERSION_NUMBER 1 -#define MOD_WSGI_MICROVERSION_NUMBER 0 -#define MOD_WSGI_VERSION_STRING "4.1.1" +#define MOD_WSGI_MICROVERSION_NUMBER 2 +#define MOD_WSGI_VERSION_STRING "4.1.2" /* ------------------------------------------------------------------------- */ |