Merge branch 'release/4.4.5'

docs/release-notes/index.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   version-4.4.5.rst
    version-4.4.4.rst
    version-4.4.3.rst
    version-4.4.2.rst

docs/release-notes/version-4.4.5.rst

@@ -0,0 +1,27 @@
+=============
+Version 4.4.5
+=============
+
+Version 4.4.5 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.4.5
+
+Known Issues
+------------
+
+1. Although the makefiles for building mod_wsgi on Windows have now been
+updated for the new source code layout, some issues are being seen with
+mod_wsgi on Apache 2.4. These issues are still being investigated. As
+most new changes in 4.X 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. Binaries compiled by a third party
+can be obtained from:
+
+* http://www.lfd.uci.edu/~gohlke/pythonlibs/#mod_wsgi
+
+Bugs Fixed
+----------
+
+1. When installing ``mod_wsgi-express`` from PyPi on OpenShift as a
+dependency of an application ``setup.py`` file, the precompiled Apache
+binaries would not be installed.

setup.py

@@ -51,27 +51,10 @@
 if LOCAL_TARBALL_FILE is None and REMOTE_TARBALL_NAME:
     REMOTE_TARBALL_URL = '%s/%s/%s' % (PREFIX, BUCKET, REMOTE_TARBALL_NAME)
 
-# Work out if we are actually performing an install as we don't want to
-# download any binaries or try and install them if we aren't. To
-# determine this, we need to scan through the arguments, skipping any
-# global options being passed to distutils and then look for 'install'.
-# Note that older versions of pip appear to use the 'egg_info' command
-# and not the 'install' command to somehow trigger installations.
-
 WITH_PACKAGES = False
-SETUP_COMMAND = None
-
-for arg in sys.argv[1:]:
-    if arg.startswith('-'):
-        continue
-
-    SETUP_COMMAND = arg
-
-    break
 
 if REMOTE_TARBALL_URL or LOCAL_TARBALL_FILE:
-    if arg in ('install', 'egg_info'):
-        WITH_PACKAGES = True
+    WITH_PACKAGES = True
 
 # If we are doing an install, download the tarball and unpack it into
 # the 'packages' subdirectory. We will then add everything in that

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 4
-#define MOD_WSGI_MICROVERSION_NUMBER 4
-#define MOD_WSGI_VERSION_STRING "4.4.4"
+#define MOD_WSGI_MICROVERSION_NUMBER 5
+#define MOD_WSGI_VERSION_STRING "4.4.5"
 
 /* ------------------------------------------------------------------------- */