Merge branch 'release/4.2.6'

Author: GrahamDumpleton

docs/release-notes/index.rst

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

docs/release-notes/version-4.2.6.rst

@@ -0,0 +1,23 @@
+=============
+Version 4.2.6
+=============
+
+Version 4.2.6 of mod_wsgi can be obtained from:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/archive/4.2.6.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. Apache 2.2.3 and older doesn't provide the ap_get_server_description()
+function. Using mod_wsgi with such older versions would therefore cause
+processes to crash when Apache was being started up. For older versions of
+Apache now fallback to using ap_get_server_version() instead.

src/server/wsgi_interp.c

@@ -1168,7 +1168,11 @@ InterpreterObject *newInterpreterObject(const char *name)
     object = PyLong_FromLong(max_threads);
     PyModule_AddObject(module, "threads_per_process", object);
 
+#if AP_MODULE_MAGIC_AT_LEAST(20051115,4)
     str = ap_get_server_description();
+#else
+    str = ap_get_server_version();
+#endif
 #if PY_MAJOR_VERSION >= 3
     object = PyUnicode_DecodeLatin1(str, strlen(str), NULL);
 #else

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 5
-#define MOD_WSGI_VERSION_STRING "4.2.5"
+#define MOD_WSGI_MICROVERSION_NUMBER 6
+#define MOD_WSGI_VERSION_STRING "4.2.6"
 
 /* ------------------------------------------------------------------------- */