Merge branch 'release/mod_wsgi-6.0.4'

Author: GrahamDumpleton

docs/release-notes.rst

@@ -8,6 +8,7 @@ mod_wsgi. See :doc:`project-status` for the version support policy.
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-6.0.4
    release-notes/version-6.0.3
    release-notes/version-6.0.2
    release-notes/version-6.0.1

docs/release-notes/version-6.0.3.rst

@@ -5,6 +5,6 @@ Version 6.0.3
 Features Changed
 ----------------
 
-* `mod_wsgi-standalone` package has been updated to use `mod_wsgi-httpd-2.4.68.1`.
+* ``mod_wsgi-standalone`` package has been updated to use ``mod_wsgi-httpd-2.4.68.1``.
   Apache 2.4.68 includes a range of CVE fixes as detailed in the
-  [Apache HTTP Server 2.4.68 changelog](https://dlcdn.apache.org/httpd/CHANGES_2.4.68).
+  `Apache HTTP Server 2.4.68 changelog <https://dlcdn.apache.org/httpd/CHANGES_2.4.68>`_.

docs/release-notes/version-6.0.4.rst

@@ -0,0 +1,23 @@
+=============
+Version 6.0.4
+=============
+
+Bugs Fixed
+----------
+
+* The Django ``runmodwsgi`` management command was broken and would fail
+  immediately with ``AttributeError: module 'mod_wsgi.express' has no
+  attribute 'options'``. The command referenced the ``mod_wsgi.express.options``
+  and ``mod_wsgi.express.server`` submodules without importing them. As Django
+  builds the argument parser on every invocation, this affected all uses of the
+  command and not just ``runmodwsgi --help``.
+
+* The Django ``runmodwsgi`` management command failed with ``ValueError:
+  unsupported format character`` when displaying help. The optparse option
+  help text is now escaped and translated correctly when it is converted to
+  the argparse form Django requires, so literal ``%`` characters such as the
+  ``%{GLOBAL}`` token and the ``%default`` token are handled properly.
+
+* The Django ``runmodwsgi`` management command raised ``NameError: name
+  'value' is not defined`` when validating percentage style options such as
+  ``--initial-workers``. The value is now parsed and range checked correctly.

src/express/management/commands/runmodwsgi.py

@@ -7,9 +7,12 @@
 from django.core.management.base import BaseCommand, CommandError
 
 import mod_wsgi.express
+import mod_wsgi.express.options
+import mod_wsgi.express.server
 
 def check_percentage(string):
-    if value is not None and value < 0 or value > 1:
+    value = float(string)
+    if value < 0 or value > 1:
         import argparse
         msg = '%s option value needs to be within the range 0 to 1.' % string
         raise argparse.ArgumentTypeError(msg)
@@ -48,6 +51,20 @@ def add_arguments(self, parser):
                         elif attr == 'default':
                             if getattr(option, attr) != ('NO', 'DEFAULT'):
                                 kwargs[attr] = getattr(option, attr)
+                        elif attr == 'help':
+                            # optparse displays help text literally, but
+                            # argparse expands it with '%'-formatting. Escape
+                            # any literal '%' (e.g. the '%{GLOBAL}' token) and
+                            # translate the optparse '%default'/'%prog' tokens
+                            # to their argparse equivalents.
+                            help_text = getattr(option, attr)
+                            if help_text is not None:
+                                help_text = help_text.replace('%', '%%')
+                                help_text = help_text.replace(
+                                        '%%default', '%(default)s')
+                                help_text = help_text.replace(
+                                        '%%prog', '%(prog)s')
+                                kwargs[attr] = help_text
                         else:
                             if getattr(option, attr) is not None:
                                 kwargs[attr] = getattr(option, attr)

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 6
 #define MOD_WSGI_MINORVERSION_NUMBER 0
-#define MOD_WSGI_MICROVERSION_NUMBER 3
-#define MOD_WSGI_VERSION_STRING "6.0.3"
+#define MOD_WSGI_MICROVERSION_NUMBER 4
+#define MOD_WSGI_VERSION_STRING "6.0.4"
 
 /* ------------------------------------------------------------------------- */