Merge branch 'release/4.5.16'

Author: GrahamDumpleton

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.16
    release-notes/version-4.5.15
    release-notes/version-4.5.14
    release-notes/version-4.5.13

docs/release-notes/version-4.5.16.rst

@@ -0,0 +1,37 @@
+==============
+Version 4.5.16
+==============
+
+Version 4.5.16 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.16
+
+Bugs Fixed
+----------
+
+* The ``WSGIDontWriteBytecode`` option wasn't available when using Python 3.3
+  and later. This feature of Python wasn't in initial Python 3 versions, but
+  when was later added, mod_wsgi was updated to allow it.
+
+* The feature behind the ``startup-timeout`` option of ``WSGIDaemonProcess``
+  was broken by prior fix related to feature in 4.5.10. This meant the option
+  was not resulting in daemon processes being restarted when the WSGI script
+  file could not be loaded successfully by the specified timeout.
+
+* When using ``WSGIImportScript``, or ``WSGIScriptAlias`` with both the
+  ``process-group`` and ``application-group`` options, with the intent of
+  preloading a WSGI script file, the ability to reach across to a daemon
+  process defined in a different virtual host with same ``ServerName`` was
+  always failing and the target daemon process group would be flagged as
+  not accessible when instead it should have been.
+
+New Features
+------------
+
+* Added ``--allow-override`` option to ``mod_wsgi-express`` to allow use of
+  a ``.htaccess`` in document root directory and any directories mapped
+  using a URL alias. The argument to the directive should be the directive
+  type which can be overridden in the ``.htaccess`` file. The option can be
+  used more than once if needing to allow overriding of more than one
+  directive type. Argument can be anything allowed by ``AllowOverride``
+  directive.

docs/user-guides/application-issues.rst

@@ -169,8 +169,9 @@ check out:
   * http://www.globalherald.net/jb01/weblog/21.html
   * http://blog.endpoint.com/2010/02/selinux-httpd-modwsgi-26-rhel-centos-5.html
 
-Overall, if you don't have a specific need for SELinux, it is suggested
-you consider disabling it if it gives you problems.
+If you suspect that an issue may be caused by SELinux, you could
+temporarily try disabling it and doing a restart to verify whether it is
+the cause, but always re-enable it and do not disable it completely.
 
 Application Working Directory
 -----------------------------

docs/user-guides/checking-your-installation.rst

@@ -483,15 +483,15 @@ use a test WSGI script to output the value of 'sys.prefix'::
     def application(environ, start_response):
         status = '200 OK'
 
-        output = ''
-        output += 'sys.version = %s\n' % repr(sys.version)
-        output += 'sys.prefix = %s\n' % repr(sys.prefix)
+        output = u''
+        output += u'sys.version = %s\n' % repr(sys.version)
+        output += u'sys.prefix = %s\n' % repr(sys.prefix)
 
         response_headers = [('Content-type', 'text/plain'),
                             ('Content-Length', str(len(output)))]
         start_response(status, response_headers)
 
-        return [output]
+        return [output.encode('UTF-8')]
 
 For standard Python installation on a Linux system, this would produce
 something like::
@@ -511,13 +511,13 @@ value of 'sys.path'::
 
     def application(environ, start_response):
         status = '200 OK'
-        output = 'sys.path = %s' % repr(sys.path)
+        output = u'sys.path = %s' % repr(sys.path)
 
         response_headers = [('Content-type', 'text/plain'),
                             ('Content-Length', str(len(output)))]
         start_response(status, response_headers)
 
-        return [output]
+        return [output.encode('UTF-8')]
 
 In both cases, even if incorrect location is being used for Python
 installation and even if there is no actual Python installation of the
@@ -557,12 +557,12 @@ WSGI script with the test WSGI script as follows::
 
     def application(environ, start_response):
         status = '200 OK'
-        output = 'mod_wsgi.process_group = %s' % repr(environ['mod_wsgi.process_group']) 
+        output = u'mod_wsgi.process_group = %s' % repr(environ['mod_wsgi.process_group']) 
         response_headers = [('Content-type', 'text/plain'),
                             ('Content-Length', str(len(output)))]
         start_response(status, response_headers)
 
-        return [output]
+        return [output.encode('UTF-8')]
 
 If the configuration is such that the WSGI application is running in embedded
 mode, then you will see::
@@ -595,13 +595,13 @@ the WSGI application is being run use the test WSGI script of::
 
     def application(environ, start_response):
         status = '200 OK'
-        output = 'mod_wsgi.application_group = %s' % repr(environ['mod_wsgi.application_group'])
+        output = u'mod_wsgi.application_group = %s' % repr(environ['mod_wsgi.application_group'])
 
         response_headers = [('Content-type', 'text/plain'),
                             ('Content-Length', str(len(output)))]
         start_response(status, response_headers)
 
