Merge branch 'release/4.5.2'

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.2
    release-notes/version-4.5.1
    release-notes/version-4.5.0
 

docs/release-notes/version-4.5.2.rst

@@ -0,0 +1,14 @@
+=============
+Version 4.5.2
+=============
+
+Version 4.5.2 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.2
+
+Bugs Fixed
+----------
+
+1. When using ``--debug-mode`` with ``mod_wsgi-express`` any additional
+   directories to search for Python modules, which were supplied by the
+   ``--python-path`` option, were not being added to ``sys.path``.

src/server/__init__.py

@@ -282,6 +282,8 @@ def find_mimetypes():
 
 WSGIPythonHome '%(python_home)s'
 
+WSGIVerboseDebugging '%(verbose_debugging_flag)s'
+
 <IfDefine !ONE_PROCESS>
 WSGIRestrictEmbedded On
 WSGISocketPrefix %(server_root)s/wsgi
@@ -345,6 +347,9 @@ def find_mimetypes():
 
 <IfDefine ONE_PROCESS>
 WSGIRestrictStdin Off
+<IfDefine MOD_WSGI_WITH_PYTHON_PATH>
+WSGIPythonPath '%(python_path)s'
+</IfDefine>
 </IfDefine>
 
 <IfDefine MOD_WSGI_SERVER_METRICS>
@@ -2240,6 +2245,9 @@ def check_percentage(option, opt_str, value, parser):
             help='Flag indicating whether the web server startup log should '
             'be enabled. Defaults to being disabled.'),
 
+    optparse.make_option('--verbose-debugging', action='store_true',
+            dest='verbose_debugging', help=optparse.SUPPRESS_HELP),
+
     optparse.make_option('--log-to-terminal', action='store_true',
             default=False, help='Flag indicating whether logs should '
             'be directed back to the terminal. Defaults to being disabled. '
@@ -2876,6 +2884,11 @@ def _cmd_setup_server(command, args, options):
             options['httpd_arguments_list'].append('-E')
             options['httpd_arguments_list'].append(options['startup_log_file'])
 
+    if options['verbose_debugging']:
+        options['verbose_debugging_flag'] = 'On'
+    else:
+        options['verbose_debugging_flag'] = 'Off'
+
     if options['server_name']:
         host = options['server_name']
     else:
@@ -3023,6 +3036,8 @@ def _cmd_setup_server(command, args, options):
         options['httpd_arguments_list'].append('-DMOD_WSGI_WITH_PROXY_HEADERS')
     if options['trusted_proxies']:
         options['httpd_arguments_list'].append('-DMOD_WSGI_WITH_TRUSTED_PROXIES')
+    if options['python_path']:
+        options['httpd_arguments_list'].append('-DMOD_WSGI_WITH_PYTHON_PATH')
 
     if options['with_cgi']:
         if os.path.exists(os.path.join(options['modules_directory'],

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 1
-#define MOD_WSGI_VERSION_STRING "4.5.1"
+#define MOD_WSGI_MICROVERSION_NUMBER 2
+#define MOD_WSGI_VERSION_STRING "4.5.2"
 
 /* ------------------------------------------------------------------------- */