Merge branch 'release/4.2.5'

docs/release-notes/index.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   version-4.2.5.rst
    version-4.2.4.rst
    version-4.2.3.rst
    version-4.2.2.rst

docs/release-notes/version-4.2.5.rst

@@ -0,0 +1,22 @@
+=============
+Version 4.2.5
+=============
+
+Version 4.2.5 of mod_wsgi can be obtained from:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/archive/4.2.5.tar.gz
+
+Known Issues
+------------
+
+1. The makefiles for building mod_wsgi on Windows are currently broken and
+need updating. As most new changes relate to mod_wsgi daemon mode, which is
+not supported under Windows, you should keep using the last available
+binary for version 3.X on Windows instead.
+
+Bugs Fixed
+----------
+
+1. When using Apache 2.4 with dynamically loaded MPM modules, mod_wsgi
+express was incorrectly trying to load more than one MPM module if more
+than one existed in the Apache modules directory.

src/server/__init__.py

@@ -1089,6 +1089,7 @@ def _mpm_module_defines(modules_directory):
         if os.path.exists(os.path.join(modules_directory,
                 'mod_mpm_%s.so' % name)):
             result.append('-DWSGI_MPM_%s_MODULE' % name.upper())
+            break
     return result
 
 def _cmd_setup_server(command, args, options):

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 2
-#define MOD_WSGI_MICROVERSION_NUMBER 4
-#define MOD_WSGI_VERSION_STRING "4.2.4"
+#define MOD_WSGI_MICROVERSION_NUMBER 5
+#define MOD_WSGI_VERSION_STRING "4.2.5"
 
 /* ------------------------------------------------------------------------- */