Merge branch 'release/4.3.2'

Author: GrahamDumpleton

docs/release-notes/index.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   version-4.3.2.rst
    version-4.3.1.rst
    version-4.3.0.rst
 

docs/release-notes/version-4.3.2.rst

@@ -0,0 +1,63 @@
+=============
+Version 4.3.2
+=============
+
+Version 4.3.2 of mod_wsgi can be obtained from:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/archive/4.3.2.tar.gz
+
+Known Issues
+------------
+
+1. The makefiles for building mod_wsgi on Windows are currently broken and
+need updating. As most new changes relate to mod_wsgi daemon mode, which is
+not supported under Windows, you should keep using the last available
+binary for version 3.X on Windows instead.
+
+Bugs Fixed
+----------
+
+1. Linux behaviour when using ``connect()`` on a non blocking UNIX socket
+and the listener queue is full, is apparently not POSIX compliant and it
+returns ``EAGAIN`` instead of ``ECONNREFUSED``. The code handling errors
+from the ``connect()`` wasn't accomodating this non standard behaviour
+and so would fail immediately rather than retrying.
+
+2. Only change working directory for mod_wsgi daemon process after having
+dropped privileges to target user. This is required where the specified
+working directory is on an NFS file system configured so as not to have
+root access priviliges.
+
+3. The workaround for getting pyvenv style virtual environments to work
+with Python 3.3+ would break brew Python 2.7 on MacOS X as brew Python
+appears to not work in embedded systems which use Py_SetProgramName()
+instead of using Py_SetPythonHome(). Now only use Py_SetProgramName() if
+detect it is actually a pyvenv style virtual environment. This even appears
+to be okay for brew Python 3.4 at least as it does still work with the
+Py_SetProgramName() call even if brew Python 2.7 doesn't.
+
+New Features
+------------
+
+1. If the ``WSGIPythonHome`` directive or the ``python-home`` option is
+used with the ``WSGIDaemonProcess`` directive, the path provided, which is
+supposed to be the root directory of the Python installation or virtual
+environment, will be checked to see if it is actually accessible and refers
+to a directory. If it isn't, a warning message will be logged along with
+any details providing an indication of what may be wrong with the supplied
+path.
+
+This is being done to warn when an invalid path has been supplied that
+subsequently is likely to be rejected and ignored by the Python
+interpreter. In such a situation where an invalid path is supplied the
+Python interpreter doesn't actually log anything and will instead silently
+fallback to using any Python installation it finds by seaching for
+``python`` on the users ``PATH``. This may not be the Python installation
+or virtual environment you intended be used.
+
+2. The Apache configuration snippet generated as an example when running
+the ``install-module`` sub command of ``mod_wsgi-express`` to install the
+``mod_wsgi.so`` into the Apache installation itself, will now output a
+``WSGIPythonHome`` directive for the Python installation or virtual
+environment the mod_wsgi module was compiled against so that the correct
+Python runtime will be used.

src/server/__init__.py

@@ -1760,14 +1760,14 @@ def _cmd_setup_server(command, args, options):
     if options['max_clients'] is not None:
         max_clients = max(options['max_clients'], max_clients)
     else:
-        max_clients = int(1.5 * max_clients)
+        max_clients = 10 + max(10, int(1.5 * max_clients))
 
     initial_workers = options['initial_workers']
     min_spare_workers = options['minimum_spare_workers']
     max_spare_workers = options['maximum_spare_workers']
 
     if initial_workers is None:
-        prefork_initial_workers = 0.02
+        prefork_initial_workers = 0.05
     else:
         prefork_initial_workers = initial_workers
 
@@ -1777,7 +1777,7 @@ def _cmd_setup_server(command, args, options):
         prefork_min_spare_workers = min_spare_workers
 
     if max_spare_workers is None:
-        prefork_max_spare_workers = 0.05
+        prefork_max_spare_workers = 0.1
     else:
         prefork_max_spare_workers = max_spare_workers
 
@@ -1807,11 +1807,11 @@ def _cmd_setup_server(command, args, options):
 
     options['worker_max_clients'] = max_clients
 
-    if max_clients > 25:
+    if max_clients > 20:
         options['worker_threads_per_child'] = int(max_clients /
-                (int(max_clients / 25) + 1))
+                (int(max_clients / 20) + 1))
     else:
-        options['worker_threads_per_child'] = max_clients
+        options['worker_threads_per_child'] = 10
 
     options['worker_thread_limit'] = options['worker_threads_per_child']
 
@@ -2003,6 +2003,7 @@ def cmd_install_module(params):
     shutil.copyfile(where(), target)
 
     print('LoadModule wsgi_module %s' % target)
+    print('WSGIPythonHome %s' % os.path.normpath(sys.prefix))
 
 def cmd_module_location(params):
     formatter = optparse.IndentedHelpFormatter()