From 12b97f29e93391d73b0787442e3d2bb8e7b788aa Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 5 Apr 2016 18:13:59 +1000 Subject: [PATCH 1/3] Increment version to 4.5.1. --- src/server/wsgi_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h index b1585a08..c3cbf38c 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 5 -#define MOD_WSGI_MICROVERSION_NUMBER 0 -#define MOD_WSGI_VERSION_STRING "4.5.0" +#define MOD_WSGI_MICROVERSION_NUMBER 1 +#define MOD_WSGI_VERSION_STRING "4.5.1" /* ------------------------------------------------------------------------- */ From 6c0ad4ed073be2b62cf4e295efd294b39b84774c Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 5 Apr 2016 18:16:51 +1000 Subject: [PATCH 2/3] Add release notes for 4.5.1. --- docs/release-notes.rst | 1 + docs/release-notes/version-4.5.1.rst | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 docs/release-notes/version-4.5.1.rst diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 304965b5..8d23ce53 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -5,6 +5,7 @@ Release Notes .. toctree:: :maxdepth: 2 + release-notes/version-4.5.1 release-notes/version-4.5.0 release-notes/version-4.4.23 diff --git a/docs/release-notes/version-4.5.1.rst b/docs/release-notes/version-4.5.1.rst new file mode 100644 index 00000000..11d8ae6b --- /dev/null +++ b/docs/release-notes/version-4.5.1.rst @@ -0,0 +1,7 @@ +============= +Version 4.5.1 +============= + +Version 4.5.1 of mod_wsgi can be obtained from: + + https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.1 From 317a3f2e22bba1bc11c4643c94e05197b7df3852 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 5 Apr 2016 18:17:26 +1000 Subject: [PATCH 3/3] Fix generation of per request CPU times in event data. --- docs/release-notes/version-4.5.1.rst | 6 ++++++ src/server/mod_wsgi.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-4.5.1.rst b/docs/release-notes/version-4.5.1.rst index 11d8ae6b..f04751f8 100644 --- a/docs/release-notes/version-4.5.1.rst +++ b/docs/release-notes/version-4.5.1.rst @@ -5,3 +5,9 @@ Version 4.5.1 Version 4.5.1 of mod_wsgi can be obtained from: https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.1 + +Bugs Fixed +---------- + +1. The CPU user and system time for requests wasn't always being output + in request finished event data. diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c index 4a9f3e0f..66ecb88b 100644 --- a/src/server/mod_wsgi.c +++ b/src/server/mod_wsgi.c @@ -3225,7 +3225,7 @@ static int Adapter_run(AdapterObject *self, PyObject *object) if (application_time < 0.0) application_time = 0.0; - if (end_usage.user_time != 0.0) { + if (start_usage.user_time != 0.0) { if (wsgi_thread_cpu_usage(&end_usage)) { double user_seconds; double system_seconds;