-        return [output]
+        return [output.encode('UTF-8')]
 
 If being run in the main interpreter, ie., the first interpreter created by
 Python, this will output::
@@ -652,13 +652,13 @@ multithread configuration is as follows::
 
     def application(environ, start_response):
         status = '200 OK'
-        output = 'wsgi.multithread = %s' % repr(environ['wsgi.multithread'])
+        output = u'wsgi.multithread = %s' % repr(environ['wsgi.multithread'])
 
         response_headers = [('Content-type', 'text/plain'),
                             ('Content-Length', str(len(output)))]
         start_response(status, response_headers)
 
-        return [output]
+        return [output.encode('UTF-8')]
 
 If multithreaded, this will yield::
 

docs/user-guides/reloading-source-code.rst

@@ -37,16 +37,16 @@ then substitute your WSGI application entry point with::
         status = '200 OK'
 
         if not environ['mod_wsgi.process_group']:
-          output = 'EMBEDDED MODE'
+          output = u'EMBEDDED MODE'
         else:
-          output = 'DAEMON MODE'
+          output = u'DAEMON MODE'
 
         response_headers = [('Content-Type', 'text/plain'),
                             ('Content-Length', str(len(output)))]
 
         start_response(status, response_headers)
 
-        return [output]
+        return [output.encode('UTF-8')]
 
 If your WSGI application is running in embedded mode, this will output to
 the browser 'EMBEDDED MODE'. If your WSGI application is running in daemon
@@ -264,27 +264,33 @@ a restart if they have.
 Example code for such an automatic restart mechanism which is compatible
 with how mod_wsgi works is shown below::
 
+    from __future__ import print_function
+
     import os
     import sys
     import time
     import signal
     import threading
     import atexit
-    import Queue
+
+    try:
+        import Queue as queue
+    except ImportError:
+        import queue
 
     _interval = 1.0
     _times = {}
     _files = []
 
     _running = False
-    _queue = Queue.Queue()
+    _queue = queue.Queue()
     _lock = threading.Lock()
 
     def _restart(path):
         _queue.put(True)
         prefix = 'monitor (pid=%d):' % os.getpid()
-        print >> sys.stderr, '%s Change detected to \'%s\'.' % (prefix, path)
-        print >> sys.stderr, '%s Triggering process restart.' % prefix
+        print('%s Change detected to \'%s\'.' % (prefix, path), file=sys.stderr)
+        print('%s Triggering process restart.' % prefix, file=sys.stderr)
         os.kill(os.getpid(), signal.SIGINT)
 
     def _modified(path):
@@ -373,7 +379,7 @@ with how mod_wsgi works is shown below::
         _lock.acquire()
         if not _running:
             prefix = 'monitor (pid=%d):' % os.getpid()
-            print >> sys.stderr, '%s Starting change monitor.' % prefix
+            print('%s Starting change monitor.' % prefix, file=sys.stderr)
             _running = True
             _thread.start()
         _lock.release()
@@ -470,8 +476,8 @@ function in the previous code with the following::
     def _restart(path):
         _queue.put(True)
         prefix = 'monitor (pid=%d):' % os.getpid()
-        print >> sys.stderr, '%s Change detected to \'%s\'.' % (prefix, path)
-        print >> sys.stderr, '%s Triggering Apache restart.' % prefix
+        print('%s Change detected to \'%s\'.' % (prefix, path), file=sys.stderr)
+        print('%s Triggering Apache restart.' % prefix, file=sys.stderr)
         import ctypes
         ctypes.windll.libhttpd.ap_signal_parent(1)
 

src/server/__init__.py

@@ -690,7 +690,10 @@ def find_mimetypes():
 
 DocumentRoot '%(document_root)s'
 
+AccessFileName .htaccess
+
 <Directory '%(server_root)s'>
+    AllowOverride %(allow_override)s
 <Files handler.wsgi>
 <IfVersion < 2.4>
     Order allow,deny
@@ -703,6 +706,7 @@ def find_mimetypes():
 </Directory>
 
 <Directory '%(document_root)s%(mount_point)s'>
+    AllowOverride %(allow_override)s
 <IfDefine MOD_WSGI_DIRECTORY_INDEX>
     DirectoryIndex %(directory_index)s
 </IfDefine>
@@ -840,6 +844,7 @@ def find_mimetypes():
 Alias '%(mount_point)s' '%(directory)s'
 
 <Directory '%(directory)s'>
+    AllowOverride %(allow_override)s
 <IfVersion < 2.4>
     Order allow,deny
     Allow from all
@@ -2225,6 +2230,12 @@ def check_percentage(option, opt_str, value, parser):
             'should be enabled where static file application type is '
             'being used and no directory index file has been specified.'),
 
