Merge branch 'release/4.4.17'

GrahamDumpleton · Oct 11, 2015 · 02f2b3a · 02f2b3a
2 parents 5458417 + 7e46a0b
commit 02f2b3a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.4.17
    release-notes/version-4.4.16
    release-notes/version-4.4.15
    release-notes/version-4.4.14

diff --git a/docs/release-notes/version-4.4.17.rst b/docs/release-notes/version-4.4.17.rst
@@ -0,0 +1,18 @@
+==============
+Version 4.4.17
+==============
+
+Version 4.4.17 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.4.17
+
+For details on the availability of Windows binaries see:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/tree/master/win32
+
+Bugs Fixed
+----------
+
+1. If ``mod_wsgi-express`` was run under a user ID for which there was no
+password entry in the system password file, it would fail when looking up
+the user name. If this occurs now use ``#nnn`` as the default user name.
diff --git a/src/server/__init__.py b/src/server/__init__.py
@@ -50,7 +50,10 @@ def where():
     return MOD_WSGI_SO
 
 def default_run_user():
-    return pwd.getpwuid(os.getuid()).pw_name
+    try:
+        return pwd.getpwuid(os.getuid()).pw_name
+    except KeyError:
+        return '#%d' % os.getuid()
 
 def default_run_group():
     try:

diff --git 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 16
-#define MOD_WSGI_VERSION_STRING "4.4.16"
+#define MOD_WSGI_MICROVERSION_NUMBER 17
+#define MOD_WSGI_VERSION_STRING "4.4.17"
 
 /* ------------------------------------------------------------------------- */