Merge branch 'release/4.4.16'4.4.16

4 files changed, 32 insertions, 5 deletions

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index c26d875..5651417 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.4.16
    release-notes/version-4.4.15
    release-notes/version-4.4.14
    release-notes/version-4.4.13
diff --git a/docs/release-notes/version-4.4.16.rst b/docs/release-notes/version-4.4.16.rst
new file mode 100644
index 0000000..d739abf
--- /dev/null
+++ b/docs/release-notes/version-4.4.16.rst
@@ -0,0 +1,19 @@
+==============
+Version 4.4.16
+==============
+
+Version 4.4.16 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.4.16
+
+For details on the availability of Windows binaries see:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/tree/master/win32
+
+Bugs Fixed
+----------
+
+1. If ``/dev/stderr`` cannot be opened for writing when startup log is
+requested and logging to the terminal, then ``mod_wsgi-express`` would
+fail. Now attempt fallback to using ``/dev/tty`` and if that cannot be
+opened either, then give up on trying to use terminal for startup log.
diff --git a/src/server/__init__.py b/src/server/__init__.py
index b3c611c..4b92589 100644
--- a/src/server/__init__.py
+++ b/src/server/__init__.py
@@ -2799,12 +2799,19 @@ def _cmd_setup_server(command, args, options):
                 with open('/dev/stderr', 'w'):
                     pass
             except IOError:
-                options['startup_log_file'] = None
+                try:
+                    with open('/dev/tty', 'w'):
+                        pass
+                except IOError:
+                    options['startup_log_file'] = None
+                else:
+                    options['startup_log_file'] = '/dev/tty'
             else:
                 options['startup_log_file'] = '/dev/stderr'
 
-        options['httpd_arguments_list'].append('-E')
-        options['httpd_arguments_list'].append(options['startup_log_file'])
+        if options['startup_log_file']:
+            options['httpd_arguments_list'].append('-E')
+            options['httpd_arguments_list'].append(options['startup_log_file'])
 
     if options['server_name']:
         host = options['server_name']
diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h
index 88bb946..229c336 100644
--- a/src/server/wsgi_version.h
+++ b/src/server/wsgi_version.h
@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 4
-#define MOD_WSGI_MICROVERSION_NUMBER 15
-#define MOD_WSGI_VERSION_STRING "4.4.15"
+#define MOD_WSGI_MICROVERSION_NUMBER 16
+#define MOD_WSGI_VERSION_STRING "4.4.16"
 
 /* ------------------------------------------------------------------------- */