+    optparse.make_option('--allow-override', metavar='DIRECTIVE-TYPE',
+            action='append', help='Allow directives to be overridden from a '
+            '\'.htaccess\' file. Defaults to \'None\', indicating that any '
+            '\'.htaccess\' file will be ignored with override directives '
+            'not being permitted.'),
+
     optparse.make_option('--mount-point', metavar='URL-PATH', default='/',
             help='The URL path at which the WSGI application will be '
             'mounted. Defaults to being mounted at the root URL of the '
@@ -2707,6 +2718,11 @@ def _cmd_setup_server(command, args, options):
     except Exception:
         pass
 
+    if not options['allow_override']:
+        options['allow_override'] = 'None'
+    else:
+        options['allow_override'] = ' '.join(options['allow_override'])
+
     if not options['mount_point'].startswith('/'):
         options['mount_point'] = os.path.normpath('/' + options['mount_point'])
 

src/server/mod_wsgi.c

@@ -4054,10 +4054,15 @@ static int wsgi_execute_script(request_rec *r)
     apr_thread_mutex_unlock(wsgi_module_lock);
 #endif
 
-    /* Clear startup timeout and prevent from running again. */
+    /*
+     * Clear startup timeout and prevent from running again if the
+     * module was successfully loaded.
+     */
 
 #if defined(MOD_WSGI_WITH_DAEMONS)
-    wsgi_startup_shutdown_time = -1;
+    if (module && wsgi_startup_shutdown_time > 0) {
+        wsgi_startup_shutdown_time = -1;
+    }
 #endif
 
     /* Assume an internal server error unless everything okay. */
@@ -4616,8 +4621,28 @@ static const char *wsgi_add_script_alias(cmd_parms *cmd, void *mconfig,
             if (!group)
                 return "WSGI process group not yet configured.";
 
-            if (group->server != cmd->server && group->server->is_virtual)
+            if (cmd->server->server_hostname &&
+                group->server->server_hostname &&
+                strcmp(cmd->server->server_hostname,
+                group->server->server_hostname) &&
+                group->server->is_virtual) {
+
                 return "WSGI process group not accessible.";
+            }
+
+            if (!cmd->server->server_hostname &&
+                group->server->server_hostname &&
+                group->server->is_virtual) {
+
+                return "WSGI process group not matchable.";
+            }
+
+            if (cmd->server->server_hostname &&
+                !group->server->server_hostname &&
+                group->server->is_virtual) {
+
+                return "WSGI process group not matchable.";
+            }
         }
 #endif
     }
@@ -4713,7 +4738,10 @@ static const char *wsgi_set_py3k_warning_flag(cmd_parms *cmd, void *mconfig,
 
     return NULL;
 }
+#endif
 
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3) || \
+    (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6)
 static const char *wsgi_set_dont_write_bytecode(cmd_parms *cmd, void *mconfig,
                                                 const char *f)
 {
@@ -5120,8 +5148,28 @@ static const char *wsgi_add_import_script(cmd_parms *cmd, void *mconfig,
         if (!group)
             return "WSGI process group not yet configured.";
 
-        if (group->server != cmd->server && group->server->is_virtual)
+        if (cmd->server->server_hostname &&
+            group->server->server_hostname &&
+            strcmp(cmd->server->server_hostname,
+            group->server->server_hostname) &&
+            group->server->is_virtual) {
+
             return "WSGI process group not accessible.";
+        }
+
+        if (!cmd->server->server_hostname &&
+            group->server->server_hostname &&
+            group->server->is_virtual) {
+
+            return "WSGI process group not matchable.";
+        }
+
+        if (cmd->server->server_hostname &&
+            !group->server->server_hostname &&
+            group->server->is_virtual) {
+
+            return "WSGI process group not matchable.";
+        }
     }
 #else
     object->process_group = "";
@@ -15752,6 +15800,10 @@ static const command_rec wsgi_commands[] =
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6
     AP_INIT_TAKE1("WSGIPy3kWarningFlag", wsgi_set_py3k_warning_flag,
         NULL, RSRC_CONF, "Enable/Disable Python 3.0 warnings."),
+#endif
+
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3) || \
+    (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6)
     AP_INIT_TAKE1("WSGIDontWriteBytecode", wsgi_set_dont_write_bytecode,
         NULL, RSRC_CONF, "Enable/Disable writing of byte code."),
 #endif

src/server/wsgi_interp.c

@@ -2035,7 +2035,8 @@ void wsgi_python_init(apr_pool_t *p)
 
         /* Disable writing of byte code files. */
 
-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3) || \
+    (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6)
         if (wsgi_server_config->dont_write_bytecode == 1)
             Py_DontWriteBytecodeFlag++;
 #endif

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 15
-#define MOD_WSGI_VERSION_STRING "4.5.15"
+#define MOD_WSGI_MICROVERSION_NUMBER 16
+#define MOD_WSGI_VERSION_STRING "4.5.16"
 
 /* ------------------------------------------------------------------------- */