diff options
| author | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2015-10-11 22:22:42 +1100 |
|---|---|---|
| committer | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2015-10-11 22:22:42 +1100 |
| commit | 02f2b3a42e2b168999c123a0fb32cbc822c0fe14 (patch) | |
| tree | c7505dac854c2c077b9922579a482efdaaef48d4 | |
| parent | 5458417ac6f645ab6943c35f5d6a424d3134b123 (diff) | |
| parent | 7e46a0b63dd73a97811543cbee497a8901e5ac9c (diff) | |
| download | mod_wsgi-02f2b3a42e2b168999c123a0fb32cbc822c0fe14.tar.gz | |
Merge branch 'release/4.4.17'4.4.17
| -rw-r--r-- | docs/release-notes.rst | 1 | ||||
| -rw-r--r-- | docs/release-notes/version-4.4.17.rst | 18 | ||||
| -rw-r--r-- | src/server/__init__.py | 5 | ||||
| -rw-r--r-- | src/server/wsgi_version.h | 4 |
4 files changed, 25 insertions, 3 deletions
diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 5651417..b7f2b4b 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.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 new file mode 100644 index 0000000..a076093 --- /dev/null +++ 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 index 4b92589..fbc77c7 100644 --- 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 index 229c336..727a762 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 16 -#define MOD_WSGI_VERSION_STRING "4.4.16" +#define MOD_WSGI_MICROVERSION_NUMBER 17 +#define MOD_WSGI_VERSION_STRING "4.4.17" /* ------------------------------------------------------------------------- */ |