Merge branch 'release/4.6.7'

Author: GrahamDumpleton

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.6.7
    release-notes/version-4.6.6
    release-notes/version-4.6.5
    release-notes/version-4.6.4

docs/release-notes/version-4.6.7.rst

@@ -0,0 +1,13 @@
+=============
+Version 4.6.7
+=============
+
+Version 4.6.7 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.6.7
+
+Bugs Fixed
+----------
+
+* Fix Windows build errors due to Python 3.7+ not providing empty function
+  stubs for ``PyOS_AfterFork_Child()`` and ``PyOS_AfterFork_Parent()``.

setup.py

@@ -573,6 +573,8 @@ def _version():
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP :: WSGI',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Server'
     ],

src/server/mod_wsgi.c

@@ -4379,13 +4379,15 @@ static void wsgi_python_child_init(apr_pool_t *p)
      * do it if Python was initialised in parent process.
      */
 
+#ifdef HAVE_FORK
     if (wsgi_python_initialized && !wsgi_python_after_fork) {
 #if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7)
         PyOS_AfterFork_Child();
 #else
         PyOS_AfterFork();
 #endif
     }
+#endif
 
     /* Finalise any Python objects required by child process. */
 
@@ -10467,11 +10469,13 @@ static int wsgi_start_process(apr_pool_t *p, WSGIDaemonProcess *daemon)
         wsgi_exit_daemon_process(0);
     }
 
+#ifdef HAVE_FORK
     if (wsgi_python_initialized) {
 #if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7)
         PyOS_AfterFork_Parent();
 #endif
     }
+#endif
 
     apr_pool_note_subprocess(p, &daemon->process, APR_KILL_AFTER_TIMEOUT);
     apr_proc_other_child_register(&daemon->process, wsgi_manage_process,

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 6
-#define MOD_WSGI_VERSION_STRING "4.6.6"
+#define MOD_WSGI_MICROVERSION_NUMBER 7
+#define MOD_WSGI_VERSION_STRING "4.6.7"
 
 /* ------------------------------------------------------------------------- */