Merge branch 'release/4.6.4'

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.6.4
    release-notes/version-4.6.3
    release-notes/version-4.6.2
    release-notes/version-4.6.1

docs/release-notes/version-4.6.4.rst

@@ -0,0 +1,25 @@
+=============
+Version 4.6.4
+=============
+
+Version 4.6.4 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.6.4
+
+Bugs Fixed
+----------
+
+* In more recent Python versions, the config directory in the Python
+  installation incorporates the platform name. This directory was added as
+  an additional directory to search for Python shared libraries when
+  installing using the ``setup.py`` file or ``pip``. It should not even be
+  needed for newer Python versions but still check for older Python
+  versions. The only issue arising from the wrong directory, not incorporating
+  the platform name, being used, was a linker warning about the directory
+  not being present.
+
+* Installing mod_wsgi on Windows would fail as hadn't exclude mod_wsgi
+  daemon mode specific code from Windows build. This would result in compile
+  time error about ``wsgi_daemon_process`` being undefined. This problem
+  was introduced to Windows in version 4.6.0. A prior attempt to fix this
+  in 4.6.3 missed one place in the code which needed to be changed.

setup.py

@@ -442,6 +442,8 @@ def get_apu_includes():
 
     if PYTHON_LDVERSION and PYTHON_LDVERSION != PYTHON_VERSION:
         PYTHON_CFGDIR = '%s-%s' % (PYTHON_CFGDIR, PYTHON_LDVERSION)
+        if not os.path.exists(PYTHON_CFGDIR):
+            PYTHON_CFGDIR = '%s-%s' % (PYTHON_CFGDIR, sys.platform)
 
     PYTHON_LDFLAGS = ['-L%s' % PYTHON_LIBDIR, '-L%s' % PYTHON_CFGDIR]
     PYTHON_LDLIBS = ['-lpython%s' % PYTHON_LDVERSION]

src/server/mod_wsgi.c

@@ -4248,8 +4248,12 @@ static apr_status_t wsgi_python_child_cleanup(void *data)
      * before trying to wait on request threads.
      */
 
+#if defined(MOD_WSGI_WITH_DAEMONS)
     if (!wsgi_daemon_process)
         wsgi_publish_process_stopping(wsgi_shutdown_reason);
+#else
+    wsgi_publish_process_stopping(wsgi_shutdown_reason);
+#endif
 
     /* In a multithreaded MPM must protect table. */
 

src/server/wsgi_interp.c

@@ -419,6 +419,8 @@ InterpreterObject *newInterpreterObject(const char *name)
     int is_threaded = 0;
     int is_forked = 0;
 
+    int is_service_script = 0;
+
     const char *str = NULL;
 
     /* Create handle for interpreter and local data. */
@@ -595,7 +597,10 @@ InterpreterObject *newInterpreterObject(const char *name)
      * registering signal handlers so they are ignored.
      */
 
+#if defined(MOD_WSGI_WITH_DAEMONS)
     if (wsgi_daemon_process && wsgi_daemon_process->group->threads == 0) {
+        is_service_script = 1;
+
         module = PyImport_ImportModule("signal");
 
         if (module) {
@@ -637,7 +642,9 @@ InterpreterObject *newInterpreterObject(const char *name)
 
         Py_XDECREF(module);
     }
-    else if (wsgi_server_config->restrict_signal != 0) {
+#endif
+
+    if (!is_service_script && wsgi_server_config->restrict_signal != 0) {
         module = PyImport_ImportModule("signal");
 
         if (module) {
@@ -2057,17 +2064,19 @@ apr_status_t wsgi_python_term(void)
      * condition.
      */
 
+#if defined(MOD_WSGI_WITH_DAEMONS)
     if (wsgi_daemon_process)
         apr_thread_mutex_lock(wsgi_shutdown_lock);
 
-#if defined(MOD_WSGI_WITH_DAEMONS)
     wsgi_daemon_shutdown++;
 #endif
 
     Py_Finalize();
 
+#if defined(MOD_WSGI_WITH_DAEMONS)
     if (wsgi_daemon_process)
         apr_thread_mutex_unlock(wsgi_shutdown_lock);
+#endif
 
     wsgi_python_initialized = 0;
 

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 6
-#define MOD_WSGI_MICROVERSION_NUMBER 3
-#define MOD_WSGI_VERSION_STRING "4.6.3"
+#define MOD_WSGI_MICROVERSION_NUMBER 4
+#define MOD_WSGI_VERSION_STRING "4.6.4"
 
 /* ------------------------------------------------------------------------- */