Merge branch 'release/4.5.19'

Author: GrahamDumpleton

docs/release-notes.rst

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

docs/release-notes/version-4.5.19.rst

@@ -0,0 +1,17 @@
+==============
+Version 4.5.19
+==============
+
+Version 4.5.19 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.19
+
+Features Changed
+----------------
+
+* When using the Django management command integration of
+  ``mod_wsgi-express``, allow the ``--working-directory`` option to
+  override the calculated directory. This is necessary to cope with
+  where the meaning of ``BASE_DIR`` in the Django settings file has been
+  changed from the accepted convention of it being the parent directory
+  of the Django project.

src/server/management/commands/runmodwsgi.py

@@ -78,18 +78,21 @@ def handle(self, *args, **options):
         args = [script_file]
         options['callable_object'] = callable_object
 
-        # If there is no BASE_DIR in Django settings, assume that
-        # the current working directory is the parent directory of
-        # the directory the settings module is in.
-
-        if hasattr(settings, 'BASE_DIR'):
-            options['working_directory'] = settings.BASE_DIR
-        else:
-            settings_module_path = os.environ['DJANGO_SETTINGS_MODULE']
-            root_module_path = settings_module_path.split('.')[0]
-            root_module = sys.modules[root_module_path]
-            parent = os.path.dirname(os.path.dirname(root_module.__file__))
-            options['working_directory'] = parent
+        # If there is no BASE_DIR in Django settings, assume that the
+        # current working directory is the parent directory of the
+        # directory the settings module is in. Either way, allow the
+        # --working-directory option to override it to deal with where
+        # meaning of BASE_DIR in the Django settings was changed.
+
+        if options.get('working_directory') is None:
+            if hasattr(settings, 'BASE_DIR'):
+                options['working_directory'] = settings.BASE_DIR
+            else:
+                settings_module_path = os.environ['DJANGO_SETTINGS_MODULE']
+                root_module_path = settings_module_path.split('.')[0]
+                root_module = sys.modules[root_module_path]
+                parent = os.path.dirname(os.path.dirname(root_module.__file__))
+                options['working_directory'] = parent
 
         url_aliases = options.setdefault('url_aliases') or []
 

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 18
-#define MOD_WSGI_VERSION_STRING "4.5.18"
+#define MOD_WSGI_MICROVERSION_NUMBER 19
+#define MOD_WSGI_VERSION_STRING "4.5.19"
 
 /* ------------------------------------------------------------------------- */