Merge branch 'release/4.5.23'

GrahamDumpleton · Dec 12, 2017 · 84d1c16 · 84d1c16
2 parents 67159b9 + df07ce9
commit 84d1c16
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/docs/configuration-directives/WSGIDaemonProcess.rst b/docs/configuration-directives/WSGIDaemonProcess.rst
@@ -327,7 +327,7 @@ Options which can be supplied to the ``WSGIDaemonProcess`` directive are:
     the Python GIL has been detected. The default is 300 seconds.
 
     This option exists to combat the problem of a daemon process freezing
-    as the result of a rouge Python C extension module which doesn't
+    as the result of a rogue Python C extension module which doesn't
     properly release the Python GIL when entering into a blocking or long
     running operation.
 

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.23
    release-notes/version-4.5.22
    release-notes/version-4.5.21
    release-notes/version-4.5.20

diff --git a/docs/release-notes/version-4.5.23.rst b/docs/release-notes/version-4.5.23.rst
@@ -0,0 +1,14 @@
+==============
+Version 4.5.23
+==============
+
+Version 4.5.23 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.23
+
+Bugs Fixed
+----------
+
+* Incorrect check around whether ``apxs`` was present on system would result
+  in ``pip`` install failing on Windows, and possibly also when using
+  latest Xcode on MacOS X.
diff --git a/setup.py b/setup.py
@@ -161,7 +161,7 @@ def find_program(names, default=None, paths=[]):
 elif WITHOUT_APXS and sys.platform == 'darwin':
     WITH_MACOSX_APACHE = '/Applications/Xcode.app'
 
-if WITHOUT_APXS and not WITH_WINDOWS_APACHE and not WITHOUT_APXS:
+if WITHOUT_APXS and not WITH_WINDOWS_APACHE and not WITH_MACOSX_APACHE:
     raise RuntimeError('The %r command appears not to be installed or '
             'is not executable. Please check the list of prerequisites '
             'in the documentation for this package and install any '

diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h
@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 5
-#define MOD_WSGI_MICROVERSION_NUMBER 22
-#define MOD_WSGI_VERSION_STRING "4.5.22"
+#define MOD_WSGI_MICROVERSION_NUMBER 23
+#define MOD_WSGI_VERSION_STRING "4.5.23"
 
 /* ------------------------------------------------------------------------- */