Merge branch 'release/4.1.1'4.1.1

5 files changed, 43 insertions, 2 deletions

diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index babd377..51e234d 100644
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   version-4.1.1.rst
    version-4.1.0.rst
 
    version-4.0.rst
diff --git a/docs/release-notes/version-4.1.0.rst b/docs/release-notes/version-4.1.0.rst
index 1be36bb..41006e8 100644
--- a/docs/release-notes/version-4.1.0.rst
+++ b/docs/release-notes/version-4.1.0.rst
@@ -34,7 +34,7 @@ initialised to signal that it should be shutdown, the process could crash
 rather than shutdown properly due to not registering the signal pipe
 prior to registering signal handler.
 
-2. Python doesn't initialise codes in sub interpreters automatically which
+2. Python doesn't initialise codecs in sub interpreters automatically which
 in some cases could cause code running in WSGI script to fail due to lack
 of encoding for Unicode strings when converting them. The error message
 in this case was::
@@ -122,6 +122,21 @@ long running request. See the new ``request-timeout`` option for a way of
 interrupting long running, potentially blocked requests and restarting
 the process.
 
+5. If the ``home`` option is used with ``WSGIDaemonProcess``, in addition
+to that directory being made the current working directory for the process,
+an empty string will be added to the start of the Python module search
+path. This causes Python to look in the current working directory for
+Python modules when they are being imported.
+
+This behaviour brings things into line with what happens when running the
+Python interpreter from the command line. You must though be using the
+``home`` option for this to come into play.
+
+Do not that if your application then changes the working directory, it
+will start looking in the new current working directory and not that which
+is specified by the ``home`` option. This again mirrors what the normal
+Python command line interpreter does.
+
 New Features
 ------------
 
diff --git a/docs/release-notes/version-4.1.1.rst b/docs/release-notes/version-4.1.1.rst
new file mode 100644
index 0000000..716a8d8
--- /dev/null
+++ b/docs/release-notes/version-4.1.1.rst
@@ -0,0 +1,21 @@
+=============
+Version 4.1.1
+=============
+
+Version 4.1.1 of mod_wsgi can be obtained from:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/archive/4.1.1.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. Compilation would fail on Apache 2.4 due to a change in the Apache API to
+determine the name of the MPM being used.
diff --git a/src/server/wsgi_apache.h b/src/server/wsgi_apache.h
index 1b49c67..d03b359 100644
--- a/src/server/wsgi_apache.h
+++ b/src/server/wsgi_apache.h
@@ -98,6 +98,10 @@ APLOG_USE_MODULE(wsgi);
 #define APR_FPROT_WWRITE APR_WWRITE
 #endif
 
+#ifndef MPM_NAME
+#define MPM_NAME ap_show_mpm()
+#endif
+
 #if !AP_MODULE_MAGIC_AT_LEAST(20050127,0)
 /* Debian backported ap_regex_t to Apache 2.0 and
  * thus made official version checking break. */
diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h
index 9bee365..2fa8fad 100644
--- a/src/server/wsgi_version.h
+++ b/src/server/wsgi_version.h
@@ -26,7 +26,7 @@
 #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.0"
+#define MOD_WSGI_VERSION_STRING "4.1.1"
 
 /* ------------------------------------------------------------------------- */