Merge branch 'release/4.4.13'

Author: GrahamDumpleton

docs/release-notes/index.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   version-4.4.13.rst
    version-4.4.12.rst
    version-4.4.11.rst
    version-4.4.10.rst

docs/release-notes/version-4.4.13.rst

@@ -0,0 +1,54 @@
+==============
+Version 4.4.13
+==============
+
+Version 4.4.13 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.4.13
+
+For details on the availability of Windows binaries see:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/tree/master/win32
+
+Bugs Fixed
+----------
+
+1. The pip installable 'mod_wsgi' package was failing to install on
+OpenShift and Heroku as ``mod_wsgi-apxs`` isn't used for tarball based
+installs.
+
+Features Changed
+----------------
+
+1. For ``mod_wsgi-express``, only the web server type is now shown in the
+server tokens sent back in the ``Server`` response header. This prevents
+users from knowing any specifics and thus using that to determine possible
+vulnerabilities.
+
+New Features
+------------
+
+1. Set environment variables from ``apachectl`` for ``mod_wsgi-express``
+about the server environment which can be used in additional Apache
+configuration included into the generated configuration. The environment
+variables are:
+
+* *MOD_WSGI_SERVER_ROOT* - This is the directory where the generated
+  configuration files, startup scripts, etc were placed.
+* *MOD_WSGI_WORKING_DIRECTORY* - This is the directory which will be used
+  as the current working directory of the process. Would default to being
+  the same as ``MOD_WSGI_SERVER_ROOT`` if not overridden.
+* *MOD_WSGI_LISTENER_HOST* - The host name or IP on which connections are
+  being accepted. This should only be used if the Apache configuration
+  variable ``MOD_WSGI_WITH_LISTENER_HOST`` is defined.
+* *MOD_WSGI_HTTP_PORT* - The port on which HTTP connections are being accepted.
+* *MOD_WSGI_HTTPS_PORT* - The port on which HTTPS connections are being
+  accepted. This should only be used if the Apache configuration variable
+  ``MOD_WSGI_WITH_HTTPS`` is defined.
+* *MOD_WSGI_MODULES_DIRECTORY* - The directory where the Apache modules are
+  installed.
+* *MOD_WSGI_RUN_USER* - The user that the WSGI application will be run as.
+* *MOD_WSGI_RUN_GROUP* - The group that the WSGI application will be run as.
+
+2. Added ``X-Client-IP`` to list of possible trusted headers indicating the
+true remote address of client when passing through a proxy.

setup.py

@@ -36,8 +36,8 @@
 REMOTE_TARBALL_NAME = os.environ.get('MOD_WSGI_REMOTE_PACKAGES_NAME')
 LOCAL_TARBALL_FILE = os.environ.get('MOD_WSGI_LOCAL_PACKAGES_FILE')
 
-TGZ_OPENSHIFT='mod_wsgi-packages-openshift-centos6-apache-2.4.10-1.tar.gz'
-TGZ_HEROKU='mod_wsgi-packages-heroku-cedar14-apache-2.4.10-1.tar.gz'
+TGZ_OPENSHIFT='mod_wsgi-packages-openshift-centos6-apache-2.4.12-1.tar.gz'
+TGZ_HEROKU='mod_wsgi-packages-heroku-cedar14-apache-2.4.12-1.tar.gz'
 
 if not REMOTE_TARBALL_NAME and not LOCAL_TARBALL_FILE:
     if os.environ.get('OPENSHIFT_HOMEDIR'):
@@ -92,8 +92,6 @@
         packages = ['mod_wsgi', 'mod_wsgi.packages'],
         package_dir = {'mod_wsgi': 'src'},
         package_data = {'mod_wsgi': package_files},
-        entry_points = { 'console_scripts':
-                ['mod_wsgi-apxs = mod_wsgi.packages.apxs:main'],},
     )
 
 # From this point on we will now actually install mod_wsgi. First we need