Merge branch 'release/4.5.17'

Author: GrahamDumpleton

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.17
    release-notes/version-4.5.16
    release-notes/version-4.5.15
    release-notes/version-4.5.14

docs/release-notes/version-4.5.17.rst

@@ -0,0 +1,13 @@
+==============
+Version 4.5.17
+==============
+
+Version 4.5.17 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.17
+
+Bugs Fixed
+----------
+
+* Addition in ``mod_wsgi-express`` of ``--allow-override`` option in 4.5.16
+  caused ``--url-alias`` option to break.

src/server/__init__.py

@@ -1018,7 +1018,8 @@ def generate_apache_config(options):
                         directory = path
 
                     print(APACHE_ALIAS_DIRECTORY_CONFIG % dict(
-                            mount_point=mount_point, directory=directory),
+                            mount_point=mount_point, directory=directory,
+                            allow_override=options['allow_override']),
                             file=fp)
 
                 else:

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 16
-#define MOD_WSGI_VERSION_STRING "4.5.16"
+#define MOD_WSGI_MICROVERSION_NUMBER 17
+#define MOD_WSGI_VERSION_STRING "4.5.17"
 
 /* ------------------------------------------------------------------------- */